From 23935c173eef750e877afcc56d07f4f8cc0dd3e4 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期三, 13 二月 2019 17:17:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 32 ++++++++--------
CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt | 4 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc | 0
CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 18 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.pyc | 0
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 22 +++++-----
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
/dev/null | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLuckyTreasure.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt | 12 ++++++
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
52 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt
new file mode 100644
index 0000000..a7b92f8
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyActionCustomMix.txt
@@ -0,0 +1,4 @@
+ID MixServerDay DailyQuestID TimeList Duration NotifyInfo
+1 1 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+2 3 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
+3 5 17 [[20,30]] 30 {-10:["FairyGrabBossTime", []],-5:["FairyGrabBossTime", []],0:["FairyGrabBossStart", []]}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt
new file mode 100644
index 0000000..1223516
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt
@@ -0,0 +1,12 @@
+ID MixServerDay DataMapID StartHour StartMinute EndHour EndMinute CanEnter StateValue NotifyInfo
+1 1 31170 21 0 21 15 1 1 {}
+2 1 31170 21 15 21 30 0 1 {}
+3 2 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+4 3 31160 20 30 20 50 1 1 {}
+5 4 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+6 4 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+7 4 31220 21 19 21 20 0 13 {}
+8 4 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+9 4 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+10 4 31220 21 49 23 59 0 23 {}
+11 5 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 50f07fb..e703702 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -81,3 +81,4 @@
CrossRealmPKMatch 5 10 60 [32010,32011,32012,32013,32014] [(10, 7), (40,37)]
CrossRealmPKCfg [100, 5] 180 50
CrossRealmPKScore 0 [100, 80] min(cWinCount*20,100)
+MixServer 5
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 242a010..7844fd7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -392,19 +392,19 @@
1150 214 0 20
1151 214 0 20
1152 215 0 1
-1153 215 0 50
-1154 215 0 100
-1155 215 0 150
+1153 215 0 10
+1154 215 0 10
+1155 215 0 20
1156 215 0 10
1158 216 0 1
-1159 216 0 50
-1160 216 0 100
-1161 216 0 150
+1159 216 0 10
+1160 216 0 10
+1161 216 0 6
1162 216 0 10
1164 217 0 1
-1165 217 0 50
-1166 217 0 100
-1167 217 0 150
+1165 217 0 10
+1166 217 0 10
+1167 217 0 8
1168 217 0 10
1169 220 0 1
1170 220 0 50
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index e9a8193..9c5e73c 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 2c579fc..ef873dd 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 829a005..4a10ec8 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc
index fa210ec..d79245f 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc
index 9d557d1..8bc937d 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index 95842c8..7fd349f 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/GameWorldMixServerCampaign.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc
deleted file mode 100644
index e17db36..0000000
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc
+++ /dev/null
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 5efe05d..dfed7ac 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 ef15e62..0b35479 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc
index a46c42b..164a0a0 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerBillboard.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
index 0c91848..56e9b40 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index c784da3..0415261 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/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index 84cb5d7..2ac3c38 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 4dc0e1a..65c98db 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 1415d89..519b771 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -365,9 +365,9 @@
PacketSubCMD_5=0x26
PacketCallFunc_5=QueryFamilyArrestAwardReceiveState
-PacketCMD_6 = 0xAF
-PacketSubCMD_6 = 0x02
-PacketCallFunc_6 = GiveMixServerCampaignAward
+PacketCMD_6=
+PacketSubCMD_6=
+PacketCallFunc_6=
PacketCMD_7=0xA2
PacketSubCMD_7=0x13
@@ -792,18 +792,6 @@
PacketCMD_1=0xA5
PacketSubCMD_1=0x42
PacketCallFunc_1=OnGetSuccessAward
-
-;合服登陆豪礼
-[PlayerMixTheDayLoginAward]
-ScriptName = Player\PlayerMixLoginDayAward.py
-Writer = ljd
-Releaser = ljd
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1 = 0xAF
-PacketSubCMD_1 = 0x01
-PacketCallFunc_1 = GetMixLoginDayAward
;节日登陆奖励
[PlayerFestivalLogin]
@@ -1454,4 +1442,16 @@
PacketCMD_3=0xA5
PacketSubCMD_3=0x1C
-PacketCallFunc_3=OnGatherSoulCompound
\ No newline at end of file
+PacketCallFunc_3=OnGatherSoulCompound
+
+;幸运鉴宝
+[PlayerLuckyTreasure]
+ScriptName = Player\PlayerLuckyTreasure.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xAA
+PacketSubCMD_1=0x08
+PacketCallFunc_1=OnStartLuckyTreasure
\ 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 ed0405a..2b0d042 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 0534211..13d605b 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 3721ce7..efd8153 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/DataRecordPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc
index fef5f03..575987d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc
index 280592b..5b8534b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipPlus.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc
index 177e619..ec1e0e3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc
index 9a18643..6e0747c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index 09e55d8..948e8ce 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc
index 9c23e0b..13c8911 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.pyc
index 27b6d54..e1af3be 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.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 8303933..c8a22c8 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/FBProcess/GameLogic_GodArea.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.pyc
index c068e1a..de410fc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GodArea.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
index e350e5c..5c3ddd5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.pyc
index be237b2..4c8b955 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_KirinHome.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
index 80c766b..19ee0bf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index 1b29d26..7e94356 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.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 d70a848..209a34e 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/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc
index 2a1e527..0dac17b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_TrialTower.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc
index a35a070..712417d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
index 1badcb0..6e18e24 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.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 423c557..92bea5f 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/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 9d35035..716ac10 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 476834b..be68fe7 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/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 42d6b3f..d04edf5 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/MixServerCampaign.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/MixServerCampaign.pyc
deleted file mode 100644
index df0b586..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/MixServerCampaign.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.pyc
index 88c61e6..ff78f55 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActLogin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc
index 99dd321..596faec 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc
index 4b74c00..7b860d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.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 5d1ffa1..39a7870 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/PlayerGoldGift.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc
index 8470c26..b2e11f3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldGift.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLuckyTreasure.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLuckyTreasure.pyc
new file mode 100644
index 0000000..1e95221
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerLuckyTreasure.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc
deleted file mode 100644
index 2e90ee1..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMixLoginDayAward.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
index f9829fd..9f4ce00 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRefineStove.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc
deleted file mode 100644
index 6350f26..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MixServerCampaignAward.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index b5caddd..ba6767e 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/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index b205401..d59bebf 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -391,20 +391,20 @@
1149 214 2 112 10 1 [] 112 0 0 0 1 20 1 150 600 0 FlashRushToBuy2 FlashToSnapUp
1150 214 2 912 2 1 [] 912 0 0 0 1 20 1 60 300 0 FlashRushToBuy2 FlashToSnapUp
1151 214 2 2213 50 1 [] 2213 0 0 0 1 20 1 120 625 0 FlashRushToBuy2 FlashToSnapUp
-1152 215 2 2456 1 1 [] 5408 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp
-1153 215 2 2457 1 1 [] 4607 0 0 0 10 50 1 600 2430 0 FlashRushToBuy2 FlashToSnapUp
-1154 215 2 2458 1 1 [] 4606 0 0 0 10 100 1 55 270 0 FlashRushToBuy2 FlashToSnapUp
-1155 215 2 2459 1 1 [] 4608 0 0 0 10 150 1 15 90 0 FlashRushToBuy2 FlashToSnapUp
-1156 215 2 2213 20 1 [] 4610 0 0 0 2 10 1 68 250 0 FlashRushToBuy2 FlashToSnapUp
+1152 215 2 2456 1 1 [] 2456 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp
+1153 215 2 5413 30 1 [] 5413 0 0 0 1 10 1 688 900 0 FlashRushToBuy2 FlashToSnapUp
+1154 215 2 5414 500 1 [] 5414 0 0 0 2 10 1 688 1000 0 FlashRushToBuy2 FlashToSnapUp
+1155 215 2 181 40 1 [] 181 0 0 0 4 20 1 58 400 0 FlashRushToBuy2 FlashToSnapUp
+1156 215 2 2213 20 1 [] 2213 0 0 0 2 10 1 68 250 0 FlashRushToBuy2 FlashToSnapUp
1158 216 2 2456 1 1 [] 2456 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp
-1159 216 2 2457 1 1 [] 2457 0 0 0 10 50 1 600 2430 0 FlashRushToBuy2 FlashToSnapUp
-1160 216 2 2458 1 1 [] 2458 0 0 0 10 100 1 55 270 0 FlashRushToBuy2 FlashToSnapUp
-1161 216 2 2459 1 1 [] 2459 0 0 0 10 150 1 15 90 0 FlashRushToBuy2 FlashToSnapUp
+1159 216 2 5413 30 1 [] 5413 0 0 0 1 10 1 688 900 0 FlashRushToBuy2 FlashToSnapUp
+1160 216 2 5414 500 1 [] 5414 0 0 0 2 10 1 688 1000 0 FlashRushToBuy2 FlashToSnapUp
+1161 216 2 5410 3 1 [] 5410 0 0 0 2 6 1 50 150 0 FlashRushToBuy2 FlashToSnapUp
1162 216 2 2213 20 1 [] 2213 0 0 0 2 10 1 68 250 0 FlashRushToBuy2 FlashToSnapUp
1164 217 2 2456 1 1 [] 2456 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp
-1165 217 2 2457 1 1 [] 2457 0 0 0 10 50 1 600 2430 0 FlashRushToBuy2 FlashToSnapUp
-1166 217 2 2458 1 1 [] 2458 0 0 0 10 100 1 55 270 0 FlashRushToBuy2 FlashToSnapUp
-1167 217 2 2459 1 1 [] 2459 0 0 0 10 150 1 15 90 0 FlashRushToBuy2 FlashToSnapUp
+1165 217 2 5413 30 1 [] 5413 0 0 0 1 10 1 688 900 0 FlashRushToBuy2 FlashToSnapUp
+1166 217 2 5414 500 1 [] 5414 0 0 0 2 10 1 688 1000 0 FlashRushToBuy2 FlashToSnapUp
+1167 217 2 4010 4 1 [] 4010 0 0 0 2 8 1 80 320 0 FlashRushToBuy2 FlashToSnapUp
1168 217 2 2213 20 1 [] 2213 0 0 0 2 10 1 68 250 0 FlashRushToBuy2 FlashToSnapUp
1169 220 2 2456 1 1 [] 5408 0 0 0 1 1 1 60 600 0 FlashRushToBuy2 FlashToSnapUp
1170 220 2 103 5 1 [] 4607 0 0 0 10 50 1 90 300 0 FlashRushToBuy2 FlashToSnapUp
--
Gitblit v1.8.0