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

cehua_LC

2018-11-05 84ec8ed7c27cc67d9098eb8b02eec1a5b07123c7

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -139,7 +139,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(min((max(worldlv-reLV,0)*0.05+1),6)*18000*reExp)   int(min(max(worldlv-reLV,0)*0.25,10))			
FamilyPartyAreaAward   {"Exp":"int(reExp*300)"}   5   60      

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

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

@@ -241,6 +241,7 @@
ElderBattlefieldTopAward   [[2214,1,1]]            

ElderBattlefieldBuff   [23001,23002,23003,23004]   31609001   [102,105,106,107,108]   3   

CornerPresentedMoney   0   1         

CreateRoleMap   {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}				
SetWorldPosShunt   {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10}   350         

TransportPay   954   1         

GuardFBCageNPCID   32502001   32504001   3      

@@ -268,7 +269,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],"7":[40,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}   10			
OSCBillboardOpen   {"2":[20,1,2],"7":[50,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}   10			
OSCRankRedpackAward   {1:80,(2,5):81}            

WeekResetSuccType   []            

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