From de2bee545374d2f01fa56a9d5b92dad72626a3ba Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 26 十二月 2018 18:26:37 +0800
Subject: [PATCH] Merge branch '1.3.20_qudao' of http://192.168.0.87:10010/r/snxx_server into 1.3.20_qudao
---
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 2 --
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 6 +++---
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2 --
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 8 ++++----
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 4 +++-
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 3 ++-
10 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 8dcf743..3fce213 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,7 +1,7 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV AddExpRate
1 OpenServer1 [] [] 2 2 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
2 OpenServer2 [] [] 4 4 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
-3 OpenServer3 [] [] 7 7 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
+3 OpenServer3 [] [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
4 DoubleExp10 [] [] 2018-11-10 2018-11-10 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
5 DoubleExp11 [] [] 2018-11-11 2018-11-11 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
6 NovemberExp17 [] [] 2018-11-17 2018-11-17 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index 45f3f68..00a9e37 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,3 +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
+2 test2 [] [] 4 4 0 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+3 test3 [] [] 7 7 0 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index cfa9fd7..733e0f4 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,3 +1,3 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset ShopTypeList
-1 OpenServer1 [] [] 3 2 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 900 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[200,201,202,203,204]]
+1 OpenServer1 [] [] 3 3 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 900 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[200,201,202,203,204]]
2 OpenServer2 [] [] 5 5 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 900 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[205,206,207,208,209]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 3fd730e..605dd2a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,5 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV LimitPoint
-1 opensever [] [] 6 7 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
+1 opensever [] [] 3 4 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
+1 opensever [] [] 5 6 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
+1 opensever [] [] 7 8 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
2 Jan01 [] [] 2019-1-3 2019-1-4 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 0b62cb9..2391f0d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -1,8 +1,6 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate IsDayReset ResetType NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV
1 kaifu1 [] [] 2 3 1 0 {0:["XYCOpen", []]} {} [] 110
-2 kaifu2 [] [] 3 4 1 0 {0:["XYCOpen", []]} {} [] 110
3 kaifu3 [] [] 5 6 1 0 {0:["XYCOpen", []]} {} [] 110
-4 kaifu4 [] [] 6 7 1 0 {0:["XYCOpen", []]} {} [] 110
5 ceshi1 [] [] 2018-11-16 2018-11-18 1 0 {0:["XYCOpen", []]} {} [] 110
6 yunying1 [] [] 2018-11-23 2018-11-24 1 0 {0:["XYCOpen", []]} {} [] 110
7 yunying2 [] [] 2018-11-26 2018-11-26 1 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 046c752..53573d3 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,3 +1,3 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
-1 3 2 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 900 100 1 [[200,201,202,203,204]] SellMail5
+1 3 3 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 900 100 1 [[200,201,202,203,204]] SellMail5
2 5 5 00:00|12:00|16:00|20:00|22:00 1:30|13:30|17:30|21:30|23:30 900 100 1 [[205,206,207,208,209]] SellMail5
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
index ae53aea..909b74c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -1,3 +1,5 @@
CfgID Multiple LimitLV LimitPoint
1 2 110 3000
+1 2 110 3000
+1 2 110 3000
2 2 110 3000
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 94631ce..110fafa 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -1,8 +1,6 @@
CfgID StartDate EndDate IsDayReset ResetType LimitLV TemplateID
1 2 3 1 0 110 1
-2 3 4 1 0 110 1
3 5 6 1 0 110 1
-4 6 7 1 0 110 1
5 2018-11-16 2018-11-18 1 0 110 1
6 2018-11-23 2018-11-24 1 0 110 1
7 2018-11-26 2018-11-26 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 05d2225..ddfc91f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -13,10 +13,10 @@
2 12 25 1 [(8353,2,1),(2213,3,1),(143,30,1)] 8353 LimitGift3
4 13 50 1 [(30,310,1),(2389,1,1)] 2389 LimitGift3
4 14 50 1 [(2213,10,1),(2389,1,1)] 2389 LimitGift3
-5 15 136 1 [(263,2,1),(30,1100,1)] 262 LimitGift3
-8 16 336 1 [(4223,2,1),(30,2500,1)] 4215 LimitGift3
-8 17 336 1 [(4214,2,1),(30,2500,1)] 7002 LimitGift3
-8 18 336 1 [(4222,2,1),(30,2500,1)] 263 LimitGift3
+5 15 136 1 [(263,1,1),(30,1100,1)] 262 LimitGift3
+8 16 336 1 [(4223,1,1),(30,2500,1)] 4215 LimitGift3
+8 17 336 1 [(4214,1,1),(30,2500,1)] 7002 LimitGift3
+8 18 336 1 [(4222,1,1),(30,2500,1)] 263 LimitGift3
5 19 180 1 [(4220,1,1),(4151,20,1)] 4220 LimitGift3
4 20 80 1 [(913,1,1),(181,30,1)] 913 LimitGift3
8 21 400 1 [(4214,1,1),(4151,20,1)] 4214 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index d60a83e..a53a6ef 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -3,11 +3,11 @@
1 30 1 {"1":[[1128,1,1],[4151,10,1],[101,20,1]],"2":[[1128,1,1],[4151,10,1],[101,20,1]],"3":[[1128,1,1],[4151,10,1],[101,20,1]]} AccumulatedTopUp2
1 100 2 {"1":[[881,5,1],[4681,1,1],[4010,4,1]],"2":[[881,5,1],[4681,1,1],[4010,4,1]],"3":[[881,5,1],[4681,1,1],[4010,4,1]]} AccumulatedTopUp2
1 300 3 {"1":[[2346,2,1],[983,5,1],[7,1,1]],"2":[[2346,2,1],[983,5,1],[7,1,1]],"3":[[2346,2,1],[983,5,1],[7,1,1]]} AccumulatedTopUp2
-1 600 4 {"1":[[264,30,1],[983,5,1],[4680,1,1]],"2":[[264,30,1],[983,5,1],[4680,1,1]],"3":[[264,30,1],[983,5,1],[4680,1,1]]} AccumulatedTopUp2
-1 1000 5 {"1":[[103,2,1],[983,10,1],[200,1,1]],"2":[[103,2,1],[983,10,1],[200,1,1]],"3":[[103,2,1],[983,10,1],[200,1,1]]} AccumulatedTopUp2
+1 600 4 {"1":[[264,1,1],[983,5,1],[4680,1,1]],"2":[[264,1,1],[983,5,1],[4680,1,1]],"3":[[264,1,1],[983,5,1],[4680,1,1]]} AccumulatedTopUp2
+1 1000 5 {"1":[[103,5,1],[982,10,1],[200,1,1]],"2":[[103,5,1],[982,10,1],[200,1,1]],"3":[[103,5,1],[982,10,1],[200,1,1]]} AccumulatedTopUp2
2 6 0 {"1":[[5303,50,1],[181,10,1],[802,1,1]],"2":[[5303,50,1],[181,10,1],[802,1,1]],"3":[[5303,50,1],[181,10,1],[802,1,1]]} AccumulatedTopUp2
2 30 1 {"1":[[102,8,1],[4151,10,1],[1503,5,1]],"2":[[102,8,1],[4151,10,1],[1503,5,1]],"3":[[102,8,1],[4151,10,1],[1503,5,1]]} AccumulatedTopUp2
-2 100 2 {"1":[[4505,500,1],[102,18,1],[4010,4,1]],"2":[[4505,500,1],[102,18,1],[4010,4,1]],"3":[[4505,500,1],[102,18,1],[4010,4,1]]} AccumulatedTopUp2
+2 100 2 {"1":[[881,5,1],[102,18,1],[4010,4,1]],"2":[[881,5,1],[102,18,1],[4010,4,1]],"3":[[881,5,1],[102,18,1],[4010,4,1]]} AccumulatedTopUp2
2 300 3 {"1":[[2346,2,1],[983,5,1],[7,1,1]],"2":[[2346,2,1],[983,5,1],[7,1,1]],"3":[[2346,2,1],[983,5,1],[7,1,1]]} AccumulatedTopUp2
2 600 4 {"1":[[4220,1,1],[5303,1000,1],[5412,150,1]],"2":[[4220,1,1],[5303,1000,1],[5412,150,1]],"3":[[4220,1,1],[5303,1000,1],[5412,150,1]]} AccumulatedTopUp2
2 1000 5 {"1":[[106,5,1],[982,10,1],[4187,1,1]],"2":[[106,5,1],[982,10,1],[4187,1,1]],"3":[[106,5,1],[982,10,1],[4187,1,1]]} AccumulatedTopUp2
--
Gitblit v1.8.0