From f525ee60280758402cb8241c2523a376f7526118 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期三, 14 十一月 2018 14:50:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index e0a1339..9abd03e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -8,11 +8,11 @@
OpenBagItem 951 int(math.ceil(index/4.0)) 20 0 0
InitDepotCellCount 60 0 0 0 0
MaxDepotCellCount 100 0 0 0 0
-DepotSortPriority 101|102|103|104|105|106|107|108|109|110|112 0 0 0 0
+DepotSortPriority 1|5|81|4|14|13|8|9|26|28|125|27|41|22|124|21|25|20|45|58|54|39|52|6|34|35|36|76|11|12|15|17|29|44|48|50|51|60|80|7|101|102|103|104|105|106|107|108|109|111|112 0 0 0 0
InitBagCellCount 60 0 0 0 0
MaxBagCellCount 100 0 0 0 0
UnShowMsgBuffItemID 901|902|903 0 0 0 0
-PackageSortPriority 101|102|103|104|105|106|107|108|109|110|111 0 0 0 0
+PackageSortPriority 1|5|81|4|14|13|8|9|26|28|125|27|41|22|124|21|25|20|45|58|54|39|52|6|34|35|36|76|11|12|15|17|29|44|48|50|51|60|80|7|101|102|103|104|105|106|107|108|109|111|112 0 0 0 0
IceLodeSweep {31401001:10,31403001:2} 0 0 0 0
IceLodeNeedPoint 1500 31401001_50|31403001_300 0 0 0
ClearDevilPoint 1200 {30102001:20,30102002:50,30102003:300} 0 0 0
@@ -20,7 +20,7 @@
AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]]}
AIRefreshPointNPCRun {101:[[7,15]],102:[[13,22]],103:[[21,25]]}
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
+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 0 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 0 0
@@ -98,7 +98,7 @@
GodWeapon2 104|105|106 0 0 0 0
GodWeapon3 107|108|109 0 0 0 0
GodWeapon4 110|111|112 0 0 0 0
-GodWeaponActive 1 0 0 0 0
+GodWeaponActive 1 {"2":[[1,10]], "3":[[1,15], [2,10]], "4":[[2,20], [3,10]]} 0 0 0
GodWeaponSys {1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2'}
GodLv {1:[100,200,300,400],2:[100,200,300,400],3:[100,200,300,400]}
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
@@ -190,7 +190,7 @@
AutoBuyDrug 251|252|253|254
RunTaskKillNPCCnt {(50,80):40,(81,100):45,(101,120):50,(121,140):55,(141,160):60,(161,180):65,(180,200):70,(201,220):75,(221,2000):80}
RunTaskCnt 7_20|12_70 7_10|12_10
-RunTaskAward {7:[3,200000,1500000]} {7:[100,9999999]} {"12":[[28,50,1],[2213,10,1]]} {"12":'5625*reExp'} 2103
+RunTaskAward {7:[3,200000,1500000]} {7:[100,9999999]} {"12":[[28,50,1],[2324,1,1]]} {"12":'5625*reExp'} 2103
RunTaskExp reExp*baseExp
RunTaskAwardTaskID {7:2009,12:3009}
MoneyPray 10+min(max(cnt-2,0),1)*5+min(max(cnt-4,0),1)*5+min(max(cnt-6,0),1)*10+min(max(cnt-8,0),1)*10+min(max(cnt-10,0),1)*10+min(max(cnt-12,0),1)*10+min(max(cnt-14,0),1)*10+min(max(cnt-16,0),1)*10 1000000 28800 [1,1000000]
@@ -198,7 +198,7 @@
FreeExpPrayItem 986 1127
DailyQuestMailLvLimit 110
DailyQuestKillMonster 60
-FBEnterCD 31080_300 31080_35
+FBEnterCD 31080_300 31080_35 31080_150
FairylandNPC [[(0,60),30801001], [(61,120),30801002], [(121,180),30801003]] max(min(2000-(heroCnt-1)*400,2000),800) 25
FairylandNPCCnt min(max(10+(heroCnt-1)*10,12+(heroCnt-1)*12-npcCnt),40+(heroCnt-1)*10-npcCnt)
FairylandPoint [104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120] 1 [101,102,103]
@@ -233,11 +233,12 @@
MunekadoTrialStarTime {0:[[20],[40],[40,80,60,60]],1:[[20],[35],[30],[40,80,60,60]],2:[[20],[35],[30],[60,60,60,60]],3:[[25],[40],[80,80,80,80]],4:[[50],[50],[120,30,30,30]],5:[[50],[50],[120,30,30,30]]}
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
-ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,10,1),(1141,1,1)],4:[(2407,8,1),(1140,1,1)],3:[(2408,6,1),(1139,1,1)],2:[(2409,4,1),(1138,1,1)],1:[(2410,2,1),(1137,1,1)]}
-ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
+ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
+ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 {0:[12,8,20],1:[20,5,20],2:[20,5,20]} [200,600,1200,2000,3200,4800]
ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
ElderBattlefieldExp {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}
+ElderBattlefieldRobot 20 {0:60103010,1:60103010,2:60103010} 20051 5 [111,112,113,114,115,116,117,118]
ElderBattlefieldTopAward [[2214,1,1]]
ElderBattlefieldBuff [23001,23002,23003,23004] 31609001 [102,105,106,107,108] 3
CornerPresentedMoney 0 1
@@ -308,4 +309,4 @@
SamboSpecialUnlock 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018
BindJadeWheelCfg 88 {"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588} [(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,4)],30:[(10000,9)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
-WishingWellCfg 7200 refreshCnt+10 8 5
+WishingWellCfg 14400 10 8 5
--
Gitblit v1.8.0