From 3cf12b4b5387db8b84a1e3efb9871afb5aacaeea Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期四, 31 一月 2019 12:03:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
db/PyMongoDataServer/SysDB/tagChinMap.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 7 +++++++
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index a46c120..f8b194f 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -87,6 +87,13 @@
4789 2 60 625 0
4790 2 60 625 0
4791 2 60 625 0
+4792 2 80 625 0
+4793 2 240 625 0
+4794 2 80 625 0
+4795 2 80 625 0
+4796 2 80 625 0
+4797 2 80 625 0
+4798 2 5 625 0
4740 2 2 1000 0
4730 2 2 1000 0
4731 2 2 1000 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 305e1f9..748f43f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -226,7 +226,7 @@
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|21310
-NeutralMapExpAward {(21070,21100,21110,32020,31230):[500,'int(0.6*reExp)']}
+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"}
@@ -234,7 +234,7 @@
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']}
@@ -319,7 +319,7 @@
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,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":811,"1":812,"2":813,"3":814}
+NewCeremonyFireParty {"0":810,"1":811,"2":812,"3":813}
NewCeremonyRankLimit 3280
TJDropTaskItem {}
SuperGiftTimeList [[6,3],[7,5],[8,7]] []
diff --git a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
index 91b55dd..75490a3 100644
--- a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
@@ -175,8 +175,8 @@
30303016 31031 (118,70)
30303017 31360 (17,81)
30303018 31360 (88,81)
-30303019 31360 (53,45)
-30303020 31360 (53,9)
+30303019 31360 (53,115)
+30303020 31360 (53,171)
31903001 31240 (22,20)
31903002 31240 (22,20)
31903003 31240 (22,20)
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 43b4298..ac4e4fb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -18,7 +18,7 @@
31020 BOSS之家一层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31020 49 71 0 1 0 5 35
31030 BOSS之家二层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31030 55 14 0 1 0 5 35
31031 BOSS之家三层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31031 97 42 0 1 0 5 35
-31360 BOSS之家四层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31360 97 42 0 1 0 5 35
+31360 BOSS之家四层 1 0 0 8 0 0 0 0 0 0 0 0 0 0 31360 53 7 0 1 0 5 35
31040 日常副本 1 0 360000 1 1 0 0 0 0 0 0 0 1 1 31040 18 44 0 1 0 0 1
31080 仙界秘境 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 31080 20 19 0 1 0 0 1
31110 渡劫 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10010 196 80 0 1 0 0 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 0a15ae4..2dead29 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1962,7 +1962,7 @@
30457 攻其不备 30450 8 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 4000 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 461080 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30458 攻其不备 30450 9 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 4500 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 518715 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30459 攻其不备 30450 10 10 2 4 0 7 0 0 0 0 41 10 0 0 0 0 0 0 0 4003 5000 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 21500 30400 6 0 10035 0 0 0 2 576350 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
-30500 终极风暴(PVP) 30500 1 1 2 4 0 16 1 0 0 0 10 0 0 0 0 0 0 0 0 4060 10000 0 0 4052 10000 3000 0 4055 50800 5000 5 1011 5 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 21800 30450 6 0 10045 0 0 0 2 88669 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
+30500 终极风暴(PVP) 30500 1 1 2 4 0 16 1 0 0 0 10 0 0 10000 0 0 0 0 0 4060 10000 0 0 4052 10000 3000 0 4055 50800 5000 1 1011 1 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 21800 30450 6 0 10045 0 0 0 2 88669 0 0 0 0 0 0 0 0 0 50800 0 0 0 0
30550 幻炎之体 30550 1 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 250 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 19396 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
30551 幻炎之体 30550 2 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 375 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 38792 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
30552 幻炎之体 30550 3 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4022 10000 0 0 7 500 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 58188 0 0 0 0 0 0 0 4 0 30000 0 0 0 0
--
Gitblit v1.8.0