From d965a197b21881548a68f21d2b190799581f032f Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期四, 03 一月 2019 21:47:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 1
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
db/PyMongoDataServer/SysDB/tagChinMap.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt | 85 ----------------------------
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 1
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 1
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 2
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 2
db/PyMongoDataServer/PySysDB/tagStore.txt | 5 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc | 0
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 2
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1
CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 10 +-
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 6 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map010_Mzgc.col | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 2
30 files changed, 28 insertions(+), 99 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 937749e..cb83bb5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -10,3 +10,4 @@
9 DecemberExp23 [] [] 2018-12-23 2018-12-23 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
10 DecemberExp30 [] [] 2018-12-30 2018-12-30 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
11 JanuaryExp1 [] [] 2019-1-2 2019-1-2 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
+12 JanuaryExp2 [] [] 2019-1-6 2019-1-6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 4367e49..752ceb5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -67,3 +67,5 @@
66 Dec27 [] [] 2018-12-27 2018-12-27 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
67 Dec31 [] [] 2018-12-31 2018-12-31 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
68 Jan2 [] [] 2019-1-2 2019-1-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+69 Jan3 [] [] 2019-1-5 2019-1-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+70 Jan4 [] [] 2019-1-9 2019-1-9 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index e6c261a..4bf7f96 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -42,3 +42,4 @@
41 December22 [] [] 2018-12-22 2018-12-22 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
42 Dec31 [] [] 2018-12-31 2018-12-31 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
43 Jan3 [] [] 2019-1-3 2019-1-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+44 Jan4 [] [] 2019-1-6 2019-1-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 069b096..2ad8272 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -15,3 +15,4 @@
14 sdq1226 [] [] 2018-12-26 2018-12-26 1 0 {0:["XYCOpen", []]} {} [] 110
15 sdq1231 [] [] 2018-12-31 2018-12-31 1 0 {0:["XYCOpen", []]} {} [] 110
16 sdq0104 [] [] 2019-1-4 2019-1-4 1 0 {0:["XYCOpen", []]} {} [] 110
+17 sdq0108 [] [] 2019-1-8 2019-1-8 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
index bda9773..f41d31c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
@@ -32,20 +32,6 @@
31 1 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
32 1 10 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
33 1 14 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-34 1 1 31230 20 0 20 15 1 1 {}
-35 1 2 31230 20 0 20 15 1 1 {}
-36 1 3 31230 20 0 20 15 1 1 {}
-37 1 4 31230 20 0 20 15 1 1 {}
-38 1 5 31230 20 0 20 15 1 1 {}
-39 1 6 31230 20 0 20 15 1 1 {}
-40 1 7 31230 20 0 20 15 1 1 {}
-41 1 8 31230 20 0 20 15 1 1 {}
-42 1 9 31230 20 0 20 15 1 1 {}
-43 1 10 31230 20 0 20 15 1 1 {}
-44 1 11 31230 20 0 20 15 1 1 {}
-45 1 12 31230 20 0 20 15 1 1 {}
-46 1 13 31230 20 0 20 15 1 1 {}
-47 1 14 31230 20 0 20 15 1 1 {}
48 2 4 31170 21 0 21 15 1 1 {}
49 2 4 31170 21 15 21 30 0 1 {}
50 2 7 31170 21 0 21 15 1 1 {}
@@ -77,19 +63,6 @@
76 2 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
77 2 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
78 2 13 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-79 2 1 31230 20 0 20 15 1 1 {}
-80 2 2 31230 20 0 20 15 1 1 {}
-81 2 3 31230 20 0 20 15 1 1 {}
-82 2 4 31230 20 0 20 15 1 1 {}
-83 2 5 31230 20 0 20 15 1 1 {}
-84 2 6 31230 20 0 20 15 1 1 {}
-85 2 7 31230 20 0 20 15 1 1 {}
-86 2 8 31230 20 0 20 15 1 1 {}
-87 2 9 31230 20 0 20 15 1 1 {}
-88 2 10 31230 20 0 20 15 1 1 {}
-89 2 11 31230 20 0 20 15 1 1 {}
-90 2 12 31230 20 0 20 15 1 1 {}
-91 2 13 31230 20 0 20 15 1 1 {}
92 3 4 31170 21 0 21 15 1 1 {}
93 3 4 31170 21 15 21 30 0 1 {}
94 3 6 31170 21 0 21 15 1 1 {}
@@ -120,18 +93,6 @@
119 3 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
120 3 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
121 3 12 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-122 3 1 31230 20 0 20 15 1 1 {}
-123 3 2 31230 20 0 20 15 1 1 {}
-124 3 3 31230 20 0 20 15 1 1 {}
-125 3 4 31230 20 0 20 15 1 1 {}
-126 3 5 31230 20 0 20 15 1 1 {}
-127 3 6 31230 20 0 20 15 1 1 {}
-128 3 7 31230 20 0 20 15 1 1 {}
-129 3 8 31230 20 0 20 15 1 1 {}
-130 3 9 31230 20 0 20 15 1 1 {}
-131 3 10 31230 20 0 20 15 1 1 {}
-132 3 11 31230 20 0 20 15 1 1 {}
-133 3 12 31230 20 0 20 15 1 1 {}
134 4 4 31170 21 0 21 15 1 1 {}
135 4 4 31170 21 15 21 30 0 1 {}
136 4 8 31170 21 0 21 15 1 1 {}
@@ -159,17 +120,6 @@
158 4 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
159 4 7 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
160 4 11 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-161 4 1 31230 20 0 20 15 1 1 {}
-162 4 2 31230 20 0 20 15 1 1 {}
-163 4 3 31230 20 0 20 15 1 1 {}
-164 4 4 31230 20 0 20 15 1 1 {}
-165 4 5 31230 20 0 20 15 1 1 {}
-166 4 6 31230 20 0 20 15 1 1 {}
-167 4 7 31230 20 0 20 15 1 1 {}
-168 4 8 31230 20 0 20 15 1 1 {}
-169 4 9 31230 20 0 20 15 1 1 {}
-170 4 10 31230 20 0 20 15 1 1 {}
-171 4 11 31230 20 0 20 15 1 1 {}
172 5 4 31170 21 0 21 15 1 1 {}
173 5 4 31170 21 15 21 30 0 1 {}
174 5 7 31170 21 0 21 15 1 1 {}
@@ -196,16 +146,6 @@
195 5 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
196 5 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
197 5 10 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-198 5 1 31230 20 0 20 15 1 1 {}
-199 5 2 31230 20 0 20 15 1 1 {}
-200 5 3 31230 20 0 20 15 1 1 {}
-201 5 4 31230 20 0 20 15 1 1 {}
-202 5 5 31230 20 0 20 15 1 1 {}
-203 5 6 31230 20 0 20 15 1 1 {}
-204 5 7 31230 20 0 20 15 1 1 {}
-205 5 8 31230 20 0 20 15 1 1 {}
-206 5 9 31230 20 0 20 15 1 1 {}
-207 5 10 31230 20 0 20 15 1 1 {}
208 6 4 31170 21 0 21 15 1 1 {}
209 6 4 31170 21 15 21 30 0 1 {}
210 6 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
@@ -229,15 +169,6 @@
228 6 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
229 6 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
230 6 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-231 6 1 31230 20 0 20 15 1 1 {}
-232 6 2 31230 20 0 20 15 1 1 {}
-233 6 3 31230 20 0 20 15 1 1 {}
-234 6 4 31230 20 0 20 15 1 1 {}
-235 6 5 31230 20 0 20 15 1 1 {}
-236 6 6 31230 20 0 20 15 1 1 {}
-237 6 7 31230 20 0 20 15 1 1 {}
-238 6 8 31230 20 0 20 15 1 1 {}
-239 6 9 31230 20 0 20 15 1 1 {}
240 7 4 31170 21 0 21 15 1 1 {}
241 7 4 31170 21 15 21 30 0 1 {}
242 7 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
@@ -260,19 +191,3 @@
259 7 6 31220 21 49 23 59 0 23 {}
260 7 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
261 7 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-262 7 1 31230 20 0 20 3 1 1 {}
-263 7 1 31230 20 3 20 20 1 2 {}
-264 7 2 31230 20 0 20 3 1 1 {}
-265 7 2 31230 20 3 20 20 1 2 {}
-266 7 3 31230 20 0 20 3 1 1 {}
-267 7 3 31230 20 3 20 20 1 2 {}
-268 7 4 31230 20 0 20 3 1 1 {}
-269 7 4 31230 20 3 20 20 1 2 {}
-270 7 5 31230 20 0 20 3 1 1 {}
-271 7 5 31230 20 3 20 20 1 2 {}
-272 7 6 31230 20 0 20 3 1 1 {}
-273 7 6 31230 20 3 20 20 1 2 {}
-274 7 7 31230 20 0 20 3 1 1 {}
-275 7 7 31230 20 3 20 20 1 2 {}
-276 7 8 31230 20 0 20 3 1 1 {}
-277 7 8 31230 20 3 20 20 1 2 {}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 7e2d6d5..15f3f85 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -46,7 +46,7 @@
MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110
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
DropRecordNum 40 1
-KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
+KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
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
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 8bc9dc3..af8d464 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -203,6 +203,7 @@
788 122 0 0
789 123 0 0
790 124 0 0
+791 125 0 0
801 19 0 0
802 19 0 0
803 19 0 0
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.pyc
new file mode 100644
index 0000000..d1188a3
--- /dev/null
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossClientServerMaintain.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index b720c26..c764b94 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index db3d0f1..534872c 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map010_Mzgc.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map010_Mzgc.col
index 9f680d7..42e04c2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map010_Mzgc.col
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map010_Mzgc.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 28de1a3..83e4e8d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
index 9ecdc22..be6b0fe 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc
index dd65907..418e98e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
index 39ebf61..adebee7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index e428ab4..0495763 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 3e1c176..5cd5c8b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 7b62063..a435424 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index e366eea..036839c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 481b1e1..5338397 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -10,3 +10,4 @@
9 110 10000
10 110 10000
11 110 20000
+12 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index f55c47c..2c8f916 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -67,3 +67,5 @@
66 2018-12-27 2018-12-27 110 0 [[55]] SellMail4
67 2018-12-31 2018-12-31 110 0 [[56]] SellMail4
68 2019-1-2 2019-1-2 110 0 [[57]] SellMail4
+69 2019-1-5 2019-1-5 110 0 [[58]] SellMail4
+70 2019-1-9 2019-1-9 110 0 [[59]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 951ba29..446857b 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -42,3 +42,4 @@
41 2018-12-22 2018-12-22 110 0 [[122]] SellMail3
42 2018-12-31 2018-12-31 110 0 [[123]] SellMail3
43 2019-1-3 2019-1-3 110 0 [[124]] SellMail3
+44 2019-1-6 2019-1-6 110 0 [[125]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 7752ed2..04a59eb 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -15,3 +15,4 @@
14 2018-12-26 2018-12-26 1 0 110 1
15 2018-12-31 2018-12-31 1 0 110 1
16 2019-1-4 2019-1-4 1 0 110 1
+17 2019-1-8 2019-1-8 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 3da7170..a7f87dd 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -56,3 +56,5 @@
2 55 24 1 [(105,10,1),(106,2,1)] 105 LimitGift3
4 56 108 1 [(111,30,1),(112,12,1)] 111 LimitGift3
4 57 110 1 [(913,1,1),(4694,6,1)] 913 LimitGift3
+4 58 108 1 [(111,30,1),(112,12,1)] 112 LimitGift3
+4 59 131 1 [(4606,1,1),(2213,25,1)] 4606 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 2e35a8e..7f72f6e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -47,7 +47,7 @@
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_800|4_3200|5_9600 0
-RuneMaxLV 1_10|2_20|3_30|4_40|5_50 0 0 0 0
+RuneMaxLV 1_10|2_20|3_30|4_45|5_60 0 0 0 0
RuneAwardCntRate {(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]} {(101,1608):[(9000,0),(10000,1),(10000,2)],(1701,3208):[(9000,0),(10000,1),(10000,2)]} 0 0 0
TowerRuneType {"1":[2],"2":[1],"3":[5],"4":[17],"5":[15],"6":[11],"7":[9],"8":[8],"9":[10],"10":[16],"11":[14],"12":[13],"13":[24],"14":[25],"15":[26],"16":[27],"17":[2],"18":[1],"19":[5],"20":[17],"21":[15],"22":[11],"23":[9],"24":[8],"25":[10],"26":[16],"27":[14],"28":[13],"29":[24],"30":[25],"31":[26],"32":[27]} 8
RuneAwardColor {(101,1608):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(1000000,1)]},(1701,3208):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(500000,1),(1000000,2)]}} {(101,1608):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(1000000,1)]},(1701,3208):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(500000,1),(1000000,2)]}} 0 0 0
@@ -122,7 +122,7 @@
MapDropItemNoBind {52010:[3801,4606,4608]} 0 0 0 0
MapDropItemBind {} 0 0 0 0
JobItemDropSets {2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,8265],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}
-EquipDropPartSets {102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}
+EquipDropPartSets {102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]} {102:[[5000,1],[10000,2]],105:[[2000,3],[4000,4],[6000,5],[8000,6],[10000,7]],107:[[500,1],[1000,2],[2000,3],[4000,4],[6000,5],[8000,6],[10000,7]],108:[[10000,8]],204:[[10000,4]],205:[[10000,5]],206:[[10000,6]]}
FamilyBOSSDropRule 6000+grade*800 min(2*playerCount,50)
FBGradeEquipDropRate {} {} {30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}
MutexDrop [[3803,3802,3801],[4606,4608,4610,4609]] 0 0 0 0
@@ -226,10 +226,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
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,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|8205|8206|8207|8218|8219|8220|8231|8232|8233|8244|8245|8246|8257|8258|8259
-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|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
+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
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):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
+KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
BossHurtValue 30 0 0 0 0
FamilyInvadeCfg [180,1500,10,31170, [84,85,86,87], [101,31704003], {102:31704002,103:31704001}] {1:0.5,3:0.6,4:0.8,5:1} int(48000*reExp*starPer*min(passWheel/8.0,1)) [21010,21011] [31704001,31704002,31704003]
SwrhMonsterExp reExp*baseExp
@@ -265,7 +265,7 @@
AutoUseGuardian 4106|4101 300
TJGGiftTime 36000
ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688],"4106":[4106,668,0],"4107":[4107,468,0]}
-OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4))))
+OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/400.0) + 0.1*pow((lv/400.0), 2) +0.15*pow((lv/400.0), 3) + 0.699*pow((lv/400.0), 4)))) {"79":"min(maxOOPValue,int(132141*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))", "80":"min(maxOOPValue,int(79285*(min(lv/350.0,1)+min(max(lv-350,0)/200.0,0.5)+min(max(lv-450,0)*3/400.0,0.75))))"}
BossStoneDelayTime 1500
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index 150900f..dd494f3 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -114,7 +114,7 @@
31401008 0 0 2 0 600 10000 0 8000 3 9900 50 12 0 0 0 0
31403008 0 0 2 0 1900 10000 0 8000 3 9900 50 1 0 0 50 0
31401009 0 0 2 0 2000 10000 0 8000 3 9900 50 12 0 0 0 0
-31604001 0 0 4 0 800 10000 0 8000 1 9900 50 1 0 0 0 10000
+31604001 0 0 4 0 500 10000 0 8000 1 9900 50 1 0 0 0 10000
33409001 0 1 2 0 1000 10000 0 8000 1 9900 50 1 0 0 5 0
33409002 0 1 2 0 1 10000 0 8000 1 9900 50 1 0 0 0 0
33402001 0 0 2 0 1000 10000 0 8000 1 9900 50 12 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 355be8c..304beda 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -3,7 +3,7 @@
2 1 0 2 0 {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"} 0 {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"10"}]}
4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 0 {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
-5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
+5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"min(extraData,1)*3+max(min(extraData,2)-1,0)*1+max(min(extraData,3)-2,0)*1+max(min(extraData,4)-3,0)*1+max(min(extraData,5)-4,0)*2+max(min(extraData,6)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"min(extraData,1)*1+max(min(extraData,2)-1,0)*1+max(min(extraData,3)-2,0)*0+max(min(extraData,4)-3,0)*1+max(min(extraData,5)-4,0)*1+max(min(extraData,6)-5,0)*1"}]}
6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 0 {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"10"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":4151,"ItemCount":"5"}]}
8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"5"}]} 0 {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"2"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index cf16c74..1de5f93 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -37,8 +37,8 @@
69 2 0 966 1 0 [] 0 0 0 220 0 0 1 100 0 0
70 2 0 5410 1 0 [] 0 0 0 240 0 0 1 50 0 0
71 2 0 5411 1 0 [] 0 0 0 260 0 0 1 100 0 0
-72 2 0 4103 1 0 [] 0 0 0 320 0 0 1 280 0 0
-73 2 0 4104 1 0 [] 0 0 0 320 0 0 1 180 0 0
+72 2 0 4103 1 0 [] 0 0 0 270 0 0 1 280 0 0
+73 2 0 4104 1 0 [] 0 0 0 270 0 0 1 180 0 0
101 3 0 181 1 0 [] 0 0 0 0 0 0 1 10 0 0
103 3 0 3501 1 0 [] 0 0 0 0 0 0 1 10 0 0
104 3 0 3511 1 0 [] 0 0 0 0 0 0 1 10 0 0
@@ -203,6 +203,7 @@
788 122 1 4223 1 1 [[4151,150,1]] 4223 0 0 0 1 0 1 988 2780 0 LimitGift6
789 123 1 4222 1 1 [[4151,25,1]] 4222 0 0 0 1 0 1 666 1530 0 LimitGift6
790 124 1 4606 1 1 [[2213,50,1]] 4606 0 0 0 1 0 1 388 1625 0 LimitGift6
+791 125 1 913 1 1 [[4694,10,1]] 913 0 0 0 1 0 1 388 1500 0 LimitGift6
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 19141fa..5b2b477 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -26,7 +26,7 @@
31190 麒麟之府 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 35
31210 仙盟BOSS 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31220 仙盟联赛 1 0 3600000 4 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 5 32
-31230 仙盟宴会 1 0 930000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+31230 仙盟宴会 1 0 1200000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31240 个人Boss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31170 守卫人皇 1 0 1800000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
51010 娲皇遗迹 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 58326b5..d672f62 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -659,11 +659,11 @@
23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23032 骑宠1技能 23032 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105027 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23033 技能特效 23033 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23033 冰火冥魂 23033 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23034 骑宠2技能 23034 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105028 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23035 技能特效 23035 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23035 九黎妖虎 23035 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23036 骑宠3技能 23036 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105029 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23037 技能特效 23037 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+23037 八宝葫芦 23037 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23041 冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 100000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 5000 0 0 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23043 冰晶矿脉减少攻击 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
--
Gitblit v1.8.0