From e648de9fc02e4d04c7de5594b6c85277885ec5fa Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 28 一月 2019 17:22:44 +0800
Subject: [PATCH] 5956 【后端】【1.5.200】限时抢购支持对应不同的世界等级
---
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt | 14 +++++++-------
CoreServerGroup/GameServer/Script/Player/PlayerStore.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/PlayerFlashSale.pyc | 0
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt | 14 +++++++-------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
10 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index a1bfdd3..60e70d0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,8 +1,8 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset ShopTypeList
-1 OpenServer [] [] 5 5 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[200,201,202,203,204]]
-2 New1 [] [] 2018-11-16 2018-11-16 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[205,206,207,208]]
-3 December12 [] [] 2018-12-12 2018-12-12 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[205,206,207,208]]
-4 December25 [] [] 2018-12-25 2018-12-25 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[205,206,207,208,209]]
-5 December26 [] [] 2019-1-16 2019-1-16 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[210,211,212,213,214]]
-6 OpenServer1 [] [] 10 10 10:00|16:00|20:00 11:59|17:59|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[215,216,217]]
-7 OpenServer2 [] [] 14 14 10:00|16:00|20:00 11:59|17:59|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[220,221,222]]
+1 OpenServer [] [] 5 5 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 1 {(0,1000):[[200,201,202,203,204]]}
+2 New1 [] [] 2018-11-16 2018-11-16 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[205,206,207,208]]}
+3 December12 [] [] 2018-12-12 2018-12-12 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[205,206,207,208]]}
+4 December25 [] [] 2018-12-25 2018-12-25 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[205,206,207,208,209]]}
+5 December26 [] [] 2019-1-16 2019-1-16 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 {(0,1000):[[210,211,212,213,214]]}
+6 OpenServer1 [] [] 10 10 10:00|16:00|20:00 11:59|17:59|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 {(0,1000):[[215,216,217]]}
+7 OpenServer2 [] [] 14 14 10:00|16:00|20:00 11:59|17:59|21:59 600 {0:["FlashRushToBuy3",[]]} [] [] 100 1 {(0,1000):[[220,221,222]]}
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index c717cd2..3019e80 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerStore.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerStore.pyc
index 5cfabe0..ce8d006 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerStore.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerStore.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 549ec7d..d4319a9 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 5d2c592..2457484 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/Event/EventSrc/FunctionNPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
index c36c405..79571ad 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.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 9572297..6a1cc3d 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/PlayerFlashSale.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc
index a9c132a..603e21f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.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 fb1f5d2..810dc1f 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/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 55657fd..36540bc 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,8 +1,8 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
-1 5 5 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 100 1 [[200,201,202,203,204]] SellMail5
-2 2018-11-16 2018-11-16 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 100 0 [[205,206,207,208]] SellMail5
-3 2018-12-12 2018-12-12 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 100 0 [[205,206,207,208]] SellMail5
-4 2018-12-25 2018-12-25 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 240 100 0 [[205,206,207,208,209]] SellMail5
-5 2019-1-16 2019-1-16 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 100 0 [[210,211,212,213,214]] SellMail5
-6 10 10 10:00|16:00|20:00 11:59|17:59|21:59 600 100 1 [[215,216,217]] SellMail5
-7 14 14 10:00|16:00|20:00 11:59|17:59|21:59 600 100 1 [[220,221,222]] SellMail5
+1 5 5 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 100 1 {(0,1000):[[200,201,202,203,204]]} SellMail5
+2 2018-11-16 2018-11-16 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 100 0 {(0,1000):[[205,206,207,208]]} SellMail5
+3 2018-12-12 2018-12-12 12:00|16:00|20:00|22:00 13:30|17:30|21:30|23:30 240 100 0 {(0,1000):[[205,206,207,208]]} SellMail5
+4 2018-12-25 2018-12-25 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 240 100 0 {(0,1000):[[205,206,207,208,209]]} SellMail5
+5 2019-1-16 2019-1-16 00:00|12:00|16:00|20:00|22:00 1:59|13:59|17:59|21:59|23:59 240 100 0 {(0,1000):[[210,211,212,213,214]]} SellMail5
+6 10 10 10:00|16:00|20:00 11:59|17:59|21:59 600 100 1 {(0,1000):[[215,216,217]]} SellMail5
+7 14 14 10:00|16:00|20:00 11:59|17:59|21:59 600 100 1 {(0,1000):[[220,221,222]]} SellMail5
--
Gitblit v1.8.0