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

cehua_wcy

2018-12-07 f24f1f762de04723a5c68a53b34b52f38ce21c09

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -142,7 +142,7 @@
FamilyStoreItemRule2   8|9|10   4|0|3   0   0   0

PetFoodExchange   1130   1   50   999   0

PartyReward   [(26,12800,1),(28,25,1)]   [200,0]   ["PartyKing",1,[(28,25,1)]]   1   

FamilyPartySitAward   int(min((max(worldlv-reLV,0)*0.05+1),6)*18000*reExp)   int(min(max(worldlv-reLV,0)*0.25,10))			
FamilyPartySitAward   int((1+min(max(worldlv-reLV,0)*0.2,1)+min(max(worldlv-reLV-5,0)*0.4,4)+min(max(worldlv-reLV-15,0)*0.24,1.2)+min(max(worldlv-reLV-20,0)*0.08,0.8))*18000*reExp)   0			
FamilyPartyAreaAward   {"Exp":"int(reExp*300)"}   5   60      

FamilyPartyDesk   3200   10   [(3901,150,1)]      

FamilyActive   40|80|120|160|220   10|10|15|25|30         

@@ -275,7 +275,7 @@
XMZZRobotSkill   {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}            

XMZZPKAward   [0,10,20,30,40,50,60,70,80,90]   addPer+100 + int(math.ceil(HPPer/10.0))   50   reExp*216*(100+addPer)/100   reExp*108

PayRMB   10            

OSCBillboardOpen   {"2":[20,1,2],"8":[50,3,3],"10":[20,4,4],"3":[30,5,5],"7":[50,6,6],"6":[1200000,7,7]}   10			
OSCBillboardOpen   {"2":[20,1,2],"8":[50,3,3],"10":[20,4,4],"3":[12,5,5],"7":[50,6,6],"6":[1200000,7,7]}   10			
OSCRankRedpackAward   {1:80,(2,5):81}            

WeekResetSuccType   []            

InvestCost   {"1":[300],"2":[98],"3":[300,680,1280,1880]}