From befb9e40238b97fe83c2ff2c742369139be249fe Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 13 二月 2019 15:35:04 +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 
 db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt                                                         |   64 ++++++++--------
 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 
 db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt                                                   |   66 ++++++++++++++++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_BZZD.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.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                                               |   44 ++++++----
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                              |    2 
 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 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.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 
 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 
 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 
 db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt                                                        |    7 +
 CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustomMix.txt                                              |   12 +++
 CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt                                                  |    7 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc                          |    0 
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                                                           |    0 
 58 files changed, 157 insertions(+), 50 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt b/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
new file mode 100644
index 0000000..94ba213
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
@@ -0,0 +1,7 @@
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
+1	kaifu1	[]	[]	2	3	0	{0:["XYCOpen", []]}	{}	[]	110
+2	kaifu2	[]	[]	6	7	0	{0:["XYCOpen", []]}	{}	[]	110
+3	ceshi1	[]	[]	2018-11-16	2018-11-18	0	{0:["XYCOpen", []]}	{}	[]	110
+4	yunying1	[]	[]	2018-11-23	2018-11-24	0	{0:["XYCOpen", []]}	{}	[]	110
+5	yunying2	[]	[]	2018-11-26	2018-11-26	0	{0:["XYCOpen", []]}	{}	[]	110
+6	xiaoxuexy18	[]	[]	2018-12-3	2018-12-3	0	{0:["XYCOpen", []]}	{}	[]	110
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/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 d1c70f9..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 2689b26..519b771 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -343,7 +343,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 19
+RegisterPackCount = 20
 
 PacketCMD_1 = 0xA5
 PacketSubCMD_1 = 0x04
@@ -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
@@ -420,6 +420,10 @@
 PacketCMD_19=0xA1
 PacketSubCMD_19=0x08
 PacketCallFunc_19=OnRefreshMainServerRole
+
+PacketCMD_20=0xA2
+PacketSubCMD_20=0x31
+PacketCallFunc_20=OnClientStartCustomScene
 
 ;购买相关的
 [BuySomething]
@@ -570,7 +574,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
 
 PacketCMD_1=0xC1
 PacketSubCMD_1=0x01
@@ -583,6 +587,10 @@
 PacketCMD_3=0xC1
 PacketSubCMD_3=0x03
 PacketCallFunc_3=OnCrossRealmPKGetAward
+
+PacketCMD_4=0xC1
+PacketSubCMD_4=0x08
+PacketCallFunc_4=OnCrossRealmPKRobotOver
 
 ;跨服玩家
 [CrossRealmPlayer]
@@ -784,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]
@@ -1446,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 cbd6af9..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 a523056..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 eb7cd39..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 853e788..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/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index e8bd3c8..ee0f47b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
index c7b4869..98a8fa0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCostRebate.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index e3c45bd..3faadc2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.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/tagActLuckyTreasure.txt b/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
new file mode 100644
index 0000000..d214844
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
@@ -0,0 +1,7 @@
+CfgID	StartDate	EndDate	ResetType	LimitLV	TemplateID	LuckyPoint
+1	2	3	0	110	1	600
+2	6	7	0	110	1	600
+3	2018-11-16	2018-11-18	0	110	1	600
+4	2018-11-23	2018-11-24	0	110	1	600
+5	2018-11-26	2018-11-26	0	110	1	600
+6	2018-12-3	2018-12-3	0	110	1	600
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
index 9973b1e..ef92120 100644
--- a/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCrossRealmPKDan.txt
@@ -1,32 +1,32 @@
-DanLV
-0
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
+DanLV	LVUpScore
+0	200
+1	400
+2	600
+3	800
+4	1000
+5	1500
+6	2000
+7	2500
+8	3000
+9	3500
+10	4500
+11	5500
+12	6500
+13	7500
+14	8500
+15	10000
+16	11500
+17	13000
+18	14500
+19	16000
+20	18000
+21	20000
+22	22000
+23	24000
+24	26000
+25	28400
+26	30800
+27	33200
+28	35600
+29	38000
+30	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 95905c6..b48e1ac 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -337,7 +337,9 @@
 CrossUseItem	901|902|903|904				
 CrossRealmCfg	4				
 CrossSyncPlayerData	5				
+CrossRealmPKCfg	[100, 5]	180	50		
 CrossRealmPKAward	{"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}	{"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}	{"10":[[2174,1,1], [59,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "50":[[2173,1,1], [60,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]], "100":[[2172,1,1], [61,1,1], [4193,1,1],[30,1000,1],[2141,5000,1]]}		
+CrossRealmPKScore	0	[100, 80]	min(cWinCount*20,100)		
 CrossRealmPKMatchCount	10	10	10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*10+min(max(todayBuyCount-5,0),1)*10+min(max(todayBuyCount-7,0),1)*10		
 CrossRealmPKFB	[30, 3, 60,30,10]	[[14,18,19,11,42], [30,33,36,28,50]]	2		
 GatherSoulHole	0_300|1_300|2_305|3_315|4_320|5_325|6_310	0_62|1_62|2_62|3_62|4_62|5_62|6_63			
diff --git a/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt b/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
new file mode 100644
index 0000000..68caae6
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
@@ -0,0 +1,66 @@
+ID	WorldLVLimit	ItemID	ItemCnt	IsBind	ItemListEx
+1	[0,500]	11	1	1	2997
+1	[0,501]	16	1	1	864
+1	[0,502]	13	1	1	691
+1	[0,503]	14	1	1	35
+1	[0,504]	19	1	1	28
+1	[0,505]	2	1	1	2997
+1	[0,506]	3	1	1	2398
+1	[0,507]	802	1	1	1918
+1	[0,508]	4	1	1	1499
+1	[0,509]	8	1	1	432
+1	[0,510]	4304	2	1	2997
+1	[0,511]	4304	4	1	2398
+1	[0,512]	4304	6	1	1918
+1	[0,513]	4304	8	1	1499
+1	[0,514]	4304	20	1	432
+1	[0,515]	3501	1	1	2997
+1	[0,516]	3502	1	1	2398
+1	[0,517]	3503	1	1	691
+1	[0,518]	3504	1	1	70
+1	[0,519]	3505	1	1	56
+1	[0,520]	3511	1	1	2997
+1	[0,521]	3512	1	1	2398
+1	[0,522]	3513	1	1	691
+1	[0,523]	3514	1	1	70
+1	[0,524]	3515	1	1	56
+1	[0,525]	4151	2	1	2997
+1	[0,526]	4151	4	1	2398
+1	[0,527]	4151	6	1	1918
+1	[0,528]	4151	15	1	540
+1	[0,529]	4151	40	1	432
+1	[0,530]	181	2	1	2997
+1	[0,531]	181	4	1	2398
+1	[0,532]	181	6	1	1918
+1	[0,533]	181	15	1	540
+1	[0,534]	181	40	1	432
+1	[0,535]	4181	1	1	2997
+1	[0,536]	197	1	1	2398
+1	[0,537]	4182	1	1	1918
+1	[0,538]	198	1	1	540
+1	[0,539]	199	1	1	56
+1	[0,540]	2211	10	1	2997
+1	[0,541]	2211	15	1	2398
+1	[0,542]	2211	20	1	1918
+1	[0,543]	2319	1	1	540
+1	[0,544]	2326	1	1	56
+1	[0,545]	149	1	1	2997
+1	[0,546]	151	1	1	2398
+1	[0,547]	154	1	1	1918
+1	[0,548]	147	1	1	1499
+1	[0,549]	155	1	1	432
+1	[0,550]	141	10	1	2997
+1	[0,551]	141	20	1	2398
+1	[0,552]	142	20	1	1918
+1	[0,553]	142	60	1	540
+1	[0,554]	143	60	1	432
+1	[0,555]	5303	10	1	2997
+1	[0,556]	5303	20	1	2398
+1	[0,557]	5303	40	1	691
+1	[0,558]	5303	80	1	540
+1	[0,559]	5303	120	1	56
+1	[0,560]	911	1	1	2997
+1	[0,561]	911	2	1	2398
+1	[0,562]	911	3	1	1918
+1	[0,563]	912	1	1	540
+1	[0,564]	1001	1	1	14

--
Gitblit v1.8.0