From ad65b2bf5cbcf1446798ef05e73ba587ebc2ddca Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 16 一月 2019 19:48:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 4 ++--
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index b2f1eff..cb2fa70 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,4 +1,4 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
1 test1 [] [] 2019-1-1 2019-1-1 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
2 test2 [] [] 7 7 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
-3 20190122 [] [] 2019-1-12 2019-1-12 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+3 20190122 [] [] 2019-1-22 2019-1-22 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index d1dc0ee..72e8fd2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,4 +1,4 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV LimitPoint
1 opensever [] [] 6 7 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
2 Jan01 [] [] 2019-1-3 2019-1-4 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
-3 20190120 [] [] 2019-1-20 2019-1-20 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
+3 20190120 [] [] 2019-1-20 2019-1-21 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index e8e65b0..1b6b317 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -18,4 +18,4 @@
17 sdq0108 [] [] 2019-1-8 2019-1-8 1 0 {0:["XYCOpen", []]} {} [] 110
18 20190110 [] [] 2019-1-10 2019-1-10 1 0 {0:["XYCOpen", []]} {} [] 110
19 20190114 [] [] 2019-1-14 2019-1-14 1 0 {0:["XYCOpen", []]} {} [] 110
-20 20190117 [] [] 2019-1-17 2019-1-19 1 0 {0:["XYCOpen", []]} {} [] 110
+20 20190117 [] [] 2019-1-17 2019-1-18 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index cd7340c..2b38404 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -18,4 +18,4 @@
17 2019-1-8 2019-1-8 1 0 110 1
18 2019-1-10 2019-1-10 1 0 110 1
19 2019-1-14 2019-1-14 1 0 110 1
-20 2019-1-17 2019-1-19 1 0 110 1
+20 2019-1-17 2019-1-18 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 1c508c2..3a399ff 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -60,5 +60,5 @@
4 59 131 1 [(4606,1,1),(2213,25,1)] 4606 LimitGift3
4 60 125 1 [(4680,1,1),(4681,2,1)] 4680 LimitGift3
4 61 130 1 [(913,1,1),(4694,8,1)] 913 LimitGift3
-8 62 440 1 [(4223,1,1),(4151,25,1)] 262 LimitGift3
-4 63 108 1 [(110,60,1),(112,12,1)] 913 LimitGift3
+8 62 440 1 [(4223,1,1),(4151,25,1)] 4223 LimitGift3
+4 63 108 1 [(110,60,1),(112,12,1)] 112 LimitGift3
--
Gitblit v1.8.0