Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua-TT

2019-01-07 976536beaa92d533f751b0139c181e641646f55e

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 CoreServerGroup/GameServer/Script/ChConfig.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt

@@ -44,4 +44,5 @@
Map135_Llxg_32013    127.0.0.1    19001    1    500    500    250    500    30    1000    500    180    500    2000    500    2000    500    30000    3000    1000    200    500    500000    1000000    1    5000    0    127.0.0.1    16900    0    0    1    127.0.0.1    60005    0    0    60000    0    0    100    0    1:00:00    0

Map135_Llxg_32014    127.0.0.1    19001    1    500    500    250    500    30    1000    500    180    500    2000    500    2000    500    30000    3000    1000    200    500    500000    1000000    1    5000    0    127.0.0.1    16900    0    0    1    127.0.0.1    60005    0    0    60000    0    0    100    0    1:00:00    0

Map132_Plxj_32020    127.0.0.1    19001    1    500    500    250    500    30    1000    500    180    500    2000    500    2000    500    30000    3000    1000    200    500    500000    1000000    1    5000    0    127.0.0.1    16900    0    0    1    127.0.0.1    60005    0    0    60000    0    0    100    0    1:00:00    0

Map133_Bzjsc_31031    127.0.0.1    19001    1    500    500    250    500    30    1000    500    180    500    2000    500    2000    500    30000    3000    1000    200    500    500000    1000000    1    5000    0    127.0.0.1    16900    0    0    1    127.0.0.1    60005    0    0    60000    0    0    100    0    1:00:00    0
Map133_Bzjsc_31031    127.0.0.1    19001    1    500    500    250    500    30    1000    500    180    500    2000    500    2000    500    30000    3000    1000    200    500    500000    1000000    1    5000    0    127.0.0.1    16900    0    0    1    127.0.0.1    60005    0    0    60000    0    0    100    0    1:00:00    0

Map132_Plxj_32021    127.0.0.1    19001    1    500    500    250    500    30    1000    500    180    500    2000    500    2000    500    30000    3000    1000    200    500    500000    1000000    1    5000    0    127.0.0.1    16900    0    0    1    127.0.0.1    60005    0    0    60000    0    0    100    0    1:00:00    0

 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -373,9 +373,9 @@
PacketSubCMD_8=0x03

PacketCallFunc_8=PySetAdult



PacketCMD_9=

PacketSubCMD_9=

PacketCallFunc_9=

PacketCMD_9=C1

PacketSubCMD_9=05

PacketCallFunc_9=OnEnterCrossServer



PacketCMD_10=0xB4

PacketSubCMD_10=0x04

@@ -1007,12 +1007,16 @@
Writer = xdh

Releaser = xdh

RegType = 0

RegisterPackCount = 1

RegisterPackCount = 2



PacketCMD_1=0xA5

PacketSubCMD_1=0x0B

PacketCallFunc_1=OnPlayerCoatUp



PacketCMD_2=0xA5

PacketSubCMD_2=0x20

PacketCallFunc_2=OnCoatDecompose



;悬赏任务

[PlayerArrestTask]

ScriptName = Player\PlayerArrestTask.py


 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/PrintFightPower.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc

Binary files differ

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

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ClothesCoatSkin.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagCoat.txt

New file
@@ -0,0 +1,17 @@
CoatID    EquipItemID    UnlockItemID    MaxLV    CostItemCnt    StarAttr

1    200|300    289    3    1|2|3    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3000}}

2    200|301    280    3    1|2|4    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3001}}

3    200|302    281    3    1|2|5    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3002}}

4    200|303    282    3    1|2|6    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3003}}

5    200|304    284    3    1|2|7    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3004}}

6    200|305    285    3    1|2|8    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3005}}

7    200|306    283    3    1|2|9    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}

8    200|307    286    3    1|2|10    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}

9    200|308    287    3    1|2|11    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}

10    200|309    290    3    1|2|12    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3009}}

11    200|310    288    3    1|2|13    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3010}}

12    200|311    291    3    1|2|14    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3011}}

13    200|312    293    3    1|2|15    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3012}}

14    200|313    292    3    1|2|16    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3013}}

15    200|314    295    3    1|2|17    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3014}}

16    200|315    294    3    1|2|18    {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3015}}


 db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt

New file
@@ -0,0 +1,11 @@
LV    NeedExp    AttrType

1    108    6_100|7_200

2    127    6_100|7_201

3    149    6_100|7_202

4    192    6_100|7_203

5    221    6_100|7_204

6    264    6_100|7_205

7    293    6_100|7_206

8    314    6_100|7_207

9    332    6_100|7_208

10    400    6_100|7_209


 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -96,10 +96,10 @@
PetUpItem    4151    100            

SignConsumption    10                

ShopItemBuyCntLimitNPC    []    0    0    0    0

GodWeapon1    101|102|103    0    0    0    0

GodWeapon2    104|105|106    0    0    0    0

GodWeapon3    107|108|109    0    0    0    0

GodWeapon4    110|111|112    int(46870+maxHP*proDefPer/10000.0)    0    0    0

GodWeapon1    102|103    0    0    0    0

GodWeapon2    105|106    0    0    0    0

GodWeapon3    108|109    0    0    0    0

GodWeapon4    111|112    int(46870+maxHP*proDefPer/10000.0)    0    0    0

GodWeaponActive    1    {"2":[[1,100]],  "4":[[2,100]]}    {"2":250,  "4":320}    0    0

GodWeaponSys    {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}                

GodMagicExp    {"1":[1,10],"2":[1,10],"4":[1,10]}