From 56bfd89db9ad48dcdce8941fd8c0937b09c82020 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 15 二月 2019 15:19:04 +0800 Subject: [PATCH] 6211 【后端】【1.6】合服任务单（合服邮件、重置首充双倍、重置商店购买次数、设置合服命令SetMixServer） --- 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 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 13 files changed, 1 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 -- Gitblit v1.8.0