cehua-TT
2018-09-27 557ad9f58e7b462547029b680545319af145a2cc
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
15个文件已修改
1个文件已添加
38 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/Script/ShareDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,6 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    IsDayReset
1    test1    []    2018-8-30    2018-8-31    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate1"]    0
2    test2    [24,30]    2018-7-13    2018-7-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate1"]    0
3    NationalDay    []    2018-9-13    2018-9-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate1"]    1
4    NationalDay1    [24]    2018-9-13    2018-9-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate1"]    0
5    test3    []    5    6    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [240, "ConsumptionRebate1"]    0
1    test1    []    2018-8-30    2018-8-31    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
2    test2    [24,30]    2018-7-13    2018-7-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
3    NationalDay    []    2018-9-13    2018-9-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    1
4    NationalDay1    [24]    2018-9-13    2018-9-15    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
5    test3    []    5    6    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -809,19 +809,15 @@
Writer = hxp
Releaser = hxp
RegType = 0
RegisterPackCount = 3
RegisterPackCount = 2
PacketCMD_1=0xA5
PacketSubCMD_1=0x48
PacketCallFunc_1=OnExchangeMasterExp
PacketSubCMD_1=0x49
PacketCallFunc_1=OnAddMasterSkillPoint
PacketCMD_2=0xA5
PacketSubCMD_2=0x49
PacketCallFunc_2=OnAddMasterSkillPoint
PacketCMD_3=0xA5
PacketSubCMD_3=0x50
PacketCallFunc_3=OnResetMasterSkill
PacketSubCMD_2=0x50
PacketCallFunc_2=OnResetMasterSkill
;装备洗练
[EquipWash]
@@ -1315,4 +1311,16 @@
PacketCMD_1=0xA5
PacketSubCMD_1=0x11
PacketCallFunc_1=OnTryFirstGoldItem
PacketCallFunc_1=OnTryFirstGoldItem
;绑玉转盘
[PlayerBindJadeWheel]
ScriptName = Player\PlayerBindJadeWheel.py
Writer = xdh
Releaser = xdh
RegType = 0
RegisterPackCount = 1
PacketCMD_1=0xA5
PacketSubCMD_1=0x17
PacketCallFunc_1=OnStartBindJadeWheel
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ReGreatMaster.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ