Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

cehua_LC

2018-12-08 7fcb88497340f17b488b89c5e41cabfe597ba09e

 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt

@@ -24,28 +24,28 @@
RuneUnlock   0|204|304|404|504|604|704|804   8_100   8_120   9   0

RuneDoubleInlayCnt   101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9            

RunePackageNum   200   0   0   0   0

RuneAttr7   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr6   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr7   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_725|4_238|3_25|2_15|1_10   0

RuneAttr6   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_14459|4_4722|3_480|2_288|1_192   0

RuneAttr44   1300+level*200   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr45   1300+level*200   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr46   1000+level*100   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr46   (level-1)*100   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1   5_1200|4_600|3_300|2_180|1_120   0

RuneAttr35   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/5)*5   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr36   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/3/5)*5   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr63   1500+level*500   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr64   (1500+level*500)*1.3   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr65   1500+level*500   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr66   1500+level*500   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr11   1000+level*50   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr42   level*600   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr41   level*400   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr27   (150+level*50)/2   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr8   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr26   150+level*50   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   1_1|2_2|3_3|4_4|5_5   0

RuneAttr15   500+level*20   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr14   160+level*40   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr17   200+level*50   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr28   160+level*40   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr29   150+level*30   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   1_1|2_2|3_3|4_4|5_5   0

RuneAttr63   (level-1)*500   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_2800|4_1400|3_700|2_420|1_280   0

RuneAttr64   (level-1)*500*1.3   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_3520|4_1760|3_880|2_528|1_352   0

RuneAttr65   (level-1)*500   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_2080|4_1040|3_520|2_312|1_208   0

RuneAttr66   (level-1)*500   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_2280|4_1140|3_570|2_342|1_228   0

RuneAttr11   (level-1)*50   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1   5_1240|4_620|3_310|2_186|1_124   0

RuneAttr42   (level-1)*600   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_1480|4_740|3_370|2_222|1_148   0

RuneAttr41   (level-1)*400   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_880|4_440|3_220|2_132|1_88   0

RuneAttr27   (level-1)*25   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   5_964|4_482|3_241|2_145|1_96   0

RuneAttr8   int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1.5   5_623|4_270|3_104|2_63|1_42   0

RuneAttr26   (level-1)*50   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1.5   5_1348|4_674|3_337|2_202|1_135   0

RuneAttr15   (level-1)*20   1_0.3|2_0.45|3_0.6|4_0.75|5_1   1   5_520|4_260|3_130|2_78|1_52   0

RuneAttr14   (level-1)*40   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   5_640|4_320|3_160|2_96|1_64   0

RuneAttr17   (level-1)*50   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   5_440|4_220|3_110|2_66|1_44   0

RuneAttr28   (level-1)*40   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   5_240|4_120|3_60|2_36|1_24   0

RuneAttr29   (level-1)*30   1_0.2|2_0.3|3_0.5|4_0.7|5_1   1   5_280|4_140|3_70|2_42|1_28   0

RuneExp   int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))   1_0.5|2_0.7|3_0.8|4_0.9|5_1   1.6   1_100|2_300|3_3000|4_15000|5_30000   0

RuneMaxLV   1_10|2_20|3_30|4_40|5_50   0   0   0   0

RuneAwardCntRate   {(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]}   {(101,1608):[(6000,0),(9000,1),(10000,2)],(1701,3208):[(6000,0),(9000,1),(10000,2)]}   0   0   0

@@ -84,7 +84,7 @@
ExpAttenuation   max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1)   0   0   0   0

AtkInterval   int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5))   0   0   0   0

MoveSpeed   max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100)   50   25   0   0

FightpowerFormula   int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700+ProDefPer/10000.0*2805669))   equipScoreTotal*4   0   0   0

FightpowerFormula   int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700+ProDefPer/10000.0*2350015))   equipScoreTotal*4   0   0   0

RealmFBHelpAttr   {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}}   10000   6      

RealmFBHelpLimit   10            

RealmSitNPCID   10000            

@@ -99,11 +99,11 @@
GodWeapon1   101|102|103   0   0   0   0

GodWeapon2   104|105|106   0   0   0   0

GodWeapon3   107|108|109   0   0   0   0

GodWeapon4   110|111|112   int(50000+maxHP*proDefPer/10000.0)   0   0   0

GodWeapon4   110|111|112   int(35469+maxHP*proDefPer/10000.0)   0   0   0

GodWeaponActive   1   {"2":[[1,120]],  "4":[[2,120]]}   {"2":250,  "4":320}   0   0

GodWeaponSys   {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}            

GodMagicExp   {"1":[10,10],"2":[10,10],"4":[10,10]}				
MagicExterior   {"1":0,"2":0,"3":0,"4":100386}   0   500		
GodMagicExp   {"1":[1,10],"2":[1,10],"4":[1,10]}				
MagicExterior   {"1":0,"2":0,"3":0,"4":0}   0   500		
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

EquipSuitColorStar   {"1":[4,1],"2":[5,2]}   2         

@@ -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         

@@ -209,7 +209,7 @@
XjmjFirstEnter   [5000, 25, 911]   350000         

XjmjAddHarm   20   20061         

AlchemyNotify   3   4716   4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729      

SpecialAlchemy   {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]}}   {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]}}   {4206:1,253:1}		
SpecialAlchemy   {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]},106:{8:[[1,4732,1]],35:[[1,4732,1]]},107:{10:[[1,4733,1]],35:[[1,4733,1]]},108:{12:[[1,4742,1]],35:[[1,4742,1]]}}   {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]},31:{1:[[80,4254,1],[20,4183,1]],3:[[80,4254,1],[20,4183,1]]},32:{1:[[80,225,1],[20,4185,1]],3:[[80,225,1],[20,4185,1]]}}   {4206:1,253:1}   4254|225	
GodAlchemy   [[800,4706,1],[1600,4707,1],[3200,4708,1],[1600,4709,1],[800,4710,1],[400,4711,1],[3200,4712,1],[1600,4713,1],[800,4714,1],[400,4715,1],[1600,4716,1],[3200,4717,1],[1600,4718,1],[800,4719,1],[400,4720,1],[3200,4721,1],[1600,4722,1],[800,4723,1],[400,4724,1],[1600,4725,1],[800,4726,1],[400,4727,1],[800,4728,1],[400,4729,1],[145,4730,1],[94,4731,1],[53,4732,1],[11,4733,1],[533,4740,1],[5,4742,1],[200,4780,1],[200,4781,1],[200,4782,1],[200,4783,1],[200,4784,1],[200,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]]   20   1      

TreasureUpRateItem   101|105|106|107|104|102|109|110   4601|4602|4603|4604|4605         

ClientFightEnable   1   0   0   0   0

@@ -274,7 +274,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]}            

@@ -283,11 +283,11 @@
VIPInvest   {"1":[1,280],"2":[281,350],"3":[351,1000]}   3         

GoldInvestLVLimit   300            

OfflinePostItem   181|4151|4002|4003|4008|4009|4005|4006|4011|951|956|4501|4502            

TreasureSet   {0:10,1:10}   {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}			
TreasureSet   {0:10,1:10}   {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373,4428,4433,4438,4443],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374,4429,4434,4439,4444],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375,4430,4435,4440,4445]}			
TreasureSet11   [1, 10]   [80, 640]   [[982,1], [982, 10]]   [0, 0]   [4, 40]

TreasureSet21   max(baseRate,min(int(min(curLuck,300)*0.2+min(max(curLuck-300,0),100)*0.4+min(max(curLuck-400,0),200)*1)+max(curLuck-999,0),10000))   [10, 100]   1000      

TreasureSet12   [1, 10]   [30, 240]   [[983,1], [983, 10]]   [1440, 0]   [2, 20]

TreasureSet22   min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000)   [3, 30]   1000		
TreasureSet22   min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000)   [2, 20]   1000		
OpenServerRedPacketType   5            

OSRAllMoneySys   [100,300,500,800,1000,1200,1500,1800]            

OpenServerRedPacketCfg   3   10   3600   50   5