From 68dd29f253672a95ba21e5b5a0c5740d2866e8d9 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期四, 30 八月 2018 11:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 331 +++++++++++++++--------------
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt | 18
db/PyMongoDataServer/PySysDB/tagPetClassCost.txt | 40 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 141 ++++++------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 12 +
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 5
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 4
db/PyMongoDataServer/PySysDB/tagNPCCustomRefresh.txt | 2
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc | 0
CoreServerGroup/GameServer/PyNetPack.ini | 6
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 14
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 41 ++-
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
40 files changed, 350 insertions(+), 269 deletions(-)
diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini
index fdc6620..6b0a4e7 100644
--- a/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/CoreServerGroup/GameServer/PyNetPack.ini
@@ -319,12 +319,16 @@
Writer = xdh
Releaser = xdh
RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
PacketCMD_1=0xA9
PacketSubCMD_1=0x03
PacketCallFunc_1=OnAttentionBoss
+PacketCMD_2=0xAC
+PacketSubCMD_2=0x04
+PacketCallFunc_2=OnQueryAllFamilyBossHurt
+
[PlayerXMZZ]
ScriptName = Player\PlayerXMZZ.py
Writer = xdh
diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index f757400..f7ed68f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -48,20 +48,27 @@
31503007 31150 3300 [1,500] 40 5 2037 100 古神禁地
31503008 31150 3600 [1,500] 40 5 2038 100 古神禁地
31503009 31150 4200 [1,500] 40 5 2039 100 古神禁地
-60203004 52010 int(max(192-min(onlineCnt,10)*12-max(min(onlineCnt-10,10),0)*4,32)) [85,120] 40 5 100 封魔坛
-60203005 52010 int(max(192-min(onlineCnt,10)*12-max(min(onlineCnt-10,10),0)*4,32)) [85,120] 40 5 100 封魔坛
-60203006 52010 240 [1,500] 40 5 100 封魔坛
-60203007 52010 300 [1,500] 40 5 100 封魔坛
-60203008 52010 360 [1,500] 40 5 100 封魔坛
-60203009 52010 390 [1,500] 40 5 100 封魔坛
-60203010 52010 420 [1,500] 40 5 100 封魔坛
-60203011 52010 450 [1,500] 40 5 100 封魔坛
-60203012 52010 480 [1,500] 40 5 100 封魔坛
-60203013 52010 510 [1,500] 40 5 100 封魔坛
-60203014 52010 540 [1,500] 40 5 100 封魔坛
-60203015 52010 570 [1,500] 40 5 100 封魔坛
-60203016 52010 600 [1,500] 40 5 100 封魔坛
-60203017 52010 630 [1,500] 40 5 100 封魔坛
-60203018 52010 660 [1,500] 40 5 100 封魔坛
-60203019 52010 690 [1,500] 40 5 100 封魔坛
-60203020 52010 720 [1,500] 40 5 100 封魔坛
+60203004 52010 int(max(192-min(onlineCnt,10)*12-max(min(onlineCnt-10,10),0)*4,32)) [85,120] 40 5 0 100 封魔坛
+60203005 52010 int(max(192-min(onlineCnt,10)*12-max(min(onlineCnt-10,10),0)*4,32)) [85,120] 40 5 0 100 封魔坛
+60203006 52010 240 [1,500] 40 5 0 100 封魔坛
+60203007 52010 300 [1,500] 40 5 0 100 封魔坛
+60203008 52010 360 [1,500] 40 5 0 100 封魔坛
+60203009 52010 390 [1,500] 40 5 0 100 封魔坛
+60203010 52010 420 [1,500] 40 5 0 100 封魔坛
+60203011 52010 450 [1,500] 40 5 0 100 封魔坛
+60203012 52010 480 [1,500] 40 5 0 100 封魔坛
+60203013 52010 510 [1,500] 40 5 0 100 封魔坛
+60203014 52010 540 [1,500] 40 5 0 100 封魔坛
+60203015 52010 570 [1,500] 40 5 0 100 封魔坛
+60203016 52010 600 [1,500] 40 5 0 100 封魔坛
+60203017 52010 630 [1,500] 40 5 0 100 封魔坛
+60203018 52010 660 [1,500] 40 5 0 100 封魔坛
+60203019 52010 690 [1,500] 40 5 0 100 封魔坛
+60203020 52010 720 [1,500] 40 5 0 100 封魔坛
+50103001 10010 0 [] 0 0 0 0 骑宠争夺
+50103002 10020 0 [] 0 0 0 0 骑宠争夺
+50103003 10030 0 [] 0 0 0 0 骑宠争夺
+50103004 10040 0 [] 0 0 0 0 骑宠争夺
+50103005 21070 0 [] 0 0 0 0 骑宠争夺
+50103006 21100 0 [] 0 0 0 0 骑宠争夺
+50103007 10080 0 [] 0 0 0 0 骑宠争夺
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 1d61cd7..c6d87c7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -810,7 +810,7 @@
30601014 魂灵 260
30601015 魔剑 265
30603006 玄界冰魔 320
-50103001 灵狐仙 125
+50103001 道士鼠 125
50103002 觉灵鹿 145
50103003 球球 160
50103004 地狱冥虎 180
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 0bea853..c824aa3 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 e4f3002..460499f 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 058d24d..137d8ad 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 368a98b..59f68c4 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 206f140..156368d 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index ef984ca..7a0d991 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 6c783bc..bd159df 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 483f773..e861707 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/NPCLogic_AI/NPCLogic_AI186_Trigger.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
index 99e204a..27c1e0e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_AI/NPCLogic_AI186_Trigger.txt
@@ -120,15 +120,15 @@
},
31003001: {0 : (0, 0, 0),
1 : (95, 0, 0),
-
+ 2 : (75, 0, 0),
},
31003002: {0 : (99, 0, 0),
- 1 : (96, 0, 0),
- 2 : (75, 0, 0),
+ 1 : (75, 0, 0),
+ 2 : (60, 0, 0),
},
31003003: {0 : (99, 0, 0),
- 1 : (96, 0, 0),
- 2 : (75, 0, 0),
+ 1 : (75, 0, 0),
+ 2 : (60, 0, 0),
},
31003004: {0 : (0, 0, 0),
1 : (95, 0, 0),
@@ -142,13 +142,13 @@
1 : (95, 0, 0),
2 : (75, 0, 0),
},
-31003007: {0 : (0, 0, 0),
- 1 : (95, 0, 0),
- 2 : (75, 0, 0),
+31003007: {0 : (75, 0, 0),
+
},
31003008: {0 : (0, 0, 0),
1 : (95, 0, 0),
- 2 : (75, 0, 0),
+ 2 : (85, 0, 0),
+ 3 : (75, 0, 0),
},
31503001: {0 : (0, 0, 0),
1 : (90, 0, 0),
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 1cfb104..7a8b725 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1245,6 +1245,18 @@
PacketSubCMD_1=0x03
PacketCallFunc_1=OnActiveAllEquipAttr
+;仙盟抢boss
+[FamilyRobBoss]
+ScriptName = GameWorldLogic\FamilyRobBoss.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xA2
+PacketSubCMD_1=0x28
+PacketCallFunc_1=OnQueryFamilyBossHurt
+
;神兽
[PlayerDogz]
ScriptName = Player\PlayerDogz.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 9f1235d..7c8783c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 3949800..1c97048 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 f63e914..d5a76dd 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 c9cb280..2f359e0 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/GM/Commands/Boss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc
index 5a677eb..6014c4f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Boss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.pyc
index 6ed5fa2..d799245 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/KillScreenNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.pyc
index 1f34ce1..6b668a3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintNPCHurt.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index 72d3340..907d230 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc
new file mode 100644
index 0000000..8cdd8a3
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
index bbe797a..4f90347 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.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 88d25cc..766bc5a 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/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index 6e72719..a5e1471 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc
index ac7d47e..97f4cc0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.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 d522673..bcc53d6 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/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
index 75f6901..04b0b3d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.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 7f0de73..f041804 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/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
index 11208a5..ab6c6ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.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 322da6a..0a15d58 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/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index 0d813d3..e04ec78 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -1,67 +1,74 @@
-NPCID MapID RefreshMark StoneNPCID
-10403001 10040 90 2000
-10503001 10050 90 2001
-10603001 10060 90 2002
-10703001 10070 90 2003
-10803001 10080 90 2004
-10903001 10090 90 2004
-11103001 10110 90 2004
-20103001 21070 90 2005
-20103002 21070 91 2006
-20103003 21070 92 2007
-20103004 21070 93 2008
-20103005 21070 94 2009
-20103006 21070 95 2010
-20103007 21070 96 2011
-20203001 21100 90 2012
-20203002 21100 91 2013
-20203003 21100 92 2014
-20203004 21100 93 2015
-20203005 21100 94 2016
-20203006 21100 95 2017
-20203007 21100 96 2018
-20303001 21110 90 2012
-20303002 21110 91 2013
-20303003 21110 92 2014
-20303004 21110 93 2015
-20303005 21110 94 2016
-20303006 21110 95 2017
-20303007 21110 96 2018
-30303001 31020 90 2019
-30303002 31020 91 2020
-30303003 31020 92 2021
-30303004 31020 93 2022
-30303005 31020 94 2023
-30303006 31020 95 2024
-30303007 31020 96 2025
-30303008 31030 90 2026
-30303009 31030 91 2027
-30303010 31030 92 2028
-30303011 31030 93 2029
-30303012 31030 94 2030
-31503001 31150 90 2031
-31503002 31150 91 2032
-31503003 31150 92 2033
-31503004 31150 93 2034
-31503005 31150 94 2035
-31503006 31150 95 2036
-31503007 31150 96 2037
-31503008 31150 97 2038
-31503009 31150 98 2039
-60203004 52010 90
-60203005 52010 90
-60203006 52010 90
-60203007 52010 90
-60203008 52010 90
-60203009 52010 90
-60203010 52010 90
-60203011 52010 90
-60203012 52010 90
-60203013 52010 90
-60203014 52010 90
-60203015 52010 90
-60203016 52010 90
-60203017 52010 90
-60203018 52010 90
-60203019 52010 90
-60203020 52010 90
+NPCID MapID RefreshMark NeedShunt RelatedType RelatedID StoneNPCID
+10403001 10040 90 1 0 0 2000
+10503001 10050 90 0 0 0 2001
+10603001 10060 90 0 0 0 2002
+10703001 10070 90 0 0 0 2003
+10803001 10080 90 0 0 0 2004
+10903001 10090 90 0 0 0 2004
+11103001 10110 90 0 0 0 2004
+20103001 21070 90 1 0 0 2005
+20103002 21070 91 1 0 0 2006
+20103003 21070 92 1 0 0 2007
+20103004 21070 93 1 0 0 2008
+20103005 21070 94 1 0 0 2009
+20103006 21070 95 1 0 0 2010
+20103007 21070 96 1 0 0 2011
+20203001 21100 90 0 0 0 2012
+20203002 21100 91 0 0 0 2013
+20203003 21100 92 0 0 0 2014
+20203004 21100 93 0 0 0 2015
+20203005 21100 94 0 0 0 2016
+20203006 21100 95 0 0 0 2017
+20203007 21100 96 0 0 0 2018
+20303001 21110 90 0 0 0 2012
+20303002 21110 91 0 0 0 2013
+20303003 21110 92 0 0 0 2014
+20303004 21110 93 0 0 0 2015
+20303005 21110 94 0 0 0 2016
+20303006 21110 95 0 0 0 2017
+20303007 21110 96 0 0 0 2018
+30303001 31020 90 0 0 0 2019
+30303002 31020 91 0 0 0 2020
+30303003 31020 92 0 0 0 2021
+30303004 31020 93 0 0 0 2022
+30303005 31020 94 0 0 0 2023
+30303006 31020 95 0 0 0 2024
+30303007 31020 96 0 0 0 2025
+30303008 31030 90 0 0 0 2026
+30303009 31030 91 0 0 0 2027
+30303010 31030 92 0 0 0 2028
+30303011 31030 93 0 0 0 2029
+30303012 31030 94 0 0 0 2030
+31503001 31150 90 0 0 0 2031
+31503002 31150 91 0 0 0 2032
+31503003 31150 92 0 0 0 2033
+31503004 31150 93 0 0 0 2034
+31503005 31150 94 0 0 0 2035
+31503006 31150 95 0 0 0 2036
+31503007 31150 96 0 0 0 2037
+31503008 31150 97 0 0 0 2038
+31503009 31150 98 0 0 0 2039
+60203004 52010 90 0 0 0 0
+60203005 52010 90 0 0 0 0
+60203006 52010 90 0 0 0 0
+60203007 52010 90 0 0 0 0
+60203008 52010 90 0 0 0 0
+60203009 52010 90 0 0 0 0
+60203010 52010 90 0 0 0 0
+60203011 52010 90 0 0 0 0
+60203012 52010 90 0 0 0 0
+60203013 52010 90 0 0 0 0
+60203014 52010 90 0 0 0 0
+60203015 52010 90 0 0 0 0
+60203016 52010 90 0 0 0 0
+60203017 52010 90 0 0 0 0
+60203018 52010 90 0 0 0 0
+60203019 52010 90 0 0 0 0
+60203020 52010 90 0 0 0 0
+50103001 10010 99 0 1 17 0
+50103002 10020 99 0 1 17 0
+50103003 10030 99 0 1 17 0
+50103004 10040 99 0 1 17 0
+50103005 21070 99 0 1 17 0
+50103006 21100 99 0 1 17 0
+50103007 10080 99 0 1 17 0
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 791af1e..4d57871 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -129,7 +129,7 @@
2339 0 0 0 0 1
2340 0 0 0 1 1
2341 0 0 0 1 1
-2342 0 0 0 1 1
+2342 0 0 0 0 1
2343 0 0 0 1 1
2344 0 0 0 1 1
2345 0 0 0 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index e59cc46..f084751 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -1,6 +1,6 @@
TemplateID NeedCostGold AwardIndex AwardItemList NotifyKey
-1 128 0 [(912,1,1)] ConsumptionRebate3
-1 588 1 [(4184,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
+1 128 0 [(141,130,1)] ConsumptionRebate3
+1 588 1 [(4215,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
1 1588 2 [(51,1,1),(143,50,1),(4151,30,1)] ConsumptionRebate3
1 5000 3 [(3515,1,1),(3505,1,1),(106,8,1),(103,8,1)] ConsumptionRebate2
2 500 0 [(4651,10,1),(4652,10,1)]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index caf7b83..fc0895e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -263,9 +263,9 @@
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
TreasureSet11 [1, 10] [248, 1984] [[982,1], [982, 8]] [0, 0] [10, 100]
-TreasureSet21 max(baseRate,int(min(curLuck,30)*10+min(max(curLuck-30,0),10)*20+min(max(curLuck-40,0),20)*50)) [1, 10] 1000
+TreasureSet21 max(baseRate,int(min(curLuck,30)*1+min(max(curLuck-30,0),10)*2+min(max(curLuck-40,0),20)*5)) [1, 10] 1000
TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 8]] [1440, 0] [5, 50]
-TreasureSet22 min(500,int(baseRate+curLuck/300.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
+TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50
@@ -288,3 +288,4 @@
FlashGiftbagMailItem [(1,1,1)]
SpringSaleMailItem [(1,1,1)]
OSSaleMailItem [(1,1,1)]
+FairyGrabBoss {50103001:{1:[[103,1,1],[102,1,1],[101,1,1]],2:[[102,1,1],[101,1,1]],2:[[101,1,1]]}, 50103002:{1:[[106,1,1],[105,1,1],[104,1,1]],2:[[105,1,1],[104,1,1]],2:[[104,1,1]]}} 5 {50103002:[[103,1,1],[102,1,1],[101,1,1]], 50103001:[[106,1,1],[105,1,1],[104,1,1]]} [[50, "FairyGrabBossWillKill"], [30, "FairyGrabBossWillKill"], [10, "FairyGrabBossWillKill"]]
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 906ee25..69b5272 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -60,164 +60,173 @@
59 11175 11151|11152|11153|11154|11155|11156|11157 3 0 0 0 6000 0 0 EquipComposeSuccess1
60 11176 11151|11152|11153|11154|11155|11156|11157 3 0 0 0 6000 0 0 EquipComposeSuccess1
61 11177 11151|11152|11153|11154|11155|11156|11157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-62 10681 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-63 10682 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-64 10683 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-65 10684 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-66 10685 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-67 10686 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-68 10687 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-69 10781 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-70 10782 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-71 10783 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-72 10784 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-73 10785 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-74 10786 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-75 10787 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-76 10881 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-77 10882 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-78 10883 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-79 10884 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-80 10885 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-81 10886 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-82 10887 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-83 10981 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-84 10982 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-85 10983 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-86 10984 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-87 10985 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-88 10986 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-89 10987 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-90 11081 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-91 11082 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-92 11083 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-93 11084 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-94 11085 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-95 11086 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-96 11087 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-97 11181 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-98 11182 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-99 11183 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-100 11184 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-101 11185 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-102 11186 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-103 11187 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-104 20571 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-105 20572 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-106 20573 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-107 20574 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-108 20575 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-109 20576 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-110 20577 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
-111 20671 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-112 20672 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-113 20673 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-114 20674 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-115 20675 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-116 20676 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-117 20677 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
-118 20771 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-119 20772 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-120 20773 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-121 20774 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-122 20775 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-123 20776 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-124 20777 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
-125 20871 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-126 20872 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-127 20873 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-128 20874 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-129 20875 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-130 20876 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-131 20877 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
-132 20971 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-133 20972 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-134 20973 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-135 20974 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-136 20975 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-137 20976 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-138 20977 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
-139 21071 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-140 21072 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-141 21073 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-142 21074 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-143 21075 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-144 21076 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-145 21077 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
-146 21171 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-147 21172 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-148 21173 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-149 21174 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-150 21175 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-151 21176 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-152 21177 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
-153 20681 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-154 20682 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-155 20683 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-156 20684 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-157 20685 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-158 20686 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-159 20687 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
-160 20781 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-161 20782 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-162 20783 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-163 20784 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-164 20785 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-165 20786 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-166 20787 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
-167 20881 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-168 20882 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-169 20883 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-170 20884 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-171 20885 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-172 20886 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-173 20887 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
-174 20981 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-175 20982 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-176 20983 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-177 20984 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-178 20985 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-179 20986 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-180 20987 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
-181 21081 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-182 21082 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-183 21083 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-184 21084 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-185 21085 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-186 21086 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-187 21087 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
-188 21181 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-189 21182 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-190 21183 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-191 21184 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-192 21185 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-193 21186 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-194 21187 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
-195 9003 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4
-196 9004 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4
-197 9005 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5
-198 9006 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5
-199 9015 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4
-200 9016 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4
-201 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5
-202 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5
-203 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1
-204 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2
-205 3502 0 0 3501 3 0 10000 0 0 0
-206 3503 0 0 3502 3 0 10000 0 0 0
-207 3504 0 0 3503 3 0 10000 0 0 0
-208 3505 0 0 3504 3 0 10000 0 0 0
-209 3506 0 0 3505 3 0 10000 0 0 0
-210 3507 0 0 3506 3 0 10000 0 0 0
-211 3508 0 0 3507 3 0 10000 0 0 0
-212 3512 0 0 3511 3 0 10000 0 0 0
-213 3513 0 0 3512 3 0 10000 0 0 0
-214 3514 0 0 3513 3 0 10000 0 0 0
-215 3515 0 0 3514 3 0 10000 0 0 0
-216 3516 0 0 3515 3 0 10000 0 0 0
-217 3517 0 0 3516 3 0 10000 0 0 0
-218 3518 0 0 3517 3 0 10000 0 0 0
-219 5012 0 0 5301 5 0 10000 0 0 0
-220 5022 0 0 5301 5 0 10000 0 0 0
-221 260 0 0 222 5 0 10000 0 0 EquipComposeSuccess3
-222 4209 0 0 4250 5 0 10000 0 0 EquipComposeSuccess3
+62 10581 10571|10572|10573|10574|10575|10576|10577 3 0 0 0 7500 0 0 EquipComposeSuccess2
+63 10582 10571|10572|10573|10574|10575|10576|10577 3 0 0 0 7500 0 0 EquipComposeSuccess2
+64 10681 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+65 10682 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+66 10683 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+67 10684 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+68 10685 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+69 10686 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+70 10687 10671|10672|10673|10674|10675|10676|10677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+71 10781 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+72 10782 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+73 10783 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+74 10784 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+75 10785 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+76 10786 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+77 10787 10771|10772|10773|10774|10775|10776|10777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+78 10881 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+79 10882 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+80 10883 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+81 10884 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+82 10885 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+83 10886 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+84 10887 10871|10872|10873|10874|10875|10876|10877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+85 10981 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+86 10982 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+87 10983 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+88 10984 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+89 10985 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+90 10986 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+91 10987 10971|10972|10973|10974|10975|10976|10977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+92 11081 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+93 11082 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+94 11083 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+95 11084 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+96 11085 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+97 11086 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+98 11087 11071|11072|11073|11074|11075|11076|11077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+99 11181 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+100 11182 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+101 11183 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+102 11184 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+103 11185 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+104 11186 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+105 11187 11171|11172|11173|11174|11175|11176|11177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+106 20571 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+107 20572 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+108 20573 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+109 20574 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+110 20575 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+111 20576 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+112 20577 20551|20552|20553|20554|20555|20556|20557 3 0 0 0 6000 0 0 EquipComposeSuccess1
+113 20671 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+114 20672 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+115 20673 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+116 20674 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+117 20675 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+118 20676 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+119 20677 20651|20652|20653|20654|20655|20656|20657 3 0 0 0 6000 0 0 EquipComposeSuccess1
+120 20771 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+121 20772 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+122 20773 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+123 20774 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+124 20775 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+125 20776 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+126 20777 20751|20752|20753|20754|20755|20756|20757 3 0 0 0 6000 0 0 EquipComposeSuccess1
+127 20871 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+128 20872 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+129 20873 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+130 20874 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+131 20875 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+132 20876 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+133 20877 20851|20852|20853|20854|20855|20856|20857 3 0 0 0 6000 0 0 EquipComposeSuccess1
+134 20971 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+135 20972 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+136 20973 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+137 20974 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+138 20975 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+139 20976 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+140 20977 20951|20952|20953|20954|20955|20956|20957 3 0 0 0 6000 0 0 EquipComposeSuccess1
+141 21071 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+142 21072 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+143 21073 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+144 21074 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+145 21075 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+146 21076 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+147 21077 21051|21052|21053|21054|21055|21056|21057 3 0 0 0 6000 0 0 EquipComposeSuccess1
+148 21171 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+149 21172 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+150 21173 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+151 21174 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+152 21175 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+153 21176 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+154 21177 21151|21152|21153|21154|21155|21156|21157 3 0 0 0 6000 0 0 EquipComposeSuccess1
+155 20581 20571|20572|20573|20574|20575|20576|20577 3 0 0 0 7500 0 0 EquipComposeSuccess2
+156 20582 20571|20572|20573|20574|20575|20576|20577 3 0 0 0 7500 0 0 EquipComposeSuccess2
+157 20681 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+158 20682 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+159 20683 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+160 20684 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+161 20685 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+162 20686 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+163 20687 20671|20672|20673|20674|20675|20676|20677 3 0 0 0 7500 0 0 EquipComposeSuccess2
+164 20781 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+165 20782 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+166 20783 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+167 20784 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+168 20785 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+169 20786 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+170 20787 20771|20772|20773|20774|20775|20776|20777 3 0 0 0 7500 0 0 EquipComposeSuccess2
+171 20881 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+172 20882 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+173 20883 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+174 20884 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+175 20885 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+176 20886 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+177 20887 20871|20872|20873|20874|20875|20876|20877 3 0 0 0 7500 0 0 EquipComposeSuccess2
+178 20981 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+179 20982 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+180 20983 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+181 20984 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+182 20985 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+183 20986 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+184 20987 20971|20972|20973|20974|20975|20976|20977 3 0 0 0 7500 0 0 EquipComposeSuccess2
+185 21081 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+186 21082 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+187 21083 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+188 21084 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+189 21085 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+190 21086 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+191 21087 21071|21072|21073|21074|21075|21076|21077 3 0 0 0 7500 0 0 EquipComposeSuccess2
+192 21181 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+193 21182 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+194 21183 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+195 21184 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+196 21185 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+197 21186 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+198 21187 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2
+199 9003 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4
+200 9004 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4
+201 9005 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5
+202 9006 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5
+203 9015 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4
+204 9016 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4
+205 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5
+206 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5
+207 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1
+208 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2
+209 3502 0 0 3501 3 0 10000 0 0 0
+210 3503 0 0 3502 3 0 10000 0 0 0
+211 3504 0 0 3503 3 0 10000 0 0 0
+212 3505 0 0 3504 3 0 10000 0 0 0
+213 3506 0 0 3505 3 0 10000 0 0 0
+214 3507 0 0 3506 3 0 10000 0 0 0
+215 3508 0 0 3507 3 0 10000 0 0 0
+216 3512 0 0 3511 3 0 10000 0 0 0
+217 3513 0 0 3512 3 0 10000 0 0 0
+218 3514 0 0 3513 3 0 10000 0 0 0
+219 3515 0 0 3514 3 0 10000 0 0 0
+220 3516 0 0 3515 3 0 10000 0 0 0
+221 3517 0 0 3516 3 0 10000 0 0 0
+222 3518 0 0 3517 3 0 10000 0 0 0
+223 5012 0 0 5301 5 0 10000 0 0 0
+224 5022 0 0 5301 5 0 10000 0 0 0
+225 250 0 0 224 5 0 10000 0 0 EquipComposeSuccess3
+226 260 0 0 222 10 0 10000 0 0 EquipComposeSuccess3
+227 258 0 0 223 30 0 10000 0 0 EquipComposeSuccess3
+228 4202 0 0 4253 3 0 10000 0 0 EquipComposeSuccess3
+229 4213 0 0 4252 5 0 10000 0 0 EquipComposeSuccess3
+230 4209 0 0 4250 10 0 10000 0 0 EquipComposeSuccess3
+231 4210 0 0 4251 30 0 10000 0 0 EquipComposeSuccess3
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCCustomRefresh.txt b/db/PyMongoDataServer/PySysDB/tagNPCCustomRefresh.txt
index c89282a..61f4e35 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCCustomRefresh.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCCustomRefresh.txt
@@ -19,7 +19,7 @@
5101064 111 31001012 [] [] 1 1 0 0 0
5101065 111 31001012 [] [] 1 1 0 0 0
5101071 114 31001009 [] [] 1 3 0 0 0
-5101072 113 31001010 [] [] 4 12 0 2 0
+5101072 113 31001010 [] [] 6 20 0 2 0
5101081 115 31003008 [] [] 1 1 0 0 0
312501 101 32502001 [] [] 1 1 0 0 0
312502 102 32503001 [] [] 1 1 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index 840df3b..174365b 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -469,3 +469,43 @@
50106306 38 13165 20951
50106306 39 13717 21794
50106306 40 0 22642
+50106307 1 1480 460
+50106307 2 1607 668
+50106307 3 1745 889
+50106307 4 1892 1124
+50106307 5 2051 1375
+50106307 6 2220 1642
+50106307 7 2399 1926
+50106307 8 2589 2228
+50106307 9 2789 2549
+50106307 10 3000 2890
+50106307 11 3221 3250
+50106307 12 3453 3633
+50106307 13 3695 4041
+50106307 14 3948 4473
+50106307 15 4211 4931
+50106307 16 4485 5416
+50106307 17 4770 5927
+50106307 18 5064 6466
+50106307 19 5370 7033
+50106307 20 5685 7629
+50106307 21 6012 8255
+50106307 22 6349 8898
+50106307 23 6696 9558
+50106307 24 7054 10235
+50106307 25 7422 10926
+50106307 26 7801 11631
+50106307 27 8190 12349
+50106307 28 8590 13078
+50106307 29 9000 13817
+50106307 30 9421 14564
+50106307 31 9852 15317
+50106307 32 10294 16086
+50106307 33 10746 16868
+50106307 34 11209 17663
+50106307 35 11682 18470
+50106307 36 12166 19288
+50106307 37 12660 20115
+50106307 38 13165 20951
+50106307 39 13717 21794
+50106307 40 0 22642
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 4759951..73f0035 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -212,6 +212,7 @@
1020 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 1500 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
1021 1 0 试炼找回经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 8 0 50 0 1 0 0 215 3000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1022 1 0 魔坛秘影经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 50 0 1 0 0 213 2994480 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
+1023 1 0 骑宠争夺经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 3000 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
1100 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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
1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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
1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 056d3b8..d11ea46 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -516,12 +516,12 @@
30909017 9 0 水晶 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1
30909018 9 0 水晶 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1
30909019 9 0 敌方水晶无主化 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 22213 0 0 0 0 0 0 0 0 10 2 1000 0 0 0 0 0 0 0 214 0 1
-31003001 2 0 阵殿古猿 160 0 7026 7026 0 4 0 0 0 5895 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 23010 23012 0 0 0 0 0 0 0 100 2 840145 0 0 0 0 5 0 0 186 1 1
+31003001 2 0 阵殿古猿 160 0 7026 7026 0 4 0 0 0 5895 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 23010 23012 23030 0 0 0 0 0 0 100 2 840145 0 0 0 0 5 0 0 186 1 1
31003002 2 0 遗迹残魂 210 0 6699 6699 0 8 0 0 0 4091 0 0 0 0 0 0 0 0 2500 97853 29 0 300 2 6 23014 23030 23015 23010 0 0 0 0 0 100 2 11790969 0 0 0 0 5 0 0 186 1 1
31003003 2 0 遗迹残魂 210 0 6699 6699 0 8 0 0 0 4091 0 0 0 0 0 0 0 0 2500 97853 29 0 300 2 6 23016 23030 23015 23010 0 0 0 0 0 100 2 11790969 0 0 0 0 5 0 0 186 1 1
31003004 2 0 遗迹古妖 235 0 17520 17520 0 10 0 0 0 11737 0 0 0 0 0 0 0 0 2500 109510 31 0 300 2 6 23010 23017 23030 0 0 0 0 0 0 100 2 25933382 0 0 0 0 5 0 0 186 1 1
31003005 2 0 遗迹天将 250 0 22863 22863 5783 11 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 32175092 0 0 0 0 5 0 0 186 1 1
-31003006 2 0 遗迹天将 250 0 22863 22863 0 11 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 24131319 0 0 0 0 5 0 0 186 1 1
+31003006 2 0 遗迹天将 250 0 22863 22863 0 11 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 28946458 0 0 0 0 5 0 0 186 1 1
31003007 2 0 极冰守卫 265 0 35615 35615 7059 12 0 0 0 21938 0 0 0 0 0 0 0 0 2500 142222 35 0 300 2 6 23010 23021 23030 0 0 0 0 0 0 100 2 57127167 0 0 0 0 5 0 0 186 1 1
31003008 2 0 执印龙王 300 0 49763 49763 0 15 0 0 0 26158 0 0 0 0 0 0 0 0 2500 166756 39 0 300 2 6 10016 23025 23022 23030 0 0 0 0 0 100 2 56279846 2 0 0 0 5 0 0 186 1 1
31001001 2 0 镇守妖兵 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 48007 0 0 0 0 1 0 0 180 1 1
@@ -532,7 +532,7 @@
31001006 2 0 遗迹剑魔 180 0 1517 1517 0 6 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 214401 0 0 0 0 1 0 0 180 1 1
31001007 2 0 遗迹炎龙 180 0 1517 1517 0 6 0 0 0 440 0 0 0 0 0 0 0 0 2500 73131 25 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 357336 0 0 0 0 1 0 0 180 1 1
31001008 2 0 遗迹树妖 235 0 2307 2307 0 9 0 0 0 436 0 0 0 0 0 0 0 0 2500 109510 31 0 0 2 6 23024 0 0 0 0 0 0 0 0 100 2 1728891 0 0 0 0 1 0 0 180 1 1
-31001009 2 0 潮汐巨兽 280 0 6228 6228 0 14 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 0 0 0 0 0 0 0 0 1 100 2 35713762 0 0 0 0 1 0 0 186 1 1
+31001009 2 0 潮汐巨兽 280 0 6228 6228 0 14 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 23030 0 0 0 0 0 0 0 1 100 2 35713762 0 0 0 0 1 0 0 186 1 1
31001010 2 0 潮汐巨兽 280 0 6228 6228 0 14 0 0 0 1295 0 0 0 0 0 0 0 0 2500 154536 37 0 300 2 6 0 0 0 0 0 0 0 0 0 100 1 17856881 0 0 0 0 1 0 0 186 1 1
31001011 2 0 毁灭石像 265 0 10048 10048 0 11 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23020 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1
31001012 2 0 卫戍石像 265 0 10048 10048 0 11 0 0 0 5305 0 0 0 0 0 0 0 0 2500 142222 35 0 0 2 6 23019 0 0 0 0 0 0 0 0 100 0 4447786 0 0 0 0 1 0 0 180 1 1
@@ -764,7 +764,7 @@
61103002 2 0 境界·个人 140 2 3776 3776 1540 4 0 0 10000 1463 0 0 0 0 0 0 229079 0 2500 505817 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 939107 0 0 0 0 3 0 9 186 1 1
61103003 2 0 境界·个人 160 2 5068 5068 2157 5 0 0 10000 1975 0 0 0 0 0 0 377626 0 2500 634880 22 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1631537 0 0 0 0 3 0 10 186 1 1
61103004 2 0 境界·个人 205 2 10109 10109 1300 7 0 0 10000 3582 0 0 0 0 0 0 1034753 0 2500 916733 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7798849 0 0 0 0 3 0 11 186 1 1
-61103005 2 0 境界·个人 230 2 14452 14452 2128 9 0 0 10000 4529 0 0 0 0 0 0 1599712 0 2500 1105585 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 21824876 0 0 0 0 3 0 12 186 1 1
+61103005 2 0 境界·个人 230 2 14452 14452 2128 9 0 0 10000 4790 0 0 0 0 0 0 1599712 0 2500 1105585 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 21824876 0 0 0 0 3 0 12 186 1 1
61103006 2 0 境界·个人 260 2 22483 22483 3167 11 0 0 10000 7083 0 0 0 0 0 0 3076461 0 2500 1353274 34 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45790147 0 0 0 0 3 0 13 186 1 1
61103007 2 0 境界·个人 270 2 25322 25322 3529 12 0 0 10000 7899 0 0 0 0 0 0 3861992 0 2500 1435837 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 61922664 0 0 0 0 3 0 14 186 1 1
61103008 2 0 境界·个人 300 2 36300 36300 4878 14 0 0 10000 10398 0 0 0 0 0 0 5905484 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13434613 1 0 0 0 3 0 15 186 1 1
@@ -782,7 +782,7 @@
61103020 2 0 境界·个人 440 2 136985 136985 14572 22 0 0 10000 48922 0 0 0 0 0 0 27657569 0 2500 2224456 54 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 54896181 9 0 0 0 3 0 27 186 1 1
61203001 2 0 境界·组队 125 2 3151 3151 269 3 0 0 10000 1300 0 0 0 0 0 0 145814 0 2500 459316 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 605170 0 0 0 0 3 0 28 186 1 1
61203002 2 0 境界·组队 190 2 7395 7395 1039 6 0 0 10000 2617 0 0 0 0 0 0 746532 0 2500 809496 26 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 4487771 0 0 0 0 3 0 29 186 1 1
-61203003 2 0 境界·组队 220 2 11749 11749 1758 8 0 0 10000 3784 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 15547798 0 0 0 0 3 0 30 186 1 1
+61203003 2 0 境界·组队 220 2 11749 11749 1758 8 0 0 10000 4033 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 15547798 0 0 0 0 3 0 30 186 1 1
61203004 2 0 境界·组队 250 2 16155 16155 2351 10 0 0 10000 5126 0 0 0 0 0 0 2179851 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 28363570 0 0 0 0 3 0 31 186 1 1
61203005 2 0 境界·组队 290 2 34494 34494 4372 13 0 0 10000 10339 0 0 0 0 0 0 5251783 0 2500 1600963 38 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3212140 1 0 0 0 3 0 32 186 1 1
61203006 2 0 境界·组队 320 2 46696 46696 5939 16 0 0 10000 14845 0 0 0 0 0 0 7805561 0 2500 1848652 41 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 88063227 1 0 0 0 3 0 33 186 1 1
@@ -799,7 +799,7 @@
30601006 2 0 冰霜巨蝎 200 0 2461 2461 0 7 0 0 0 797 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 499190 0 0 0 0 1 0 0 1 1 1
30601007 2 0 冰川蛮兽 200 0 2544 2544 0 7 0 0 0 856 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 599028 0 0 0 0 1 0 0 1 1 1
30601008 2 0 雪山巨猿 200 0 7418 7418 0 8 0 0 0 4722 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2595792 0 0 0 0 1 0 0 1 1 1
-30603003 2 0 极寒冰心 200 0 12244 12244 0 8 0 0 0 8568 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 8598302 0 0 0 0 5 0 0 186 1 1
+30603003 2 0 极寒冰心 200 0 12244 12244 0 8 0 0 0 8568 0 0 0 0 0 0 0 0 2500 94281 28 0 300 2 6 10045 23030 10046 0 0 0 0 0 0 15 2 5990292 0 0 0 0 5 0 0 186 1 1
30601009 2 0 海岛巨蟹 250 0 5132 5132 0 8 0 0 0 1381 0 0 0 0 0 0 0 0 2500 134044 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 2487268 0 0 0 0 1 0 0 1 1 1
30601010 2 0 海妖 250 0 5631 5631 0 8 0 0 0 1681 0 0 0 0 0 0 0 0 2500 134044 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 4145448 0 0 0 0 1 0 0 1 1 1
30603004 2 0 潮汐巨兽 250 0 28962 28962 0 8 0 0 0 16811 0 0 0 0 0 0 0 0 2500 134044 34 0 300 2 6 10047 23030 10048 0 0 0 0 0 0 15 2 37309038 0 0 0 0 5 0 0 186 1 1
@@ -810,7 +810,7 @@
30601014 2 0 魂灵 260 0 4811 4811 0 8 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8032498 0 0 0 0 1 0 0 1 1 1
30601015 2 0 魔剑 265 0 4970 4970 0 8 0 0 0 1400 0 0 0 0 0 0 0 0 2000 376753 35 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8607219 0 0 0 0 1 0 0 1 1 1
30603006 2 0 玄界冰魔 320 0 10459 10459 7847 8 0 0 10000 3290 0 0 0 0 0 0 0 0 2000 455520 41 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 90414255 1 0 0 0 5 0 0 186 1 1
-50103001 2 0 灵狐仙 125 0 1184 1184 0 8 0 0 10000 1430 0 7 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
+50103001 2 0 道士鼠 125 0 1184 1184 0 8 0 0 10000 1430 0 7 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
50103002 2 0 觉灵鹿 145 0 2863 2863 0 8 0 0 10000 4148 0 7 0 0 0 0 0 3 3000 556113 20 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5087089 0 0 0 0 5 0 0 186 1 1
50103003 2 0 球球 160 0 3046 3046 0 8 0 0 10000 4235 0 7 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7079698 0 0 0 0 5 0 0 186 1 1
50103004 2 0 地狱冥虎 180 0 3599 3599 0 8 0 0 10000 4474 0 7 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9937882 0 0 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0