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

cehua_wcy

2018-09-14 05a9d821a2f66b282f30517e79a270539588a951

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

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -208,7 +208,7 @@
DungeonDeliver    31020|31030|31150                

DungeonIntegral    10000                

BuyFBCntCost    {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50"}                

FBEncourageBuff    {31080:20051,52010:20081}				
FBEncourageBuff    {31080:20051,52010:20081}    {31080:10,52010:10}    31080_10|52010_20		
DropRecordValue    4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078                

DropRecordEquipment    {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}                

DropRecordNormal    2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251                


 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt

@@ -5,7 +5,7 @@
4    3    0    15    0    {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]}    50000    {"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}

5    5    0    15    30    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}    60000    {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}

6    6    1    15    50    {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]}    83000    {"exp":"12474*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}

7    10    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]}    150000    {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}

7    10    0    25    0    {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"},{"ItemID":102,"ItemCount":"4"}]}    150000    {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}

8    14    0    8    0    {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}    50000    {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}

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

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