publish 6.7.9.10R1 stable version

ScutGame · Sep 11, 2015 · e92eea8 · e92eea8
1 parent 4d19fb1
commit e92eea8
Show file tree

Hide file tree

Showing 67 changed files with 1,951 additions and 490 deletions.
diff --git a/Release/6.7.9.10/AccountServer/Web/Default.ashx b/Release/6.7.9.10/AccountServer/Web/Default.ashx
@@ -0,0 +1 @@
+<%@ WebHandler Language="C#" CodeBehind="Default.ashx.cs" Class="AccountServer.Default" %>
diff --git a/Release/6.7.9.10/AccountServer/Web/Global.asax b/Release/6.7.9.10/AccountServer/Web/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="AccountServer.Global" Language="C#" %>
diff --git a/Release/6.7.9.10/AccountServer/Web/NLog.config b/Release/6.7.9.10/AccountServer/Web/NLog.config
@@ -0,0 +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">
+  <variable name="logDirectory" value="D:/NLog/AccountLog"/>
+  <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"/>
+    <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>
diff --git a/Release/6.7.9.10/AccountServer/Web/Web.config b/Release/6.7.9.10/AccountServer/Web/Web.config
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  有关如何配置 ASP.NET 应用程序的详细信息，请访问
+  http://go.microsoft.com/fwlink/?LinkId=169433
+  -->
+<configuration>
+  <appSettings>
+    <add key="Product.SignKey" value=""/>
+    <add key="Product.ClientDesDeKey" value="j6=9=1ac"/>
+    <add key="Redis.Host" value="127.0.0.1:6379" />
+    <add key="Redis.Db" value="0" />
+  </appSettings>
+  <connectionStrings>
+    <add name="SnsCenter" providerName="SqlDataProvider" connectionString="Data Source=localhost;Database=SnsCenter;Uid=sa;Pwd=123" />
+  </connectionStrings>
+
+  <system.web>
+    <compilation targetFramework="4.5.1" />
+    <httpRuntime targetFramework="4.5.1" />
+  </system.web>
+  <system.webServer>
+    <defaultDocument>
+      <files>
+        <add value="Default.ashx"/>
+      </files>
+    </defaultDocument>
+  </system.webServer>
+</configuration>
diff --git a/Release/6.7.9.10/AccountServer/Web/bin/AccountServer.dll b/Release/6.7.9.10/AccountServer/Web/bin/AccountServer.dll
diff --git a/Release/6.7.9.8/Lib/Mono.Cecil.Pdb.dll → .../AccountServer/Web/bin/Mono.Cecil.Pdb.dll b/Release/6.7.9.8/Lib/Mono.Cecil.Pdb.dll → .../AccountServer/Web/bin/Mono.Cecil.Pdb.dll
diff --git a/Release/6.7.9.8/Lib/Mono.Cecil.dll → ...9.10/AccountServer/Web/bin/Mono.Cecil.dll b/Release/6.7.9.8/Lib/Mono.Cecil.dll → ...9.10/AccountServer/Web/bin/Mono.Cecil.dll
diff --git a/Release/6.7.9.8/Lib/MySql.Data.dll → ...9.10/AccountServer/Web/bin/MySql.Data.dll b/Release/6.7.9.8/Lib/MySql.Data.dll → ...9.10/AccountServer/Web/bin/MySql.Data.dll
diff --git a/Release/6.7.9.8/Lib/NLog.dll → ...e/6.7.9.10/AccountServer/Web/bin/NLog.dll b/Release/6.7.9.8/Lib/NLog.dll → ...e/6.7.9.10/AccountServer/Web/bin/NLog.dll
diff --git a/Release/6.7.9.8/Lib/Newtonsoft.Json.dll → ...AccountServer/Web/bin/Newtonsoft.Json.dll b/Release/6.7.9.8/Lib/Newtonsoft.Json.dll → ...AccountServer/Web/bin/Newtonsoft.Json.dll
diff --git a/Release/6.7.9.8/Lib/ServiceStack.Redis.dll → ...ountServer/Web/bin/ServiceStack.Redis.dll b/Release/6.7.9.8/Lib/ServiceStack.Redis.dll → ...ountServer/Web/bin/ServiceStack.Redis.dll
diff --git a/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.Common.dll b/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.Common.dll
diff --git a/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.Game.dll b/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.Game.dll
diff --git a/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.dll b/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.dll
diff --git a/Release/6.7.9.8/Lib/protobuf-net.dll → ...10/AccountServer/Web/bin/protobuf-net.dll b/Release/6.7.9.8/Lib/protobuf-net.dll → ...10/AccountServer/Web/bin/protobuf-net.dll
diff --git a/Release/6.7.9.10/Console/GameServer.exe b/Release/6.7.9.10/Console/GameServer.exe
diff --git a/...ase/6.7.9.8/Console/GameServer.exe.config → ...se/6.7.9.10/Console/GameServer.exe.config b/...ase/6.7.9.8/Console/GameServer.exe.config → ...se/6.7.9.10/Console/GameServer.exe.config
@@ -20,6 +20,7 @@
     <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="PublishType" value="Debug" />
     <add key="Lua_Disable" value="True"/>
 
     <!--脚本解密回调配置-->

diff --git a/Release/6.7.9.10/Console/GameServer.pdb b/Release/6.7.9.10/Console/GameServer.pdb
diff --git a/Release/6.7.9.8/Console/Install.bat → Release/6.7.9.10/Console/Install.bat b/Release/6.7.9.8/Console/Install.bat → Release/6.7.9.10/Console/Install.bat
diff --git a/Release/6.7.9.8/Console/NLog.config → Release/6.7.9.10/Console/NLog.config b/Release/6.7.9.8/Console/NLog.config → Release/6.7.9.10/Console/NLog.config
diff --git a/...sole/Script/CsScript/Action/Action1000.cs → ...sole/Script/CsScript/Action/Action1000.cs b/...sole/Script/CsScript/Action/Action1000.cs → ...sole/Script/CsScript/Action/Action1000.cs
diff --git a/...sole/Script/CsScript/Action/Action1001.cs → ...sole/Script/CsScript/Action/Action1001.cs b/...sole/Script/CsScript/Action/Action1001.cs → ...sole/Script/CsScript/Action/Action1001.cs
diff --git a/...ipt/CsScript/Locale/SimplifiedLanguage.cs → ...ipt/CsScript/Locale/SimplifiedLanguage.cs b/...ipt/CsScript/Locale/SimplifiedLanguage.cs → ...ipt/CsScript/Locale/SimplifiedLanguage.cs
diff --git a/...8/Console/Script/CsScript/LuaFuncProxy.cs → ...0/Console/Script/CsScript/LuaFuncProxy.cs b/...8/Console/Script/CsScript/LuaFuncProxy.cs → ...0/Console/Script/CsScript/LuaFuncProxy.cs
diff --git a/....9.8/Console/Script/CsScript/MainClass.cs → ...9.10/Console/Script/CsScript/MainClass.cs b/....9.8/Console/Script/CsScript/MainClass.cs → ...9.10/Console/Script/CsScript/MainClass.cs
diff --git a/...le/Script/LuaScript/Action/Action1001.lua → ...le/Script/LuaScript/Action/Action1001.lua b/...le/Script/LuaScript/Action/Action1001.lua → ...le/Script/LuaScript/Action/Action1001.lua
diff --git a/...6.7.9.8/Console/Script/Model/GuestUser.cs → ....7.9.10/Console/Script/Model/GuestUser.cs b/...6.7.9.8/Console/Script/Model/GuestUser.cs → ....7.9.10/Console/Script/Model/GuestUser.cs
diff --git a/...7.9.8/Console/Script/Model/UserRanking.cs → ....9.10/Console/Script/Model/UserRanking.cs b/...7.9.8/Console/Script/Model/UserRanking.cs → ....9.10/Console/Script/Model/UserRanking.cs
diff --git a/Release/6.7.9.8/Console/ScutSMS Readme.chm → Release/6.7.9.10/Console/ScutSMS Readme.chm b/Release/6.7.9.8/Console/ScutSMS Readme.chm → Release/6.7.9.10/Console/ScutSMS Readme.chm
diff --git a/Release/6.7.9.8/Console/ScutSMS.exe → Release/6.7.9.10/Console/ScutSMS.exe b/Release/6.7.9.8/Console/ScutSMS.exe → Release/6.7.9.10/Console/ScutSMS.exe
diff --git a/.../6.7.9.8/Install/SCUTServerSetup(x86).iss → ...6.7.9.10/Install/SCUTServerSetup(x86).iss b/.../6.7.9.8/Install/SCUTServerSetup(x86).iss → ...6.7.9.10/Install/SCUTServerSetup(x86).iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "SCUT Server"
-#define MyAppVersion "6.7.9.8"
+#define MyAppVersion "6.7.9.10"
 #define MyAppPublisher "ScutGame, Inc."
 #define MyAppCopyright "Copyright (c) 2013-2015 scutgame.com Inc."
 #define MyAppURL "http://www.scutgame.com/"      

diff --git a/Release/6.7.9.8/Install/SCUTServerSetup.iss → Release/6.7.9.10/Install/SCUTServerSetup.iss b/Release/6.7.9.8/Install/SCUTServerSetup.iss → Release/6.7.9.10/Install/SCUTServerSetup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "SCUT Server"
-#define MyAppVersion "6.7.9.8"
+#define MyAppVersion "6.7.9.10"
 #define MyAppPublisher "ScutGame, Inc."
 #define MyAppCopyright "Copyright (c) 2013-2015 scutgame.com Inc."
 #define MyAppURL "http://www.scutgame.com/"      

diff --git a/Release/6.7.9.8/Install/scut36.ico → Release/6.7.9.10/Install/scut36.ico b/Release/6.7.9.8/Install/scut36.ico → Release/6.7.9.10/Install/scut36.ico
diff --git a/...e/6.7.9.8/Lib/ICSharpCode.SharpZipLib.dll → .../6.7.9.10/Lib/ICSharpCode.SharpZipLib.dll b/...e/6.7.9.8/Lib/ICSharpCode.SharpZipLib.dll → .../6.7.9.10/Lib/ICSharpCode.SharpZipLib.dll
diff --git a/Release/6.7.9.8/Lib/IronPython.Modules.dll → Release/6.7.9.10/Lib/IronPython.Modules.dll b/Release/6.7.9.8/Lib/IronPython.Modules.dll → Release/6.7.9.10/Lib/IronPython.Modules.dll
diff --git a/Release/6.7.9.8/Lib/IronPython.dll → Release/6.7.9.10/Lib/IronPython.dll b/Release/6.7.9.8/Lib/IronPython.dll → Release/6.7.9.10/Lib/IronPython.dll
diff --git a/Release/6.7.9.8/Lib/KopiLua.dll → Release/6.7.9.10/Lib/KopiLua.dll b/Release/6.7.9.8/Lib/KopiLua.dll → Release/6.7.9.10/Lib/KopiLua.dll
diff --git a/Release/6.7.9.8/Lib/Microsoft.Dynamic.dll → Release/6.7.9.10/Lib/Microsoft.Dynamic.dll b/Release/6.7.9.8/Lib/Microsoft.Dynamic.dll → Release/6.7.9.10/Lib/Microsoft.Dynamic.dll
diff --git a/Release/6.7.9.8/Lib/Microsoft.Scripting.dll → Release/6.7.9.10/Lib/Microsoft.Scripting.dll b/Release/6.7.9.8/Lib/Microsoft.Scripting.dll → Release/6.7.9.10/Lib/Microsoft.Scripting.dll
diff --git a/Release/6.7.9.10/Lib/Mono.Cecil.Mdb.dll b/Release/6.7.9.10/Lib/Mono.Cecil.Mdb.dll
diff --git a/Release/6.7.9.10/Lib/Mono.Cecil.Pdb.dll b/Release/6.7.9.10/Lib/Mono.Cecil.Pdb.dll
diff --git a/Release/6.7.9.10/Lib/Mono.Cecil.dll b/Release/6.7.9.10/Lib/Mono.Cecil.dll
diff --git a/Release/6.7.9.10/Lib/MySql.Data.dll b/Release/6.7.9.10/Lib/MySql.Data.dll
diff --git a/Release/6.7.9.10/Lib/NLog.dll b/Release/6.7.9.10/Lib/NLog.dll
diff --git a/Release/6.7.9.8/Lib/NLua.dll → Release/6.7.9.10/Lib/NLua.dll b/Release/6.7.9.8/Lib/NLua.dll → Release/6.7.9.10/Lib/NLua.dll
diff --git a/Release/6.7.9.10/Lib/Newtonsoft.Json.dll b/Release/6.7.9.10/Lib/Newtonsoft.Json.dll
diff --git a/Release/6.7.9.8/Lib/ScutSecurity.dll → Release/6.7.9.10/Lib/ScutSecurity.dll b/Release/6.7.9.8/Lib/ScutSecurity.dll → Release/6.7.9.10/Lib/ScutSecurity.dll
diff --git a/Release/6.7.9.8/Lib/ServiceStack.Common.dll → Release/6.7.9.10/Lib/ServiceStack.Common.dll b/Release/6.7.9.8/Lib/ServiceStack.Common.dll → Release/6.7.9.10/Lib/ServiceStack.Common.dll
diff --git a/...e/6.7.9.8/Lib/ServiceStack.Interfaces.dll → .../6.7.9.10/Lib/ServiceStack.Interfaces.dll b/...e/6.7.9.8/Lib/ServiceStack.Interfaces.dll → .../6.7.9.10/Lib/ServiceStack.Interfaces.dll
diff --git a/Release/6.7.9.10/Lib/ServiceStack.Redis.dll b/Release/6.7.9.10/Lib/ServiceStack.Redis.dll
diff --git a/Release/6.7.9.8/Lib/ServiceStack.Text.dll → Release/6.7.9.10/Lib/ServiceStack.Text.dll b/Release/6.7.9.8/Lib/ServiceStack.Text.dll → Release/6.7.9.10/Lib/ServiceStack.Text.dll
diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.Common.dll b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.dll
diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.Common.pdb b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.pdb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<%@ WebHandler Language="C#" CodeBehind="Default.ashx.cs" Class="AccountServer.Default" %>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<%@ Application Codebehind="Global.asax.cs" Inherits="AccountServer.Global" Language="C#" %>