Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

cehua-TT

2018-11-13 08ae922084291712c0b2d65339a2e498b07f4aad

Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt

@@ -1,2 +1,3 @@
CfgID    ActMark    PlatformList    ServerIDList    StartDate    EndDate    IsDayReset    ResetType    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    LimitLV

1    test1    []    []    2018-10-1    2018-10-3    1    1    {0:["XYCOpen", []]}    {}    []    110

1    kaifu1    []    []    3    5    1    1    {0:["XYCOpen", []]}    {}    []    110

2    kaifu2    []    []    7    9    1    1    {0:["XYCOpen", []]}    {}    []    110


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4064.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc

Binary files differ

 db/PyMongoDataServer/PySysDB/tagActWishingWell.txt

@@ -1,2 +1,3 @@
CfgID    StartDate    EndDate    IsDayReset    ResetType    LimitLV    TemplateID

1    2018-10-1    2018-10-3    1    1    110    1

1    3    5    1    1    110    1

2    7    9    1    1    110    1