From dba71efb14fd175d39e7545270eb1a67163e6f18 Mon Sep 17 00:00:00 2001
From: cehua_lgq <cehua_lgq@163.com>
Date: 星期四, 25 十月 2018 10:40:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 1
db/PyMongoDataServer/SysDB/tagChinItem.txt | 11 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt | 8 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 14 +++
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc | 0
db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 18 ++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 8 +-
CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt | 4
CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 2
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 2
db/PyMongoDataServer/PySysDB/tagWishingWell.txt | 76 ++++++++++++++-----
db/PyMongoDataServer/PySysDB/tagChests.txt | 5 +
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 15 ++-
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 4
db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt | 28 +++---
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
41 files changed, 148 insertions(+), 62 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index 78c9378..6d8d8bf 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -17,10 +17,10 @@
10803001 10080 int(4800*(1-0.017*min(max(yesterdayCnt-20,0),40))) [330,400] 40 5 2004 100 世界BOSS
20203005 21100 int(5400*(1-0.032*min(max(yesterdayCnt-15,0),25))) [335,385] 40 5 2016 100 世界BOSS
20203006 21100 int(6000*(1-0.023*min(max(yesterdayCnt-15,0),35))) [340,390] 40 5 2017 100 世界BOSS
-10903001 10090 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2004 100 世界BOSS
+10903001 10090 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2048 100 世界BOSS
11003001 10100 int(6000*(1-0.027*min(max(yesterdayCnt-15,0),25))) [380,450] 40 5 2047 100 世界BOSS
20203007 21100 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [385,435] 40 5 2018 100 世界BOSS
-11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2004 100 世界BOSS
+11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2049 100 世界BOSS
20303001 21110 3000 [1,500] 40 5 2040 100 世界BOSS
20303002 21110 3600 [1,500] 40 5 2041 100 世界BOSS
20303003 21110 4200 [1,500] 40 5 2042 100 世界BOSS
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
index 4d69ba7..eb3c37f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt
@@ -10,7 +10,7 @@
9 5 200 2 5 0
10 5 200 2 5 0
11 5 200 2 5 0
-12 5 25 2 5 0
+12 5 100 2 4 0
13 5 25 2 5 0
14 5 25 2 5 0
15 5 25 2 5 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 81c0247..aa67c45 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -65,5 +65,5 @@
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
FirstDayActivePlayerCnt 1000
-CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
+CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index d736330..b19c4c6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -94,3 +94,4 @@
142 110 0 0
143 120 0 0
144 140 0 0
+145 220 0 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
index 1a5515d..1931820 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
@@ -1,7 +1,7 @@
WorldLvNum Rank Award
0 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
-0 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
-0 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
+0 2 {"1":[[10771,1,0]],"2":[[20771,1,0]]}
+0 3 {"1":[[10772,1,0]],"2":[[20772,1,0]]}
1 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
1 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
1 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 8186072..adb3112 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index abee789..b6f60a1 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index 92f724f..0b3f892 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 7c35318..f176e2e 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 94e068d..3ed0e1f 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 69d5b79..c0acf61 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
index 90c2c07..de7be80 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
@@ -60,8 +60,8 @@
],
-# 地图人数对应属性额外成长系数 {mapID:{"属性名":{组队进入人数:系数, ...}, ...}, ...}
-# key支持两个格式：1-直接配，2-范围用小括号（min，max）
+# 地图人数对应属性额外成长系数 {mapID:{"属性名":{组队进入人数:系数, ...}, ...}, ...} 或 {mapID:{"属性名":"人数成长系数公式", ...}, ...}
+# key支持两个格式：1-直接配，2-范围用小括号（min，max）; 公式人数参数名: strengthenPlayerCnt
{
# 娲皇遗迹
51010:{"MaxHP":{1:1, 2:1.4, 3:1.8, 4:2}, "Def":{4:1, 3:1, 2:1, 1:1}},
@@ -83,8 +83,8 @@
},
-# NPC特殊成长人数对应属性额外成长系数 {npcID:{"属性名":{人数:系数, ...}, ...}, ...}, 优先级大于地图人数系数
-# key支持两个格式：1-直接配，2-范围用小括号（min，max）
+# NPC特殊成长人数对应属性额外成长系数 {npcID:{"属性名":{人数:系数, ...}, ...}, ...}, 优先级大于地图人数系数 或 {npcID:{"属性名":"人数成长系数公式", ...}, ...}
+# key支持两个格式：1-直接配，2-范围用小括号（min，max）; 公式人数参数名: strengthenPlayerCnt
{
#骑宠boss
50103001:{"MaxHP":{(0,30):1, (31,40):1.1, (41,99999):1.2}, "Def":{(1,99999):1}},
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 960124e..6acc6d0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1339,4 +1339,20 @@
PacketCMD_1=0xAA
PacketSubCMD_1=0x05
-PacketCallFunc_1=OnFlashSaleAppointment
\ No newline at end of file
+PacketCallFunc_1=OnFlashSaleAppointment
+
+;许愿池
+[PlayerWishingWell]
+ScriptName = Player\PlayerWishingWell.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 2
+
+PacketCMD_1=0xAA
+PacketSubCMD_1=0x07
+PacketCallFunc_1=OnActWishingRefresh
+
+PacketCMD_2=0xAA
+PacketSubCMD_2=0x06
+PacketCallFunc_2=OnActWishingDrag
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 3f0bd92..54f7487 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 2a314b5..cc07e82 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 7baa9d9..2e2f499 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
index 8207f5a..4f320ba 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index f04665e..ce796c1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc
index cd47a25..9882cc1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddMagicWeaponUpExp.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 1459606..77d168c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.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 aabcfa7..ce82101 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/GameFuncComm.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
index 7a85d6f..6d2e01c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/GameFuncComm.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 4c2b7ce..0e2cbf9 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/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
index 08c7a7c..6a687ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
index b089274..2b0630b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGreatMaster.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.pyc
new file mode 100644
index 0000000..3548f1c
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWishingWell.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 3d3cec1..7957236 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 51bf66f..b80c1dc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
index 9a3eab4..1f39980 100644
--- a/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAllPeoplePartyAward.txt
@@ -1,16 +1,16 @@
WorldLvNum Index NeedPoint Award
0 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-0 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
-0 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-0 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-0 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-1 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-1 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
-1 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-1 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-1 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-2 0 120 {"1":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]],"2":[[983,1,1],[181,5,1],[3,1,1],[4304,5,1]]}
-2 1 240 {"1":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3513,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
-2 2 320 {"1":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3504,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
-2 3 420 {"1":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3515,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
-2 4 520 {"1":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3506,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+0 1 240 {"1":[[3512,2,1],[181,10,1],[3,2,1],[4304,5,1]],"2":[[3512,2,1],[181,10,1],[3,2,1],[4304,5,1]]}
+0 2 320 {"1":[[3503,2,1],[181,15,1],[4,1,1],[4304,5,1]],"2":[[3503,2,1],[181,15,1],[4,1,1],[4304,5,1]]}
+0 3 420 {"1":[[3514,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3514,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+0 4 520 {"1":[[3505,2,1],[181,20,1],[5,1,1],[4304,5,1]],"2":[[3505,2,1],[181,20,1],[5,1,1],[4304,5,1]]}
+1 0 120 {"1":[[983,1,1],[181,5,1],[8352,1,1],[4305,5,1]],"2":[[983,1,1],[181,5,1],[8352,1,1],[4305,5,1]]}
+1 1 240 {"1":[[2389,1,1],[181,10,1],[8352,2,1],[4305,5,1]],"2":[[2389,1,1],[181,10,1],[8352,2,1],[4305,5,1]]}
+1 2 320 {"1":[[2390,1,1],[181,15,1],[8352,3,1],[4305,5,1]],"2":[[2390,1,1],[181,15,1],[8352,3,1],[4305,5,1]]}
+1 3 420 {"1":[[3515,2,1],[181,20,1],[8352,4,1],[4305,5,1]],"2":[[3515,2,1],[181,20,1],[8352,4,1],[4305,5,1]]}
+1 4 520 {"1":[[2397,1,1],[181,20,1],[8352,5,1],[4305,5,1]],"2":[[2397,1,1],[181,20,1],[8352,5,1],[4305,5,1]]}
+2 0 120 {"1":[[983,1,1],[181,5,1],[8353,1,1],[4305,5,1]],"2":[[983,1,1],[181,5,1],[8353,1,1],[4305,5,1]]}
+2 1 240 {"1":[[2389,1,1],[181,10,1],[8353,2,1],[4305,5,1]],"2":[[2389,1,1],[181,10,1],[8353,2,1],[4305,5,1]]}
+2 2 320 {"1":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]],"2":[[2390,1,1],[181,15,1],[8353,3,1],[4305,5,1]]}
+2 3 420 {"1":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]],"2":[[3516,2,1],[181,20,1],[8353,4,1],[4305,5,1]]}
+2 4 520 {"1":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]],"2":[[2397,1,1],[181,20,1],[8353,5,1],[4305,5,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index dc79b77..545d270 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -4,7 +4,7 @@
4183 0 20 500
4184 0 200 100
4185 0 20 500
-4186 0 10 100
+4186 0 60 100
4187 0 15 100
4188 0 15 100
4189 0 1 100
diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index c90c934..3bdfb5a 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -17,10 +17,10 @@
10803001 10080 90 0 0 0 2004
20203005 21100 94 0 0 0 2016
20203006 21100 95 0 0 0 2017
-10903001 10090 90 0 0 0 2004
+10903001 10090 90 0 0 0 2048
11003001 10100 90 0 0 0 2047
20203007 21100 96 0 0 0 2018
-11103001 10110 90 0 0 0 2004
+11103001 10110 90 0 0 0 2049
20303001 21110 90 0 0 0 2040
20303002 21110 91 0 0 0 2041
20303003 21110 92 0 0 0 2042
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 9c92d9c..9eea8b1 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -180,3 +180,8 @@
2390 0 0 0 0 0
2391 0 0 0 1 0
2392 0 0 280 1 1
+2393 0 0 0 1 0
+2394 0 0 280 1 1
+2395 0 0 0 1 0
+2396 0 0 280 1 1
+2397 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 20d3a4d..1092407 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -135,15 +135,15 @@
2348 0 [[5000,[3506,1]],[10000,[3516,1]]] 1
2349 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
2350 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
-2351 0 4151_5 [[10000,[4253,1]]] [[9900,0],[10000,1]] [4253]
+2351 0 4151_5 [[10000,[4253,1]]] [[7000,0],[10000,1]] [4253]
2352 0 4151_10 [[10000,[4253,1]]] 1 [4253]
2353 0 4151_10 [[10000,[4253,1]]] [[5000,0],[10000,1]] [4253]
2354 0 4151_10 [[10000,[4253,1]]] [[7500,0],[10000,1]] [4253]
-2355 0 181_5 [[10000,[224,1]]] [[9900,0],[10000,1]] [224]
+2355 0 181_5 [[10000,[224,1]]] [[7000,0],[10000,1]] [224]
2356 0 181_10 [[10000,[224,1]]] 1 [224]
2357 0 181_10 [[10000,[224,1]]] [[5000,0],[10000,1]] [224]
2358 0 181_10 [[10000,[224,1]]] [[7500,0],[10000,1]] [224]
-2359 0 4151_5 [[10000,[4252,1]]] [[9900,0],[10000,1]] [4252]
+2359 0 4151_5 [[10000,[4252,1]]] [[7000,0],[10000,1]] [4252]
2360 0 4151_10 [[10000,[4252,1]]] 1 [4252]
2361 0 4151_10 [[10000,[4252,1]]] [[5000,0],[10000,1]] [4252]
2362 0 4151_10 [[10000,[4252,1]]] [[7500,0],[10000,1]] [4252]
@@ -175,5 +175,10 @@
2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1
2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]] [[7750,0],[10000,1]] {2:[[2000,[8209,1]],[4000,[8222,1]],[6000,[8235,1]],[8000,[8248,1]],[10000,[8261,1]]]} [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1
-2391 [[100,[3803,1]],[110,[5409,1]],[130,[8067,1]],[230,[3505,1]],[330,[3515,1]],[350,[4607,1]],[550,[4606,1]],[590,[4608,1]],[990,[3504,1]],[1390,[3514,1]],[2890,[4151,8]],[4390,[181,8]],[5900,[2324,1]],[7300,[3503,1]],[8700,[3513,1]],[8950,[142,60]],[9200,[143,45]],[9450,[144,30]],[9700,[153,15]],[10000,[5303,50]]] 1 [5409,3803,8067,4607,4606,4608,3515,3505]
-2392 4184_2|1145_15|952_3|913_2
+2391 [[20,[3803,1]],[170,[3802,1]],[220,[4186,1]],[270,[199,1]],[320,[4606,1]],[370,[4608,1]],[570,[3504,1]],[770,[3514,1]],[1370,[4304,12]],[1570,[5303,60]],[3400,[2324,2]],[4700,[3503,1]],[6000,[3513,1]],[6300,[141,60]],[6600,[142,40]],[6900,[143,30]],[7200,[144,20]],[8600,[4151,8]],[10000,[181,8]]] 1 [3803,3802,4186,199,4606,4608,3504,3514]
+2392 4184_2|1145_15|952_3|913_1
+2393 [[100,[3803,1]],[120,[8067,1]],[140,[4607,1]],[190,[5206,1]],[290,[4606,1]],[540,[5006,2]],[690,[3505,1]],[840,[3515,1]],[1440,[4305,5]],[1740,[5303,60]],[3000,[2324,2]],[4400,[3503,1]],[5800,[3513,1]],[6100,[142,40]],[6400,[143,30]],[6700,[144,20]],[7000,[153,10]],[8500,[4151,8]],[10000,[181,8]]] 1 [3803,8067,4607,5206,4606,5006,3505,3515]
+2394 4184_2|1146_15|952_3|913_1
+2395 [[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]] 1 [3803,5408,5409,4607,4606,4608,3506,3516]
+2396 4184_2|1147_15|952_3|913_1
+2397 [[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
index aac3db7..29d23ab 100644
--- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt
@@ -10,7 +10,7 @@
9 5 200 2 5
10 5 200 2 5
11 5 200 2 5
-12 5 25 2 5
+12 5 100 2 4
13 5 25 2 5
14 5 25 2 5
15 5 25 2 5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index d604980..cf70b66 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -61,7 +61,7 @@
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0
-LVUPAddPoint 0|0|0 0 0 0 0
+LVUPAddPoint {(221,250):6,(251,300):12} 200 0 0 0
PointAttr1 6_CON*6|7_int(0.52*STR)|8_int(0.35*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.2) 0 0 0 0
PointAttr2 6_CON*6|7_int(0.6*PNE)|8_int(0.3*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.3) 0 0 0 0
PointAttr3 6_CON*6|7_int(0.52*STR)|8_int(0.35*PHY)|9_int(STR*2+PNE*2)|10_int(PHY*0.4) 0 0 0 0
@@ -77,7 +77,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*240000)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 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)) int(MinAtk*10+MaxAtk*10+MaxHP+Def*20) 0 0 0
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
RealmSitNPCID 10000
@@ -285,8 +285,8 @@
ReloadQuests 0
DownReward [(2,1,1),(911,1,1)] 70
FreeGoodsOpenTime 259200
-CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
-CeremonyRecharge {"1":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"2":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]]}
+CeremonyWorldLv {"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}
+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]]}
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
TJDropTaskItem {}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 18969f6..564e94a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -94,3 +94,4 @@
142 110 0 0 0
143 120 0 0 0
144 140 0 0 0
+145 220 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 129c64d..584cea1 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -228,3 +228,17 @@
wx.sgsbl.328 815035927 328 207 0
wx.sgsbl.648 815035927 648 208 0
wx.sgsbl.01 815035927 0.1 211 0
+com.price18.snxzlb spyxxzios 18 101 0
+com.price6.snxz spyxxzios 6 2 0
+com.price30.snxz spyxxzios 30 103 0
+com.price98.snxz spyxxzios 98 104 0
+com.price128.snxz spyxxzios 128 105 0
+com.price198.snxz spyxxzios 198 106 0
+com.price328.snxz spyxxzios 328 107 0
+com.price648.snxz spyxxzios 648 108 0
+com.price1.snxz spyxxzios 1 110 0
+com.price6.snxzlb spyxxzios 6 0 2
+com.price30.snxzlb spyxxzios 30 0 4
+com.price68.snxzlb spyxxzios 68 0 5
+com.price128.snxzlb spyxxzios 128 0 7
+com.price168.snxzlb spyxxzios 168 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 73c8eb6..f093444 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -163,8 +163,8 @@
779 36 1 15 1 1 [[1128,1,1]] 1128 0 0 0 1 0 1 388 1000 0 LimitGift7
780 37 1 263 1 1 [[181,120,1]] 263 0 0 0 1 0 1 988 2100 0 LimitGift8
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
-802 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
-803 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
901 30 0 2211 1 1 [] 0 7 0 0 50 0 27 50 0 0
902 30 0 4658 1 1 [] 0 7 0 0 2 0 27 500 0 0
903 30 0 4738 1 1 [] 0 7 0 0 3 0 27 800 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index cbf49aa..4135f60 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -282,6 +282,7 @@
774 10 1 201|20 0 0 0 0 9
775 12 6 0 0 0 0 0 10
776 120 80 0 0 0 0 0 11
+777 6 2 0 0 0 0 0 12
801 30 1 1 0 0 0 0 0
802 30 1 2 0 0 0 0 0
803 30 1 3 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
index 1bb644d..b4fded7 100644
--- a/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagWishingWell.txt
@@ -1,21 +1,57 @@
ID IsFree WorldLVLimit ItemID ItemCnt IsBind ItemListEx Mark
-1 1 [0,500] 2200 1 1 500 1001
-1 1 [0,500] 2200 1 1 500 1002
-1 1 [0,500] 2201 1 1 500 1003
-1 1 [0,500] 2213 1 1 500 1004
-1 1 [0,500] 3504 1 1 500 1101
-1 1 [0,500] 3514 1 1 500 1102
-1 1 [0,500] 2204 1 1 500 1103
-1 1 [0,500] 2203 1 1 500 1104
-1 1 [0,500] 4187 1 1 500 1201
-1 1 [0,500] 4188 1 1 500 1202
-1 1 [0,500] 2325 1 1 500 1203
-1 1 [0,500] 4741 1 1 500 1204
-1 1 [0,500] 2389 1 1 500 1301
-1 1 [0,500] 3796 1 0 500 1302
-1 1 [0,500] 3797 1 0 500 1303
-1 1 [0,500] 4101 1 0 500 1304
-1 1 [0,500] 4102 1 0 500 1401
-1 1 [0,500] 952 1 0 500 1402
-1 1 [0,500] 911 1 0 500 1403
-1 1 [0,500] 914 1 0 500 1404
+1 0 [0,100] 181 1 1 100 1008
+1 0 [0,100] 181 2 1 200 1007
+1 0 [0,100] 181 3 1 300 1006
+1 0 [0,100] 181 4 1 400 1005
+1 0 [100,500] 181 5 1 500 1004
+1 0 [100,500] 181 10 1 600 1003
+1 0 [100,500] 181 20 1 700 1002
+1 0 [100,500] 181 50 1 800 1001
+1 0 [0,150] 4151 2 1 100 1108
+1 0 [0,150] 4151 4 1 200 1107
+1 0 [0,150] 4151 6 1 300 1106
+1 0 [0,150] 4151 8 1 400 1105
+1 0 [150,500] 4151 10 1 500 1104
+1 0 [150,500] 4151 20 1 600 1103
+1 0 [150,500] 4151 40 1 700 1102
+1 0 [150,500] 4151 100 1 800 1101
+1 0 [0,200] 4611 1 1 100 1207
+1 0 [0,210] 4611 5 1 200 1206
+1 0 [0,220] 4611 10 1 300 1205
+1 0 [0,230] 4611 30 1 400 1204
+1 0 [200,500] 4611 50 1 500 1203
+1 0 [200,500] 4611 70 1 600 1202
+1 0 [200,500] 4611 100 1 700 1201
+1 0 [0,200] 4612 1 1 100 1307
+1 0 [0,210] 4612 5 1 200 1306
+1 0 [0,220] 4612 10 1 300 1305
+1 0 [0,230] 4612 30 1 400 1304
+1 0 [200,500] 4612 50 1 500 1303
+1 0 [200,500] 4612 70 1 600 1302
+1 0 [200,500] 4612 100 1 700 1301
+1 1 [0,100] 181 1 1 100 1407
+1 1 [0,100] 181 2 1 200 1406
+1 1 [0,100] 181 3 1 300 1405
+1 1 [0,100] 181 4 1 400 1404
+1 1 [100,500] 181 5 1 500 1403
+1 1 [100,500] 181 10 1 600 1402
+1 1 [100,500] 181 20 1 700 1401
+1 1 [0,150] 4151 2 1 100 1506
+1 1 [0,150] 4151 4 1 200 1505
+1 1 [0,150] 4151 6 1 300 1504
+1 1 [0,150] 4151 8 1 400 1503
+1 1 [150,500] 4151 10 1 500 1502
+1 1 [150,500] 4151 20 1 600 1501
+1 1 [0,200] 4611 1 1 100 1606
+1 1 [0,210] 4611 5 1 200 1605
+1 1 [0,220] 4611 10 1 300 1604
+1 1 [0,230] 4611 30 1 400 1603
+1 1 [200,500] 4611 50 1 500 1602
+1 1 [200,500] 4611 70 1 600 1601
+1 1 [0,200] 4612 1 1 100 1707
+1 1 [0,210] 4612 5 1 200 1706
+1 1 [0,220] 4612 10 1 300 1705
+1 1 [0,230] 4612 30 1 400 1704
+1 1 [200,500] 4612 50 1 500 1703
+1 1 [200,500] 4612 70 1 600 1702
+1 1 [200,500] 4612 100 1 700 1701
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index c29831d..6e2c37b 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -277,13 +277,15 @@
1142 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 1800 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1143 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 600 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1144 1 0 异兽之地经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 3600 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-1145 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1145 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1146 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1147 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1500 1 0 麒麟魂魄 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 233 31190 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1501 1 0 宗门令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 10 0 1 0 0 233 60010 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1503 1 0 娲皇卷轴 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1504 1 0 矿脉钥匙 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-1600 1 0 后裔之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 236 111 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+1600 1 0 后羿之魂 77 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 236 111 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -509,6 +511,11 @@
2390 1 0 神兽紫装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2391 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2392 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2393 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2394 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2395 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2396 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2397 1 0 神兽橙装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0