Merge remote-tracking branch 'remotes/origin/6.7.9.10R1'

Conflicts: readme.md
ScutGame · Sep 11, 2015 · 4d19fb1 · 4d19fb1
2 parents f10c64c + caef23c
commit 4d19fb1
Show file tree

Hide file tree

Showing 1,174 changed files with 251,710 additions and 247,566 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,220 +1,19 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-*.lib
-*.tlog
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-Debug.Win32
-Win32Debug
+/Source/Framework/ZyGames.Framework/obj
+/Source/Framework/ZyGames.Framework/bin
+/Source/Framework/ZyGames.Framework.Common/obj
+/Source/Framework/ZyGames.Framework.Common/bin
+/Source/Middleware/AccountServer/bin
+/Source/Middleware/AccountServer/obj
+/Source/Middleware/GameServer/bin
+/Source/Middleware/GameServer/obj
+/Source/Middleware/ScutSecurity/bin
+/Source/Middleware/ScutSecurity/obj
+/Source/Middleware/ZyGames.Framework.Game/bin
+/Source/Middleware/ZyGames.Framework.Game/obj
+/Source/Tools/ContractTools/src/ContractTools.WebApp/bin
+/Source/Tools/ContractTools/src/ContractTools.WebApp/obj
+/Source/Framework/*.suo
+/Source/Middleware/*.suo
+/SDK/Unity3d/obj
+/SDK/Unity3d/Library/metadata
+/Source/Framework/packages
diff --git a/Document/Tutorials/Cocos-Scut开源引擎.pptx b/Document/Tutorials/Cocos-Scut开源引擎.pptx
diff --git a/Release/6.7.9.8/Console/GameServer.exe.config b/Release/6.7.9.8/Console/GameServer.exe.config
@@ -1,33 +1,33 @@
-<?xml version="1.0"?>
-<configuration>
-  <appSettings>
-    <!--基本配置
-        Port:监听端口
-        Code:产品代码
-        ServerId:产品游服代码
-        Redis.Host:Redis主机地址
-        Redis.Port:Redis主机端口
-        Redis.Password:密码
-        Redis.Db:数据库位置
-    -->
-    <add key="Product.Code" value="0"/>
-    <add key="Product.ServerId" value="0"/>
-    <add key="Game.Port" value="9001"/>
-    <add key="Redis.Host" value="127.0.0.1:6379"/>
-    <add key="ScriptRelativePath" value="Script"/>
-    <add key="CSharpRootPath" value="CsScript"/>
-    <add key="LuaRootPath" value="LuaScript"/>
-    <add key="Game.Language.TypeName" value="GameServer.CsScript.Locale.SimplifiedLanguage"/>
-    <add key="Game.Action.Script.TypeName" value="GameServer.CsScript.Action.Action{0}"/>
-    <add key="Script_IsDebug" value="True"/>
-    <add key="Lua_Disable" value="True"/>
-
-    <!--脚本解密回调配置-->
-    <!--<add key="Game.Script.DecodeFunc.TypeName" value="ScutSecurity.ScriptDes,ScutSecurity"/>-->
-  </appSettings>
-  <connectionStrings>
-    <!--<add name="SnsCenter" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=snscenter;Uid=sa;Pwd=123;Pooling=true;"/>
-    <add name="PayCenter" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=PayDB;Uid=sa;Pwd=123;Pooling=true;"/>
-    <add name="ConnData" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=PHData;Uid=game_user;Pwd=123;"/>-->
-  </connectionStrings>
-</configuration>
+<?xml version="1.0"?>
+<configuration>
+  <appSettings>
+    <!--基本配置
+        Port:监听端口
+        Code:产品代码
+        ServerId:产品游服代码
+        Redis.Host:Redis主机地址
+        Redis.Port:Redis主机端口
+        Redis.Password:密码
+        Redis.Db:数据库位置
+    -->
+    <add key="Product.Code" value="0"/>
+    <add key="Product.ServerId" value="0"/>
+    <add key="Game.Port" value="9001"/>
+    <add key="Redis.Host" value="127.0.0.1:6379"/>
+    <add key="ScriptRelativePath" value="Script"/>
+    <add key="CSharpRootPath" value="CsScript"/>
+    <add key="LuaRootPath" value="LuaScript"/>
+    <add key="Game.Language.TypeName" value="GameServer.CsScript.Locale.SimplifiedLanguage"/>
+    <add key="Game.Action.Script.TypeName" value="GameServer.CsScript.Action.Action{0}"/>
+    <add key="Script_IsDebug" value="True"/>
+    <add key="Lua_Disable" value="True"/>
+
+    <!--脚本解密回调配置-->
+    <!--<add key="Game.Script.DecodeFunc.TypeName" value="ScutSecurity.ScriptDes,ScutSecurity"/>-->
+  </appSettings>
+  <connectionStrings>
+    <!--<add name="SnsCenter" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=snscenter;Uid=sa;Pwd=123;Pooling=true;"/>
+    <add name="PayCenter" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=PayDB;Uid=sa;Pwd=123;Pooling=true;"/>
+    <add name="ConnData" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=PHData;Uid=game_user;Pwd=123;"/>-->
+  </connectionStrings>
+</configuration>
diff --git a/Release/6.7.9.8/Console/Install.bat b/Release/6.7.9.8/Console/Install.bat
@@ -1,5 +1,5 @@
-@echo off
-
-xcopy /y ..\Lib\*.dll .\
-
+@echo off
+
+xcopy /y ..\Lib\*.dll .\
+
 ECHO Install Ok & PAUSE
diff --git a/Release/6.7.9.8/Console/NLog.config b/Release/6.7.9.8/Console/NLog.config
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- 
-  This file needs to be put in the application directory. Make sure to set 
-  'Copy to Output Directory' option in Visual Studio.
-  -->
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">
-  <variable name="logDirectory" value="Log"/>
-  <targets>
-    <target name="Info" xsi:type="File" fileName="${logDirectory}/Info/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Debug" xsi:type="File" fileName="${logDirectory}/Debug/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Exception" xsi:type="File" fileName="${logDirectory}/Exception/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Fatal" xsi:type="File" fileName="${logDirectory}/Fatal/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Warn" xsi:type="File" fileName="${logDirectory}/Warn/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Client" xsi:type="File" fileName="${logDirectory}/Client/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="SqlError" xsi:type="File" fileName="${logDirectory}/Sql/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Complement" xsi:type="File" fileName="${logDirectory}/Complement/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
-    <target name="Console" xsi:type="Console" layout="${message}"/>
-  </targets>
-  <rules>
-    <logger name="*" level="Info" writeTo="Info,Console"/>
-    <logger name="*" level="Debug" writeTo="Debug"/>
-    <logger name="*" level="Error" writeTo="Exception,Console"/>
-    <logger name="*" level="Fatal" writeTo="Fatal"/>
-    <logger name="*" level="Warn" writeTo="Warn"/>
-    <logger name="Client" level="Trace" writeTo="Client"/>
-    <logger name="Sql" level="Trace" writeTo="SqlError"/>
-    <logger name="Complement" level="Trace" writeTo="Complement"/>
-  </rules>
-</nlog>
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 
+  This file needs to be put in the application directory. Make sure to set 
+  'Copy to Output Directory' option in Visual Studio.
+  -->
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">
+  <variable name="logDirectory" value="Log"/>
+  <targets>
+    <target name="Info" xsi:type="File" fileName="${logDirectory}/Info/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Debug" xsi:type="File" fileName="${logDirectory}/Debug/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Exception" xsi:type="File" fileName="${logDirectory}/Exception/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Fatal" xsi:type="File" fileName="${logDirectory}/Fatal/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Warn" xsi:type="File" fileName="${logDirectory}/Warn/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Client" xsi:type="File" fileName="${logDirectory}/Client/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="SqlError" xsi:type="File" fileName="${logDirectory}/Sql/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Complement" xsi:type="File" fileName="${logDirectory}/Complement/${date:format=yyyyMMddHH}.txt" layout="${message}"/>
+    <target name="Console" xsi:type="Console" layout="${message}"/>
+  </targets>
+  <rules>
+    <logger name="*" level="Info" writeTo="Info,Console"/>
+    <logger name="*" level="Debug" writeTo="Debug"/>
+    <logger name="*" level="Error" writeTo="Exception,Console"/>
+    <logger name="*" level="Fatal" writeTo="Fatal"/>
+    <logger name="*" level="Warn" writeTo="Warn"/>
+    <logger name="Client" level="Trace" writeTo="Client"/>
+    <logger name="Sql" level="Trace" writeTo="SqlError"/>
+    <logger name="Complement" level="Trace" writeTo="Complement"/>
+  </rules>
+</nlog>