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

cehua-TT

2018-08-14 7dff276f30fd4685f6fd8f31530726a72ef1e971

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

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ExitFB.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -91,6 +91,7 @@
GodWeapon3    107|108|109    0    0    0    0

GodWeapon4    110|111|112    0    0    0    0

GodWeaponActive    1    0    0    0    0

GodWeaponSys    {1:'GetGodWeapon',2:'GetGodWeapon',3:'GetGodWeapon'}				
GodLv    {1:[100,200,300,400],2:[100,200,300,400],3:[100,200,300,400]}                

WorldLvExpRate    int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000)    0    0    0    0

EquipSuitLimit    4    2    3    0    0

@@ -268,7 +269,7 @@
GeTuiTJG    离线挂机已开始托管角色挂机，角色当前经验效率：%s经验/分，剩余离线挂机时间：%s小时%s分钟    您被[%s]杀死，剩余离线挂机时间：%s小时%s分钟    当前背包已满，赶快上线查收战利品吧    您的离线挂机时间已不足1个小时    

EquipDecomposeAward    10    [4611,4612,4613,4614,4615]            

ReloadQuests    0                

DownReward    [(14,1,1),(911,1,1)]     70			
DownReward    [(3,1,1),(911,1,1)]     70			
FreeGoodsOpenTime    259200                

CeremonyWorldLv    {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}                

CeremonyRecharge    {"0":[[1,10,1],[2,10,1],[3,10,1]],"1":[[1,10,1],[2,10,1],[3,10,1]],"2":[[1,10,1],[2,10,1],[3,10,1]]}                


 db/PyMongoDataServer/PySysDB/tagGodWeapon.txt

@@ -1,4 +1,4 @@
Type    Lv    NeedExp    AttrType    AttrNum    SkillID

Type    Lv    NeedExp    AttrType    AttrNum    SkillID    SysMark

1    1    10    6    3901    0

1    2    20    6    4260    0

1    3    30    6    4622    0


 db/PyMongoDataServer/PySysDB/tagHorse.txt

@@ -1,5 +1,5 @@
HorseID    ItemID    UnlockItemID    UnlockItemCnt    InitLV    MaxLV    UseNeedRank    Quality    InitFightPower

100    289    259    1    1    20    1    2    1036

HorseID    ItemID    UnlockItemID    UnlockItemCnt    InitLV    MaxLV    UseNeedRank    Quality    InitFightPower    UnlockSys

100    289    259    1    1    20    1    2    1036    GetMount

101    280    250    1    1    20    1    2    1396

201    281    251    1    1    30    1    3    2116

301    282    252    1    1    40    1    4    3600


 db/PyMongoDataServer/PySysDB/tagHorseUp.txt

@@ -1,8 +1,8 @@
HorseID    LV    NeedExp    AttrType    AttrValue    SkillID

HorseID    LV    NeedExp    AttrType    AttrValue    SkillID    SysMark

100    1    98    6|7|23    518|25|20    0

100    2    107    6|7|23    676|33|20    0

100    3    116    6|7|23    842|42|20    0

100    4    126    6|7|23    1017|50|20    49000

100    4    126    6|7|23    1017|50|20    49000    MountUpLv

100    5    136    6|7|23    1200|60|20    0

100    6    148    6|7|23    1391|69|20    0

100    7    159    6|7|23    1596|79|20    0


 db/PyMongoDataServer/PySysDB/tagPetInfo.txt

@@ -1,5 +1,5 @@
ID    Quality    UnLockNeedItemID    UnLockNeedItemCnt    DecomposeExp    InitRank    MaxRank    UseNeedRank    SkillID    SkillUnLock    InitFightPower

50106001    2    4201    1    1000    1    20    1    48200|48205|48210    4|10|20    1036

ID    Quality    UnlockSys    UnLockNeedItemID    UnLockNeedItemCnt    DecomposeExp    InitRank    MaxRank    UseNeedRank    SkillID    SkillUnLock    SkillUnLockSys    InitFightPower

50106001    2    GetPet    4201    1    1000    1    20    1    48200|48205|48210    4|10|20    ['PetUpLv','PetUpLv','PetUpLv']    1036

50106002    2    4202    1    1000    1    20    4    48215|48220|48225    4|10|20    1396

50106101    3    4203    1    1000    1    30    6    47111|48235|48240    4|10|20    2476

50106102    3    4204    1    1000    1    30    6    48245|48250|48255    4|10|20    2476