From b4ec4633c2ca4e57422b9ab8d0db2b2f2e32d750 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 31 一月 2019 14:19:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5740062..1e11670 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -1,14 +1,14 @@
KEY Numerical1 Numerical2 Numerical3 Numerical4 Numerical5
-GemOpen 1|3|5 0|0|0 0 0 0
+GemOpen 1|3|5 1|1|1 0 0 0
GemOpenVip 6 0 0 0 0
GemType1 3|4|5|6|7 可镶嵌生命翡翠 0 0 0
GemType2 1|2|8|9|10 可镶嵌攻击炎晶 0 0 0
-GemType3 121|122|123|124 可镶嵌诛仙生命宝石 0 0 0
-GemType4 125|126|127|128 可镶嵌诛仙攻击宝石 0 0 0
-GemType5 129|130|131|132 可镶嵌诛仙附伤宝石 0 0 0
+GemType3 121|122|123|124 可镶嵌生命宝石 170 0 0
+GemType4 125|126|127|128 可镶嵌攻击宝石 171 0 0
+GemType5 129|130|131|132 可镶嵌附伤宝石 0 0 0
GemTypeCount 5 0 0 0 0
GemResonance 8
-GemUpCostFormula 1_3501|2_3511|5_5518 3 0 0 0
+GemUpCostFormula 1_3501|2_3511|5_5521 3 0 0 0
PutInItemPack {"255":[30, 31], "254":[61,62,63], "32":[70,119,120,121,122,123,139], "34":[128,129,130,131,132,133,134,135,136,137,138,140]}
OpenBagItem 951 int(math.ceil(index/4.0)) 20 0 0
InitDepotCellCount 60 0 0 0 0
@@ -112,7 +112,7 @@
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
-EquipSuitMaxLv {"3":{"1":9,"2":9},"4":{"1":9,"2":9},"5":{"1":9,"2":9},"6":{"1":9,"2":9},"7":{"1":9,"2":9},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}
+EquipSuitMaxLv {"3":{"1":10,"2":10},"4":{"1":10,"2":10},"5":{"1":10,"2":10},"6":{"1":10,"2":10},"7":{"1":10,"2":10},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}
EquipSuitType {"1":[3,4,5,6,7],"2":[8,9,10]}
GlobalDropCD {3802:100,3803:2880,3804:4320,3805:86400,9051:1440,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160,5408:1440,5409:10080} {50103001:{1:[0,{4202:1,4253:2,4151:10},[]]},50103002:{1:[0,{250:1,224:2,181:20},[]]},50103003:{1:[0,{4213:1,4252:2,4151:20},[]]},50103004:{1:[0,{222:3,181:50},[]]},50103005:{1:[0,{4250:3,4151:50},[]]}} 0 0 0
NPCGlobalDropRate {3806:[[101,102],"10000+killedCnt*20000"]} 0 0 0 0
@@ -217,24 +217,24 @@
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]]},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 [[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1]] 20 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]]},109:{15:[[1,4798,1]],40:[[1,4798,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 [[6075,4706,1],[12150,4707,1],[24300,4708,1],[8100,4709,1],[2700,4710,1],[900,4711,1],[24300,4712,1],[8100,4713,1],[2700,4714,1],[900,4715,1],[12150,4716,1],[24300,4717,1],[8100,4718,1],[2700,4719,1],[900,4720,1],[24300,4721,1],[8100,4722,1],[2700,4723,1],[900,4724,1],[8100,4725,1],[2700,4726,1],[900,4727,1],[2700,4728,1],[900,4729,1],[736,4730,1],[317,4731,1],[120,4732,1],[17,4733,1],[4050,4740,1],[5,4742,1],[300,4780,1],[300,4781,1],[300,4782,1],[300,4783,1],[300,4784,1],[300,4785,1],[100,4786,1],[100,4787,1],[100,4788,1],[100,4789,1],[100,4790,1],[100,4791,1],[30,4792,1],[30,4793,1],[30,4794,1],[30,4795,1],[30,4796,1],[30,4797,1],[1,4798,1]] 20 1
TreasureUpRateItem 101|105|106|107|104|102|109|110 4601|4602|4603|4604|4605
ClientFightEnable 1 0 0 0 0
GodAreaExpAward {"Exp":"int(reExp*2)"} 500 0
AngryAdd 60 1 20 100 0
BossHomeCost 1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200 0 0 0 0
BossShunt 10040|21070 1 3
-MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020
-NeutralMapExpAward {(21070,21100,21110,32020):[500,'int(0.6*reExp)']}
+MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020|21310
+NeutralMapExpAward {(21070,21100,21110,21310,32020,31230):[500,'int(0.6*reExp)']}
DungeonDeliver 31020|31030|31150|31031
DungeonIntegral 2000
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","31380":"50"}
FBEncourageBuff {31080:20051,52010:20081,31380:20081} 31080_10|52010_10|31380_10 31080_10|52010_20|31380_10
-DropRecordValue 4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409
+DropRecordValue 4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409|5302
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0],(101,102,103,104,105):[1,3,1],(121,122,123,124,125,126,127,128,129,130,131,132):[1,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
-DropRecordBossID 10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|31501009|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009|60303001|60303002|60303003|60303004|60303005|60303006
+DropRecordBossID 10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|31501009|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009|60303001|60303002|60303003|60303004|60303005|60303006|20403001|20403002|20403003|20403004|20403005|20403006|20403007|30303017|30303018|30303019|30303020
PKConfig [[22,00], [8,00]] 50 10 10 110
FamilyKilledNotify {1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001,20403001,20403002,20403003,20403004,20403005,20403006,20403007):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007,40103001,40103002,40103003,40103004,40103005,40103006,40103007,40103008):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016,30303017,30303018,30303019,30303020):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
@@ -301,7 +301,7 @@
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
-FeastRedPacket 5 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800]
+FeastRedPacket 10 max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5)))) [100,300,500,800,1000,1200,1500,1800] 1
PotentialSkillLearn {"50065":[15,47000],"50165":[15,47010],"50265":[15,47020],"1065":[15,47030],"50365":[15,47040],"50465":[15,47050],"50565":[15,47060],"50665":[15,47070],"50765":[15,47080],"50865":[15,47090],"51065":[15,47130],"51165":[15,47140],"55065":[15,47200],"55165":[15,47210],"55265":[15,47220],"2065":[15,47230],"55365":[15,47240],"55465":[15,47250],"55565":[15,47260],"55665":[15,47270],"55765":[15,47280],"55865":[15,47290],"56065":[15,47330],"56165":[15,47340]}
FirstGold {"1":[[6619,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]],"2":[[6620,1,1],[221,1,1],[912,1,1],[4151,5,1],[3,1,1]]} {"1":388,"2":388} 1800
CTG 20181224
@@ -317,9 +317,9 @@
CeremonyRecharge {"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]],"3":[[4184,1,1],[2424,1,1],[912,1,1],[1025,5,1],[4609,1,1]]}
CeremonyFireParty {"0":801,"1":802,"2":803,"3":804}
CeremonyRankLimit 3280
-NewCeremonyWorldLv {"1":[[0,250],[251,300],[301,330],[331,900]],"2":[[0,250],[251,300],[301,330],[331,900]],"3":[[0,250],[251,300],[301,330],[331,900]],"4":[[0,250],[251,300],[301,330],[331,900]]}
+NewCeremonyWorldLv {"1":[[0,250],[251,300],[301,330],[331,900]],"2":[[0,250],[251,300],[301,330],[331,900]],"3":[[0,250],[251,300],[301,330],[331,900]],"4":[[0,250],[251,280],[281,330],[331,380],[381,900]]}
NewCeremonyRecharge {"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]],"3":[[4184,1,1],[2424,1,1],[912,1,1],[1025,5,1],[4609,1,1]]}
-NewCeremonyFireParty {"0":801,"1":802,"2":803,"3":804}
+NewCeremonyFireParty {"0":810,"1":811,"2":812,"3":813}
NewCeremonyRankLimit 3280
TJDropTaskItem {}
SuperGiftTimeList [[6,3],[7,5],[8,7]] []
--
Gitblit v1.8.0