From cffbb73319ad2908d80f0b8c5ee417e130214a43 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期五, 15 二月 2019 16:56:29 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 21 +++++++++++++++++++++ CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1 + CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc | 0 /dev/null | 0 CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0 14 files changed, 22 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt index e703702..b34c731 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt @@ -82,3 +82,4 @@ CrossRealmPKCfg [100, 5] 180 50 CrossRealmPKScore 0 [100, 80] min(cWinCount*20,100) MixServer 5 +MixServerMail [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]] [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]] [500, 2000000] [[947,1,1]] diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc index 8bc937d..ede0a55 100644 --- a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc +++ b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc index dfed7ac..85ce23b 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc index 8e2a400..b948352 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc index 0415261..f4c022c 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index f5e2156..f8d0220 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 4d606ed..6e1c7ff 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc index 2da2132..23f6654 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc deleted file mode 100644 index 13c8911..0000000 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc +++ /dev/null Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc index d04edf5..610d36d 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc index 7b860d8..ba8e040 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc index 9b76625..4c44936 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 9721ac2..9bdc929 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt index deed504..56642c3 100644 --- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt @@ -511,3 +511,24 @@ lbj.chlb.18 104021343 18 111 0 lbj.lclb.30 104021343 30 112 0 lbj.zqlb.98 104021343 98 113 0 +yyb2.18 yybgame2 18 101 0 +yyb2.1 yybgame2 10 102 0 +yyb2.3 yybgame2 30 103 0 +yyb2.98 yybgame2 98 104 0 +yyb2.128 yybgame2 128 105 0 +yyb2.198 yybgame2 198 106 0 +yyb2.328 yybgame2 328 107 0 +yyb2.648 yybgame2 648 108 0 +yyb2.3000 yybgame2 3000 109 0 +yyb2.test1 yybgame2 1 110 0 +yyb2.android.6 yybgame2 6 0 2 +yyb2.android.30 yybgame2 30 0 4 +yyb2.android.68 yybgame2 68 0 5 +yyb2.android.128 yybgame2 128 0 7 +yyb2.android.168 yybgame2 168 0 8 +yyb2.android.18 yybgame2 18 0 3 +yyb2.android.98 yybgame2 98 0 6 +yyb2.android.198 yybgame2 198 0 9 +yyb2.android.jbch yybgame2 18 111 0 +yyb2.android.ntlc yybgame2 30 112 0 +yyb2.android.jszq yybgame2 98 113 0 -- Gitblit v1.8.0