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

cehua_wcy

2018-08-16 ad0d6ed14e230735035e4ec21b7eed04e7a82ebb

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

 CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt

@@ -44,15 +44,15 @@
43    ['易拉罐']

44    ['女人']

45    ['鸡']

46    ['活到九十九']

46    ['活到九十九','活到99']

47    ['汉界']

48    ['左']

49    ['美国']

50    ['一百年不许变']

51    ['孙悟空']

52    ['杭州']

53    ['八月十五']

54    ['飞在花丛中呀']

53    ['八月十五','8月15']

54    ['飞在花丛中呀','飞在花丛中啊']

55    ['半句多']

56    ['肺','肺部']

57    ['马']

@@ -75,7 +75,7 @@
74    ['宙斯']

75    ['美杜莎']

76    ['麻将']

77    ['中秋节']

77    ['中秋节','中秋']

78    ['凤毛麟角']

79    ['冰雨']

80    ['李莲英']

@@ -102,7 +102,7 @@
101    ['亲']

102    ['哭']

103    ['龙凤胎']

104    ['乒乓球']

104    ['乒乓球','乒乓']

105    ['快乐崇拜']

106    ['大象','象']

107    ['狼']

@@ -125,9 +125,9 @@
124    ['论点']

125    ['墨菲定律']

126    ['上海']

127    ['武汉长江大桥']

127    ['武汉长江大桥','长江大桥']

128    ['长春']

129    ['绿色']

129    ['绿色','绿']

130    ['三亚']

131    ['法国']

132    ['乔布斯']


 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerViewCache.pyc

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt

@@ -10,5 +10,5 @@
9    8    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]}    150000    {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"4"}]}

10    7    0    50    0    {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]}    167000    {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]}

11    11    0    15    0    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]}    33000    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}

12    9    0    25    0    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(4,extraData2)-3,0)+2*max(min(5,extraData2)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(4,extraData2)-3,0)+3*max(min(5,extraData2)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(4,extraData2)-3,0)+3*max(min(5,extraData2)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,extraData2),0)+max(min(2,extraData2)-1,0)+max(min(3,extraData2)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,extraData2),0)+max(min(2,extraData2)-1,0)+max(min(3,extraData2)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,extraData2),0)+max(min(2,extraData2)-1,0)+max(min(3,extraData2)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}    200000    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(max(min(4,extraData2)-3,0)+max(min(5,extraData2)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(*max(min(4,extraData2)-3,0)+2*max(min(5,extraData2)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(max(min(4,extraData2)-3,0)+2*max(min(5,extraData2)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,extraData2),0)+max(min(2,extraData2)-1,0)+max(min(3,extraData2)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,extraData2),0)+max(min(2,extraData2)-1,0)+max(min(3,extraData2)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,extraData2),0)+max(min(2,extraData2)-1,0)+max(min(3,extraData2)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}

12    9    0    25    0    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}    200000    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}

13    12    0    20    0    {"exp":"3000*reExp", "item":[{"ItemID":2211,"ItemCount":"6"}], "money":"500000"}    200000    {"exp":"1650*reExp", "item":[{"ItemID":2211,"ItemCount":"3"}]}