diff --git a/Release/6.7.9.10/AccountServer/Web/Default.ashx b/Release/6.7.9.10/AccountServer/Web/Default.ashx new file mode 100644 index 00000000..00ea38fa --- /dev/null +++ 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 new file mode 100644 index 00000000..de22cfd2 --- /dev/null +++ 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 new file mode 100644 index 00000000..cc47dc98 --- /dev/null +++ b/Release/6.7.9.10/AccountServer/Web/NLog.config @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Release/6.7.9.10/AccountServer/Web/Web.config b/Release/6.7.9.10/AccountServer/Web/Web.config new file mode 100644 index 00000000..55e32a25 --- /dev/null +++ b/Release/6.7.9.10/AccountServer/Web/Web.config @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/6.7.9.10/AccountServer/Web/bin/AccountServer.dll b/Release/6.7.9.10/AccountServer/Web/bin/AccountServer.dll new file mode 100644 index 00000000..09e05f04 Binary files /dev/null and b/Release/6.7.9.10/AccountServer/Web/bin/AccountServer.dll differ diff --git a/Release/6.7.9.8/Lib/Mono.Cecil.Pdb.dll b/Release/6.7.9.10/AccountServer/Web/bin/Mono.Cecil.Pdb.dll similarity index 100% rename from Release/6.7.9.8/Lib/Mono.Cecil.Pdb.dll rename to Release/6.7.9.10/AccountServer/Web/bin/Mono.Cecil.Pdb.dll diff --git a/Release/6.7.9.8/Lib/Mono.Cecil.dll b/Release/6.7.9.10/AccountServer/Web/bin/Mono.Cecil.dll similarity index 100% rename from Release/6.7.9.8/Lib/Mono.Cecil.dll rename to Release/6.7.9.10/AccountServer/Web/bin/Mono.Cecil.dll diff --git a/Release/6.7.9.8/Lib/MySql.Data.dll b/Release/6.7.9.10/AccountServer/Web/bin/MySql.Data.dll similarity index 100% rename from Release/6.7.9.8/Lib/MySql.Data.dll rename to Release/6.7.9.10/AccountServer/Web/bin/MySql.Data.dll diff --git a/Release/6.7.9.8/Lib/NLog.dll b/Release/6.7.9.10/AccountServer/Web/bin/NLog.dll similarity index 100% rename from Release/6.7.9.8/Lib/NLog.dll rename to Release/6.7.9.10/AccountServer/Web/bin/NLog.dll diff --git a/Release/6.7.9.8/Lib/Newtonsoft.Json.dll b/Release/6.7.9.10/AccountServer/Web/bin/Newtonsoft.Json.dll similarity index 100% rename from Release/6.7.9.8/Lib/Newtonsoft.Json.dll rename to Release/6.7.9.10/AccountServer/Web/bin/Newtonsoft.Json.dll diff --git a/Release/6.7.9.8/Lib/ServiceStack.Redis.dll b/Release/6.7.9.10/AccountServer/Web/bin/ServiceStack.Redis.dll similarity index 100% rename from Release/6.7.9.8/Lib/ServiceStack.Redis.dll rename to Release/6.7.9.10/AccountServer/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 new file mode 100644 index 00000000..3b536e7a Binary files /dev/null and b/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.Common.dll differ 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 new file mode 100644 index 00000000..6edcdde3 Binary files /dev/null and b/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.Game.dll differ 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 new file mode 100644 index 00000000..a4a1b6fd Binary files /dev/null and b/Release/6.7.9.10/AccountServer/Web/bin/ZyGames.Framework.dll differ diff --git a/Release/6.7.9.8/Lib/protobuf-net.dll b/Release/6.7.9.10/AccountServer/Web/bin/protobuf-net.dll similarity index 100% rename from Release/6.7.9.8/Lib/protobuf-net.dll rename to Release/6.7.9.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 new file mode 100644 index 00000000..bcc027b9 Binary files /dev/null and b/Release/6.7.9.10/Console/GameServer.exe differ diff --git a/Release/6.7.9.8/Console/GameServer.exe.config b/Release/6.7.9.10/Console/GameServer.exe.config similarity index 97% rename from Release/6.7.9.8/Console/GameServer.exe.config rename to Release/6.7.9.10/Console/GameServer.exe.config index 5490abbf..4560960c 100644 --- a/Release/6.7.9.8/Console/GameServer.exe.config +++ b/Release/6.7.9.10/Console/GameServer.exe.config @@ -20,6 +20,7 @@ + diff --git a/Release/6.7.9.10/Console/GameServer.pdb b/Release/6.7.9.10/Console/GameServer.pdb new file mode 100644 index 00000000..ddbe0352 Binary files /dev/null and b/Release/6.7.9.10/Console/GameServer.pdb differ diff --git a/Release/6.7.9.8/Console/Install.bat b/Release/6.7.9.10/Console/Install.bat similarity index 100% rename from Release/6.7.9.8/Console/Install.bat rename to Release/6.7.9.10/Console/Install.bat diff --git a/Release/6.7.9.8/Console/NLog.config b/Release/6.7.9.10/Console/NLog.config similarity index 100% rename from Release/6.7.9.8/Console/NLog.config rename to Release/6.7.9.10/Console/NLog.config diff --git a/Release/6.7.9.8/Console/Script/CsScript/Action/Action1000.cs b/Release/6.7.9.10/Console/Script/CsScript/Action/Action1000.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/CsScript/Action/Action1000.cs rename to Release/6.7.9.10/Console/Script/CsScript/Action/Action1000.cs diff --git a/Release/6.7.9.8/Console/Script/CsScript/Action/Action1001.cs b/Release/6.7.9.10/Console/Script/CsScript/Action/Action1001.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/CsScript/Action/Action1001.cs rename to Release/6.7.9.10/Console/Script/CsScript/Action/Action1001.cs diff --git a/Release/6.7.9.8/Console/Script/CsScript/Locale/SimplifiedLanguage.cs b/Release/6.7.9.10/Console/Script/CsScript/Locale/SimplifiedLanguage.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/CsScript/Locale/SimplifiedLanguage.cs rename to Release/6.7.9.10/Console/Script/CsScript/Locale/SimplifiedLanguage.cs diff --git a/Release/6.7.9.8/Console/Script/CsScript/LuaFuncProxy.cs b/Release/6.7.9.10/Console/Script/CsScript/LuaFuncProxy.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/CsScript/LuaFuncProxy.cs rename to Release/6.7.9.10/Console/Script/CsScript/LuaFuncProxy.cs diff --git a/Release/6.7.9.8/Console/Script/CsScript/MainClass.cs b/Release/6.7.9.10/Console/Script/CsScript/MainClass.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/CsScript/MainClass.cs rename to Release/6.7.9.10/Console/Script/CsScript/MainClass.cs diff --git a/Release/6.7.9.8/Console/Script/LuaScript/Action/Action1001.lua b/Release/6.7.9.10/Console/Script/LuaScript/Action/Action1001.lua similarity index 100% rename from Release/6.7.9.8/Console/Script/LuaScript/Action/Action1001.lua rename to Release/6.7.9.10/Console/Script/LuaScript/Action/Action1001.lua diff --git a/Release/6.7.9.8/Console/Script/Model/GuestUser.cs b/Release/6.7.9.10/Console/Script/Model/GuestUser.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/Model/GuestUser.cs rename to Release/6.7.9.10/Console/Script/Model/GuestUser.cs diff --git a/Release/6.7.9.8/Console/Script/Model/UserRanking.cs b/Release/6.7.9.10/Console/Script/Model/UserRanking.cs similarity index 100% rename from Release/6.7.9.8/Console/Script/Model/UserRanking.cs rename to Release/6.7.9.10/Console/Script/Model/UserRanking.cs diff --git a/Release/6.7.9.8/Console/ScutSMS Readme.chm b/Release/6.7.9.10/Console/ScutSMS Readme.chm similarity index 100% rename from Release/6.7.9.8/Console/ScutSMS Readme.chm rename to Release/6.7.9.10/Console/ScutSMS Readme.chm diff --git a/Release/6.7.9.8/Console/ScutSMS.exe b/Release/6.7.9.10/Console/ScutSMS.exe similarity index 100% rename from Release/6.7.9.8/Console/ScutSMS.exe rename to Release/6.7.9.10/Console/ScutSMS.exe diff --git a/Release/6.7.9.8/Install/SCUTServerSetup(x86).iss b/Release/6.7.9.10/Install/SCUTServerSetup(x86).iss similarity index 99% rename from Release/6.7.9.8/Install/SCUTServerSetup(x86).iss rename to Release/6.7.9.10/Install/SCUTServerSetup(x86).iss index e657dfab..ed6cd20d 100644 --- a/Release/6.7.9.8/Install/SCUTServerSetup(x86).iss +++ b/Release/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 b/Release/6.7.9.10/Install/SCUTServerSetup.iss similarity index 99% rename from Release/6.7.9.8/Install/SCUTServerSetup.iss rename to Release/6.7.9.10/Install/SCUTServerSetup.iss index 1197afe1..cbddb17c 100644 --- a/Release/6.7.9.8/Install/SCUTServerSetup.iss +++ b/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 b/Release/6.7.9.10/Install/scut36.ico similarity index 100% rename from Release/6.7.9.8/Install/scut36.ico rename to Release/6.7.9.10/Install/scut36.ico diff --git a/Release/6.7.9.8/Lib/ICSharpCode.SharpZipLib.dll b/Release/6.7.9.10/Lib/ICSharpCode.SharpZipLib.dll similarity index 100% rename from Release/6.7.9.8/Lib/ICSharpCode.SharpZipLib.dll rename to Release/6.7.9.10/Lib/ICSharpCode.SharpZipLib.dll diff --git a/Release/6.7.9.8/Lib/IronPython.Modules.dll b/Release/6.7.9.10/Lib/IronPython.Modules.dll similarity index 100% rename from Release/6.7.9.8/Lib/IronPython.Modules.dll rename to Release/6.7.9.10/Lib/IronPython.Modules.dll diff --git a/Release/6.7.9.8/Lib/IronPython.dll b/Release/6.7.9.10/Lib/IronPython.dll similarity index 100% rename from Release/6.7.9.8/Lib/IronPython.dll rename to Release/6.7.9.10/Lib/IronPython.dll diff --git a/Release/6.7.9.8/Lib/KopiLua.dll b/Release/6.7.9.10/Lib/KopiLua.dll similarity index 100% rename from Release/6.7.9.8/Lib/KopiLua.dll rename to Release/6.7.9.10/Lib/KopiLua.dll diff --git a/Release/6.7.9.8/Lib/Microsoft.Dynamic.dll b/Release/6.7.9.10/Lib/Microsoft.Dynamic.dll similarity index 100% rename from Release/6.7.9.8/Lib/Microsoft.Dynamic.dll rename to Release/6.7.9.10/Lib/Microsoft.Dynamic.dll diff --git a/Release/6.7.9.8/Lib/Microsoft.Scripting.dll b/Release/6.7.9.10/Lib/Microsoft.Scripting.dll similarity index 100% rename from Release/6.7.9.8/Lib/Microsoft.Scripting.dll rename to 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 new file mode 100644 index 00000000..4882ec89 Binary files /dev/null and b/Release/6.7.9.10/Lib/Mono.Cecil.Mdb.dll differ diff --git a/Release/6.7.9.10/Lib/Mono.Cecil.Pdb.dll b/Release/6.7.9.10/Lib/Mono.Cecil.Pdb.dll new file mode 100644 index 00000000..1a39fac7 Binary files /dev/null and b/Release/6.7.9.10/Lib/Mono.Cecil.Pdb.dll differ diff --git a/Release/6.7.9.10/Lib/Mono.Cecil.dll b/Release/6.7.9.10/Lib/Mono.Cecil.dll new file mode 100644 index 00000000..8d313907 Binary files /dev/null and b/Release/6.7.9.10/Lib/Mono.Cecil.dll differ diff --git a/Release/6.7.9.10/Lib/MySql.Data.dll b/Release/6.7.9.10/Lib/MySql.Data.dll new file mode 100644 index 00000000..95a2d9bf Binary files /dev/null and b/Release/6.7.9.10/Lib/MySql.Data.dll differ diff --git a/Release/6.7.9.10/Lib/NLog.dll b/Release/6.7.9.10/Lib/NLog.dll new file mode 100644 index 00000000..153b966a Binary files /dev/null and b/Release/6.7.9.10/Lib/NLog.dll differ diff --git a/Release/6.7.9.8/Lib/NLua.dll b/Release/6.7.9.10/Lib/NLua.dll similarity index 100% rename from Release/6.7.9.8/Lib/NLua.dll rename to 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 new file mode 100644 index 00000000..1c16c11f Binary files /dev/null and b/Release/6.7.9.10/Lib/Newtonsoft.Json.dll differ diff --git a/Release/6.7.9.8/Lib/ScutSecurity.dll b/Release/6.7.9.10/Lib/ScutSecurity.dll similarity index 95% rename from Release/6.7.9.8/Lib/ScutSecurity.dll rename to Release/6.7.9.10/Lib/ScutSecurity.dll index 5f1f0009..002b0fa0 100644 Binary files a/Release/6.7.9.8/Lib/ScutSecurity.dll and b/Release/6.7.9.10/Lib/ScutSecurity.dll differ diff --git a/Release/6.7.9.8/Lib/ServiceStack.Common.dll b/Release/6.7.9.10/Lib/ServiceStack.Common.dll similarity index 100% rename from Release/6.7.9.8/Lib/ServiceStack.Common.dll rename to Release/6.7.9.10/Lib/ServiceStack.Common.dll diff --git a/Release/6.7.9.8/Lib/ServiceStack.Interfaces.dll b/Release/6.7.9.10/Lib/ServiceStack.Interfaces.dll similarity index 100% rename from Release/6.7.9.8/Lib/ServiceStack.Interfaces.dll rename to Release/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 new file mode 100644 index 00000000..f015ccfd Binary files /dev/null and b/Release/6.7.9.10/Lib/ServiceStack.Redis.dll differ diff --git a/Release/6.7.9.8/Lib/ServiceStack.Text.dll b/Release/6.7.9.10/Lib/ServiceStack.Text.dll similarity index 100% rename from Release/6.7.9.8/Lib/ServiceStack.Text.dll rename to 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 new file mode 100644 index 00000000..3b536e7a Binary files /dev/null and b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.dll differ diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.Common.pdb b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.pdb new file mode 100644 index 00000000..0b735994 Binary files /dev/null and b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.pdb differ diff --git a/Release/6.7.9.8/Lib/ZyGames.Framework.Common.XML b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.xml similarity index 97% rename from Release/6.7.9.8/Lib/ZyGames.Framework.Common.XML rename to Release/6.7.9.10/Lib/ZyGames.Framework.Common.xml index 264c24d7..431187d5 100644 --- a/Release/6.7.9.8/Lib/ZyGames.Framework.Common.XML +++ b/Release/6.7.9.10/Lib/ZyGames.Framework.Common.xml @@ -119,7 +119,6 @@ - @@ -757,6 +756,15 @@ + + + + + + + + + @@ -789,6 +797,16 @@ + + + Post request + + + + + + + Post request @@ -806,45 +824,45 @@ - + + + Post request + + 请求的URL + 随同请求POST的参数 + 请求的超时时间 + 请求的客户端浏览器信息，可以为空 + 发送HTTP请求时所用的编码 + + 随同HTTP请求发送的Cookie信息，如果不需要身份验证可以为空 + + + - + - - + - + + - - - Post request - - 请求的URL - 随同请求POST的参数 - 请求的超时时间 - 请求的客户端浏览器信息，可以为空 - 发送HTTP请求时所用的编码 - - 随同HTTP请求发送的Cookie信息，如果不需要身份验证可以为空 - - - + @@ -931,6 +949,16 @@ + + + + + + + wait get lock object + enter lock object + + @@ -1098,9 +1126,17 @@ + + + + + + + 只在编译器的DEBUG下输出到Debug目录 + @@ -1194,6 +1230,20 @@ Unix timestamp, val:1970-01-01 00:00:00 UTC + + + + + + + + + + + + + + 指定时间一年中是第几周 @@ -1350,38 +1400,78 @@ + + + + + + + + + 尝试相加,防止溢出 + + + + + + + + + + 尝试相加,防止溢出 + + + + + + + + + + 尝试相减,防止溢出 + + + + + + + + + + 尝试相减,防止溢出 + @@ -1822,6 +1912,11 @@ + + + Use Utc time + + 当天时间一年中是第几周 @@ -1892,7 +1987,7 @@ - + Depth copy property and field of object. @@ -2290,6 +2385,17 @@ + + + + + + + + + Use default factory create. + + set item @@ -3136,12 +3242,13 @@ 二进字节数据 - + 使用protobuf反序列化二进制数组为对象 二进字节数据 反序列化的类型. + @@ -3159,12 +3266,13 @@ - + 反序列化二进制数组为对象,并gzip压缩 + @@ -6234,37 +6342,77 @@ - 计划配置信息 + Plan config - + - + Only run once + + + equal this time, format:"2015/01/01 09:00:00", or "09:00:00" is today time + - + - + Every minute run + + + more than or equal this time, format: "2015/01/01 09:00:00", or "09:00:00" is today time + less than this time, format: "2015/01/02 00:00:00", or "00:00:00" or "null" is tomorrow time + interval run times + - + - + Every day run + + + more than or equal this time, format: "2015/01/01 09:00:00", or "09:00:00" is today time + - + - + Every week run + + + DayOfWeek + more than or equal this time, format: "2015/01/01 09:00:00", or "09:00:00" is today time + + + + + + Every week run + + + + DayOfWeek + more than or equal this time, format: "2015/01/01 09:00:00", or "09:00:00" is today time + less than this time, format: "2015/01/02 00:00:00", or "00:00:00" or "null" is tomorrow time + interval run times + - + + + + PlanCycle + more than or equal this time, format: "2015/01/01 09:00:00", or "09:00:00" is today time + less than this time, format: "2015/01/02 00:00:00", or "00:00:00" or "null" is tomorrow time + is cycle run + interval run times + @@ -6273,9 +6421,9 @@ - + - 设置误差间隔 + Gets plan is excuting num. @@ -6300,7 +6448,7 @@ - 名称 + Gets plan name @@ -6310,7 +6458,7 @@ - + Gets or sets target @@ -6325,22 +6473,27 @@ - Expired time + Gets or sets expired time - + Gets expired exit run. - + Gets today is end run - + Gets pre excute time + + + + + Gets next excute time @@ -6355,8 +6508,15 @@ + Watch code process run time. + + + + + + @@ -6364,6 +6524,18 @@ + + + Check of tag use time. + + + + + + + Write to log. + + @@ -6462,13 +6634,6 @@ - - - 设置定时器 - - - - 显示释放 @@ -6487,6 +6652,11 @@ + + + Thread run interval time + + diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.Game.dll b/Release/6.7.9.10/Lib/ZyGames.Framework.Game.dll new file mode 100644 index 00000000..a62b1de5 Binary files /dev/null and b/Release/6.7.9.10/Lib/ZyGames.Framework.Game.dll differ diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.Game.pdb b/Release/6.7.9.10/Lib/ZyGames.Framework.Game.pdb new file mode 100644 index 00000000..70d7b6d9 Binary files /dev/null and b/Release/6.7.9.10/Lib/ZyGames.Framework.Game.pdb differ diff --git a/Release/6.7.9.8/Lib/ZyGames.Framework.Game.xml b/Release/6.7.9.10/Lib/ZyGames.Framework.Game.xml similarity index 98% rename from Release/6.7.9.8/Lib/ZyGames.Framework.Game.xml rename to Release/6.7.9.10/Lib/ZyGames.Framework.Game.xml index 1cb5e223..edbc8bd5 100644 --- a/Release/6.7.9.8/Lib/ZyGames.Framework.Game.xml +++ b/Release/6.7.9.10/Lib/ZyGames.Framework.Game.xml @@ -32,12 +32,13 @@ Message. - + + @@ -50,25 +51,27 @@ 聊天缓存 - + 加载数据工厂 - + 加载子项数据工厂 Key. + - + + @@ -148,25 +151,27 @@ 私聊缓存 - + 加载数据工厂 - + 加载子项数据工厂 Key. + - + + @@ -2479,6 +2484,7 @@ + @@ -2983,11 +2989,12 @@ - + + @@ -3236,6 +3243,11 @@ + + + Raises the service stop event. + + @@ -3347,7 +3359,7 @@ - + on web site use @@ -3356,6 +3368,11 @@ + + + Sets Address key of http + + @@ -3577,6 +3594,16 @@ 服务器间内部通讯通道 + + + + + + + + + + Message of custom @@ -3647,6 +3674,11 @@ + Server push to data callback + + + + @@ -3688,17 +3720,17 @@ - + - + - + @@ -3763,6 +3795,11 @@ + + + + + Process start logic init @@ -3894,6 +3931,18 @@ + + + + + + + + + + + + @@ -3971,6 +4020,11 @@ + + + + + @@ -4044,6 +4098,12 @@ + + + + + + @@ -4065,6 +4125,11 @@ get current sessionid. + + + get address for remote + + get current session. @@ -4912,6 +4977,14 @@ + + + + + + + + Get session by ExSocket. @@ -4964,7 +5037,7 @@ - + 获得锁 @@ -5190,6 +5263,11 @@ + + + + + Raises the received before event. @@ -5226,9 +5304,9 @@ - + - Raises the service stop event. + Sets Address key of http @@ -7790,6 +7868,11 @@ + + + + + AnySDK @@ -8396,6 +8479,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -8404,6 +8507,14 @@ + + + + + + + + @@ -8670,6 +8781,16 @@ + + + Request account server Timeout. + + + + + Parse json error. + + @@ -9732,6 +9853,18 @@ + + + + + + + + + + + + @@ -9850,6 +9983,11 @@ 参数名 + + + + + 读取INT类型的请求参数 @@ -10013,11 +10151,6 @@ Action编号 - - - get address for remote - - 参数源字串 @@ -10460,12 +10593,6 @@ - - - 获取6位随机密码 - - - 从DB中加载未被注册的通行证ID @@ -10574,7 +10701,7 @@ - 修改：伍张发 + @@ -10587,36 +10714,33 @@ - - - 获取用户类型 - - - 是否有绑定DeviceID - + Inserts the sns user. The sns user. Parameter names. Parameter values. + - + 向社区中心添加用户 - + 修改密码 + + 只重置密码 @@ -10707,19 +10831,29 @@ 防多次点击产生多个账号与imei绑定 - + + + 获取随机GUID密码 + + + + 获取通行证 if null then get new pid + + - + 注册 + + use custom passport @@ -10732,45 +10866,54 @@ 0:失败, 1:成功 2:已绑定 - + + + use custom passport userid - + 注册 + pid - + - 获取用户类型 + 登录WEB调用 + + use custom passport - + - 登录WEB调用 + + + use custom passport - + 登录 + + use custom passport @@ -10780,20 +10923,22 @@ - + 通道商验证登录 + - + 修改密码 + @@ -10803,12 +10948,13 @@ - + 检查通行证密码 + diff --git a/Release/6.7.9.8/Lib/ZyGames.Framework.XML b/Release/6.7.9.10/Lib/ZyGames.Framework.XML similarity index 91% rename from Release/6.7.9.8/Lib/ZyGames.Framework.XML rename to Release/6.7.9.10/Lib/ZyGames.Framework.XML index f9c25fc4..61510af8 100644 --- a/Release/6.7.9.8/Lib/ZyGames.Framework.XML +++ b/Release/6.7.9.10/Lib/ZyGames.Framework.XML @@ -27,7 +27,19 @@ - + + + 设置实体的编号 + + + + + + + + add num + + 获取实体的下个编号 @@ -54,6 +66,21 @@ 返回有Null值 + + + + + + + + + + + + + + + 遍历实体方式 @@ -91,7 +118,7 @@ - + @@ -99,9 +126,10 @@ + - + @@ -109,33 +137,36 @@ + - + + - + + - + 加载数据工厂 - + 加载子项数据工厂 @@ -154,44 +185,55 @@ - + 加载数据 + - + 加载Enity数据 + - + 加载数据 缓存的生命周期，单位秒 + - + + + + + + + + - + 加载指定Key数据 + @@ -211,12 +253,13 @@ - + + Whether to replace the entity in cache @@ -241,11 +284,24 @@ 更新改变的数据到库中 - + + + Sync save to redis + + + + + + Sync save to redis + + + + 更新到库中是全部数据还是改变的数据 + @@ -298,6 +354,11 @@ 是否空 + + + + + Get ItemSet array @@ -490,6 +551,12 @@ + + + + + + @@ -555,6 +622,13 @@ + + + + + + + 是否禁用事件 @@ -704,6 +778,12 @@ + + + + + + @@ -759,12 +839,7 @@ 释放 - - - 设置移除状态 - - - + 执行加载数据工厂 @@ -887,8 +962,15 @@ - Only copy property + Depth copy property and field of object. + + + + + + Depth copy property and field of object. + @@ -941,7 +1023,7 @@ 设置禁用事件绑定 - + 清除子类事件句柄 @@ -999,6 +1081,11 @@ 触发通知 + + + + + 触发修改通知事件 @@ -1287,6 +1374,14 @@ + + + + + + + + 通过Redis键从缓存中获取实体对象 @@ -1302,27 +1397,53 @@ - + + + + + + + + + + + + + + + + + + + + + - + key:entity's key, value: + - + - 从Redis内存移除，并保存到数据库 + 从Redis内存移除，并保存到数据库, + + 实体类型, 实体Key列表 + + + + - @@ -1346,7 +1467,7 @@ - + 获取缓存容器对象，不存在则创建空容器对象 @@ -1453,7 +1574,7 @@ - 加载成功 + 加载成功,只在加载成功后设置 @@ -1461,9 +1582,9 @@ 加载失败 - + - + 重置初始状态 @@ -1477,14 +1598,16 @@ - + - 是否数据已加载成功 + 是否能处理过期 + + - + - 加载异常 + 是否数据已加载成功 @@ -1565,13 +1688,29 @@ + + + + + + + + + + + + + + + + - + @@ -1661,6 +1800,14 @@ + + + + + + + + @@ -1675,6 +1822,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2024,6 +2207,11 @@ + + + + + @@ -2091,7 +2279,13 @@ - + + + 以同步的方式更新Entity + + + + Process synchronized queue of redis @@ -2123,6 +2317,11 @@ + + + Write redis sync queue count + + 同步缓存数据到Redis的队列名,存储格式:key值:typename_keycode, value值:len(4)+head[id(4)+state(4)] + value,state:1 移除操作 @@ -2159,119 +2358,164 @@ 缓存容器操作类,负责数据加载管理 - + - 缓存数据容器 + 初始化容器 + + + + + + + + 分配内存 - 实体类型 - + 数据是否改变 + 实体Key + - + - - + - 遍历取 + + + - + - 遍历实体 + - 遍历项委托方法，返回值为:false结束遍历 + + - + - 遍历 + - 遍历项委托方法，第一个参数为分组Key,第二个为实体Key，返回值为:false结束遍历 + + + - + - + 遍历实体 - + + + 遍历 + + 第一个参数为分组Key,第二个为实体Key + + - 取数据以List方式 + + - + - 判断条件是否存在数据 + - - + - - + - 重新加载全部数据 + + - + - 加载全部数据 + + + - + + + + - + - 加载指定Key数据 + + + + - + - 重新加载指定Key数据 + 单一实体模型 + + + - + - 尝试取实体 + - + + + - + - 尝试增加实体 + + + + + + + - + + + + - + - 尝试取实体分组 + 分组集合模型 + + + + - + @@ -2279,190 +2523,147 @@ + + - - - 尝试增加实体分组 - - - + - 初始化容器 + + + + - + - 尝试取实体队列 + + + + - + - 尝试增加实体队列 + 队列模型 + + + - + - 尝试移除 + - 移除成功回调 + + + - + - 尝试移除 + - - 移除成功回调 - - - - - 尝试移除 - - 移除成功回调 - - - - - 尝试加载接收数据 - - 实体类型 - 接收转发器参数 - - - - - - 尝试从Redis历史记录数中检索 - - 实体类型 - redis Key - - - - - - 传送数据 - - 实体类型 - - 输送转发器参数 - - - - 获取变更的实体数据 - - - + - + - 获取变更的分组数据 + - - + + - + - 获取变更的队列数据 + - - 更新到库中是全部数据还是改变的数据 + + + - + - 触发UnChange事件数据通知 - - Group键 - - - - 尝试从DB中恢复数据 + - + - - - 是否只读容器 - - - - - 缓存池的键，缓存的根部 - - - - - 缓存数量 - - - - - 容器是否为空 - - - + + + + - + + + - - - 分配内存 - - - + - 数据是否改变 + - 实体Key + + + - + - + + -1: all - + - 遍历实体 + - + + + + + + - + - 遍历 + - 第一个参数为分组Key,第二个为实体Key + + + + - + - + 尝试从DB中恢复数据 - + + + + - + - + + + @@ -2476,99 +2677,75 @@ 加载数据 - + 加载指定Key数据 + - + - - - - - - 单一实体模型 - - - + + - + - - - + - + - - - - - - - - 分组集合模型 - - - - - + + + - + - - - - + + - + - - - - + + - + - 初始化容器 + - - + + - + - 队列模型 + - - + + - + - - - - + + @@ -2595,14 +2772,11 @@ - + - 尝试从DB中恢复数据 + - - - - + @@ -2620,12 +2794,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 内存中一定时间存在的实体，不存储数据库 - + + + + + + + @@ -2688,12 +2904,18 @@ - + Inits the cache. true, if cache was inited, false otherwise. + + + + + + @@ -2749,25 +2971,100 @@ - + + + + + + + + 是否空 + + + + + 容器数量 + + + + + 私有的缓存模型 + + + + + Get entity from redis, but not surported mutil key of entity. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - 是否空 + + + - + - 容器数量 + Take entity by keys from cache + + - + - 私有的缓存模型 + + + @@ -2780,6 +3077,13 @@ + + + + + The entity need to reload when it has be mutil key + + @@ -2884,6 +3188,13 @@ + + + Contain key of memory. + + + + 是否存在数据 @@ -2909,13 +3220,35 @@ - + + + Take entity from cache + + + + - 取子类的Key,不需要personalId,不加载数据 + Take entity by keys from cache + + + + + + + + + + + + + + + + @@ -3003,11 +3336,21 @@ 私有分组ID - + 从Redis加载所有缓存 + + + + + + + + + The entity need to reload when it has be mutil key + @@ -3025,37 +3368,54 @@ + + + + + + + + + + + 是否有多个键且未加载成功状态 + + + 更新自已的数据 - + - + + - + 处理加载数据参数 + - + 更新所有的数据 + @@ -3194,6 +3554,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 尝试接收数据 @@ -3431,6 +3819,12 @@ + + + + + + @@ -3470,11 +3864,188 @@ + + + Rank cache + + + + + + + + + + + + + + + + + + Add rank + + + + + + + + + + + + + + + + + + Exchange rank + + + + + + + + + + + + + + + + + + + + -1: max + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Take rank items + + + -1: get all + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 共享的缓存模型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3494,6 +4065,24 @@ + + + + + + + + + + + + + + + + + + @@ -3619,6 +4208,11 @@ + + + + + 查找所有匹配数据 @@ -3630,8 +4224,20 @@ 查找所有匹配数据 - - + + + + + + + + + + + + + + @@ -3655,11 +4261,12 @@ - + 更新所有的数据 + @@ -3669,6 +4276,22 @@ + + + + + + + + + + + + + + + + add or update @@ -3691,25 +4314,27 @@ - + - + + - + + @@ -4217,7 +4842,7 @@ - PoolTimeOut(ms), default 2000ms + Pool timeout release time(s), default 300s @@ -4337,7 +4962,7 @@ - Personal cache expire period + cache expire period @@ -4428,10 +5053,19 @@ + + + + + + + + Inquiry table columns + @@ -5034,7 +5668,12 @@ - 是否是主键 + Sets key is true in Entity field + + + + + Get Db table have key no @@ -5083,6 +5722,11 @@ 自增开始编号 + + + DB是否有自增编号 + + Db映射类型 @@ -5574,6 +6218,12 @@ init + + + + + + 标识ID @@ -6643,6 +7293,11 @@ reset data and trigger unchanged event. + + + Get table name of log + + @@ -6675,7 +7330,7 @@ - + Conver '-' char @@ -6719,6 +7374,12 @@ 重置状态 + + + + + + 设置属性值之前处理 @@ -6970,7 +7631,7 @@ - + expire time @@ -7054,6 +7715,11 @@ Personal结构 + + + List of rank. + + 队列方式 @@ -7285,7 +7951,7 @@ - The bytes data for hash(key/value). + The bytes data for hash(value). @@ -7323,11 +7989,12 @@ - + + @@ -7432,6 +8099,12 @@ + + + + + + 检测数据表结构变动 @@ -7614,7 +8287,7 @@ - 手动增加到内存的 + 未同步库的状态，包括新增的 @@ -7622,11 +8295,6 @@ 成功 - - - 被移除 - - 加载出错 @@ -7692,6 +8360,12 @@ + + + + + + @@ -7702,6 +8376,53 @@ + + + Rank entity + + + + + init + + + + + + + + + + + from hight to low + + + + + + + 当前对象(包括继承)的属性触发通知事件 + + 触发事件源 + + + + + + + 由IContainer对象触发 + + + + + Gets key of rank + + + + + Get score of rank no, from hight to low + + 实体架构的列信息 @@ -7908,10 +8629,11 @@ - + 获取动态的表名 + 使用表达式时的日期增量,默认当天 @@ -7985,6 +8707,16 @@ 表名的格式:$date[yyyyMMdd] or $week + + + 是否是内部使用的 + + + + + + + 主键 @@ -8069,11 +8801,12 @@ is sync data to db - + - + + @@ -8132,7 +8865,12 @@ - 获取或设置参数 + 获取或设置参数, 数据名不需要@前缀 + + + + + 动态表名指定的日期 @@ -8352,14 +9090,16 @@ - + - + + - + + @@ -8367,10 +9107,6 @@ 更新到库中是全部列，还是改变的列 - - - - Python运行环境上下方对象 @@ -8849,131 +9585,319 @@ - + + + + + + + + + + first version + + + + + Entity use hash storage version. + + + + + Entity use hash storage and mutil key use map find version. + + + + + 连接池管理 + + + + + + + + + + + + + + + init + + + + + + init + + pool setting + + + + + SetNo + + + + + + + + GetNo + + + increase num,defalut 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Process delegate + + + + + + + Process ReadOnly delegate + + + + + + + + + + + + + check connect to redis. + + + - + - 连接池管理 + Ping ip + - + - + Get read and write connection + - + - + Get read only connection + - + - init + - + - + - init + - pool setting - + + has null - + - SetNo + - - + - + - GetNo + - - increase num,defalut 1 + + - + - - - + - + - - - - + + + - + - - - - - - + + + 0 is del - + - Process delegate + - + + + - + - Process ReadOnly delegate + - + + + + - + - check connect to redis. + Get mutil entity instance from redis, but not surported mutil key of entity. + + - + - Ping ip + Try get entity + + + + - + - Get read and write connection + / + + + + + has mutil key map index - + - Get read only connection + old storage modle. - + - + update key map + + + - + - Try get entity + The object of T isn't changed. - - - + + + + + + + + Only update score, can't update entity object. + + + @@ -9001,6 +9925,13 @@ + + + + + + + Get key name of store redis entity @@ -9022,14 +9953,14 @@ - + - + Gets default redis pool setting. @@ -9154,6 +10085,11 @@ The current connection's request/response context. A task which represents an asynchronous operation to await or null if a synchronous operation already completed. + + + User identity + + @@ -9164,12 +10100,13 @@ - + + @@ -9184,13 +10121,19 @@ - + + + + + + + @@ -9387,6 +10330,11 @@ + + + Get cdn address + + listen error. @@ -9412,6 +10360,29 @@ + + + + + + + + + + + + + + + + + + + + + Get address + + @@ -9437,13 +10408,19 @@ - + + + + + + + @@ -9460,6 +10437,11 @@ + + + + + @@ -9663,16 +10645,22 @@ + + + + + Provides a 302 redirect response to the given url. - + + @@ -9686,6 +10674,11 @@ + + + + + @@ -10084,6 +11077,22 @@ + + + + + + + + + + + + + + + + @@ -10420,7 +11429,7 @@ - Read DateTime + Read DateTime, use UTC time @@ -12047,6 +13056,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -12055,6 +13084,13 @@ + + + + + + + @@ -12231,6 +13267,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Socket listener. @@ -12376,6 +13437,11 @@ + + + + + Socket settings. @@ -13496,6 +14562,12 @@ 方法名 方法参数 + + + Verify script file's md5 hash code. + + + 脚本解码 @@ -13598,6 +14670,13 @@ + + + + + + + @@ -13661,6 +14740,13 @@ + + + + + + + @@ -13683,12 +14769,11 @@ - + - @@ -13794,6 +14879,13 @@ + + + + + + + Init csharp script. @@ -13804,6 +14896,12 @@ + + + + + + 创建脚本文件信息对象 @@ -14221,12 +15319,6 @@ - - - - - - @@ -14242,11 +15334,6 @@ - - - - - diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.dll b/Release/6.7.9.10/Lib/ZyGames.Framework.dll new file mode 100644 index 00000000..a4a1b6fd Binary files /dev/null and b/Release/6.7.9.10/Lib/ZyGames.Framework.dll differ diff --git a/Release/6.7.9.10/Lib/ZyGames.Framework.pdb b/Release/6.7.9.10/Lib/ZyGames.Framework.pdb new file mode 100644 index 00000000..325bbd88 Binary files /dev/null and b/Release/6.7.9.10/Lib/ZyGames.Framework.pdb differ diff --git a/Release/6.7.9.10/Lib/protobuf-net.dll b/Release/6.7.9.10/Lib/protobuf-net.dll new file mode 100644 index 00000000..265671f2 Binary files /dev/null and b/Release/6.7.9.10/Lib/protobuf-net.dll differ diff --git a/Release/6.7.9.8/Console/GameServer.exe b/Release/6.7.9.8/Console/GameServer.exe deleted file mode 100644 index fbb97499..00000000 Binary files a/Release/6.7.9.8/Console/GameServer.exe and /dev/null differ diff --git a/Release/6.7.9.8/Lib/ZyGames.Framework.Common.dll b/Release/6.7.9.8/Lib/ZyGames.Framework.Common.dll deleted file mode 100644 index 839ad990..00000000 Binary files a/Release/6.7.9.8/Lib/ZyGames.Framework.Common.dll and /dev/null differ diff --git a/Release/6.7.9.8/Lib/ZyGames.Framework.Game.dll b/Release/6.7.9.8/Lib/ZyGames.Framework.Game.dll deleted file mode 100644 index 52deeca5..00000000 Binary files a/Release/6.7.9.8/Lib/ZyGames.Framework.Game.dll and /dev/null differ diff --git a/Release/6.7.9.8/Lib/ZyGames.Framework.dll b/Release/6.7.9.8/Lib/ZyGames.Framework.dll deleted file mode 100644 index 91aab7a8..00000000 Binary files a/Release/6.7.9.8/Lib/ZyGames.Framework.dll and /dev/null differ diff --git a/Release/readme.md b/Release/readme.md index b0762a7b..971061b0 100644 --- a/Release/readme.md +++ b/Release/readme.md @@ -6,6 +6,6 @@ Release ----------------
  • PythonLib: A library of Python scripts -
  • 6.7.9.8: Is the latest R1 version of the library Scut Server +
  • 6.7.9.10: Is the latest R1 version of the library Scut Server
Old versions of libraries need to http://scutgame.com/download/ diff --git a/readme.md b/readme.md index 687ac074..eb98bc33 100644 --- a/readme.md +++ b/readme.md @@ -94,17 +94,14 @@ Language: ## Update Log -### Version: 6.7.9.8 (2015-4-24) R1 - -* Modify 6.7.9.7 bug. - - -### Version: 6.7.9.7 (2015-4-9) RC - -* Modify framework bug. -* Modify framework API method. -* Modify 'Model' of script can debug problems. -* Add surport for distributed login server +### Version: 6.7.9.10 (2015-9-11) R1 + +* Add more key & type loading entity to cache. +* Add rank entity of list model use to cache. +* Fixed entity can not be async saved when entity is expiring. +* Fixed socket can not accept connect bug. +* Fixed machine-name & app path limit when mutil server connect to the Redis. +* Fixed account server support use custom name regist. old version [more](http://scutgame.com/log).