From e5c6941f08d08611ceafb823084515e6b5629908 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 17 九月 2018 14:46:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 6 +-
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 22 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc | 0
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 2
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 38 +++++++++---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc | 0
16 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 5a240e9..d573cb6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,7 +1,7 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset
1 test1 [3] 7 12 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
2 NationalDay [] 2018-9-1 2018-9-3 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [30, "LimitGift2"] 50 1
-3 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
+3 NationalDay [(1,10), (100, 110), 120] 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 {0:["LimitGift1",[]]} {-30:["LimitGift2",[]]} [240, "LimitGift2"] 50 1
4 1OpenServer01 [7001] 2018-9-7 2018-9-7 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
5 1OpenServer02 [7001] 2018-9-9 2018-9-9 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
6 1OpenServer03 [7001] 2018-9-11 2018-9-11 0 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 3fcef96..f4ba457 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 8cdcef1..67e5392 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index f1fa9dc..3c33fde 100644
--- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 447d404..e3ce546 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.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 a98cc0d..9976b83 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 631f69c..023db7e 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/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 8b21216..552e295 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/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 0f454e6..955ddec 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/PlayerBossReborn.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
index 3f36910..fb6fe80 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBossReborn.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
index 254c609..f0f00c4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc
index e118914..722916c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSpringSale.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 b1475dd..23724e2 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/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 37f67e2..739ff39 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,3 @@
-CfgID StartDate EndDate LimitLV TemplateID
-1 2018-7-16 2018-7-18 110 1
-2 2018-9-13 2018-9-15 110 2
+CfgID StartDate EndDate ResetType LimitLV TemplateID
+1 2018-7-16 2018-7-18 1 110 1
+2 2018-9-13 2018-9-15 1 110 2
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 962ad66..2c338f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,19 +1,19 @@
-CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList
-1 7 12 12:00|18:00 13:00|19:00 1440 50 1 [[1,2],[2,3]]
-2 2018-9-1 2018-9-3 1440 50 1 [[1,2,3]]
-3 2018-9-1 2018-9-3 1440 50 1 [[3]]
-4 2018-9-7 2018-9-7 0 50 1 [[2]]
-5 2018-9-9 2018-9-9 0 50 1 [[4]]
-6 2018-9-11 2018-9-11 0 50 1 [[1]]
-7 2018-9-12 2018-9-12 0 180 1 [[3]]
-8 2018-9-15 2018-9-15 0 280 1 [[5]]
-9 2018-9-8 2018-9-8 0 50 1 [[2]]
-10 2018-9-10 2018-9-10 0 50 1 [[4]]
-11 2018-9-12 2018-9-12 0 50 1 [[1]]
-12 2018-9-13 2018-9-13 0 180 1 [[3]]
-13 2018-9-16 2018-9-16 0 280 1 [[5]]
-14 2018-9-12 2018-9-12 0 50 1 [[2]]
-15 2018-9-14 2018-9-14 0 50 1 [[4]]
-16 2018-9-16 2018-9-16 0 50 1 [[1]]
-17 2018-9-17 2018-9-17 0 180 1 [[3]]
-18 2018-9-20 2018-9-20 0 280 1 [[5]]
+CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
+1 7 12 12:00|18:00 13:00|19:00 1440 50 1 [[1,2],[2,3]] SellMail4 [[13,2,1],[2,2,1]]
+2 2018-9-1 2018-9-3 1440 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
+3 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 1440 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+4 2018-9-7 2018-9-7 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+5 2018-9-9 2018-9-9 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+6 2018-9-11 2018-9-11 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+7 2018-9-12 2018-9-12 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+8 2018-9-15 2018-9-15 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+9 2018-9-8 2018-9-8 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+10 2018-9-10 2018-9-10 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+11 2018-9-12 2018-9-12 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+12 2018-9-13 2018-9-13 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+13 2018-9-16 2018-9-16 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+14 2018-9-12 2018-9-12 0 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
+15 2018-9-14 2018-9-14 0 50 1 [[4]] SellMail4 [[13,2,1],[2,2,1]]
+16 2018-9-16 2018-9-16 0 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
+17 2018-9-17 2018-9-17 0 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
+18 2018-9-20 2018-9-20 0 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 2733fbc..8004c3b 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
-CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList
-1 2018-7-24 2018-7-31 0 50 1 [[16],[17],[18],[20],[21],[22],[23],[24]]
-2 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 0 50 1 [[16,17],[16,17],[16,17]]
-3 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]]
-4 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]]
-5 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]]
-6 2018-8-5 2018-8-5 0 100 1 [[25]]
-7 2018-8-7 2018-8-7 0 100 1 [[26]]
-8 2018-8-9 2018-8-9 0 100 1 [[27]]
-9 2018-8-11 2018-8-11 0 100 1 [[28]]
-10 2018-8-13 2018-8-13 0 100 1 [[29]]
+CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
+1 2018-7-24 2018-7-31 0 50 1 [[16],[17],[18],[20],[21],[22],[23],[24]] SellMail3 [[13,2,1],[2,2,1]]
+2 2018-5-1 2018-5-3 12:00|18:00 13:00|19:00 0 50 1 [[16,17],[16,17],[16,17]] SellMail3 [[13,2,1],[2,2,1]]
+3 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+4 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+5 2018-9-1 2018-9-3 0 50 1 [[16],[17],[18]] SellMail3 [[13,2,1],[2,2,1]]
+6 2018-8-5 2018-8-5 0 100 1 [[25]] SellMail3 [[13,2,1],[2,2,1]]
+7 2018-8-7 2018-8-7 0 100 1 [[26]] SellMail3 [[13,2,1],[2,2,1]]
+8 2018-8-9 2018-8-9 0 100 1 [[27]] SellMail3 [[13,2,1],[2,2,1]]
+9 2018-8-11 2018-8-11 0 100 1 [[28]] SellMail3 [[13,2,1],[2,2,1]]
+10 2018-8-13 2018-8-13 0 100 1 [[29]] SellMail3 [[13,2,1],[2,2,1]]
--
Gitblit v1.8.0