From 94e79bbe67b40fb573903a7fb81440b184b9aeed Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 29 九月 2018 03:12:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 8 ++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 7 +++++++
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 ++
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 5 +++++
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 8 ++++++++
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 8 ++++++++
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 16 ++++++++++++----
8 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 9462109..6ba4a94 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -20,3 +20,11 @@
19 3OpenServer03 [7003] 2018-9-16 2018-9-16 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 50 1
20 3OpenServer04 [7003] 2018-9-17 2018-9-17 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 180 1
21 3OpenServer05 [7003] 2018-9-20 2018-9-20 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [] 280 1
+22 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+23 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+24 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+25 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+26 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+27 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+28 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+29 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index c947958..b524a42 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -9,3 +9,11 @@
8 New3 [] 2018-8-9 2018-8-9 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
9 New4 [] 2018-8-11 2018-8-11 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
10 New5 [] 2018-8-13 2018-8-13 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 100 1
+11 NationalDay01 [(7001,7003), (8002, 8004)] 2018-10-1 2018-10-1 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+12 NationalDay02 [(7001,7003), (8002, 8004)] 2018-10-2 2018-10-2 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+13 NationalDay03 [(7001,7003), (8002, 8004)] 2018-10-3 2018-10-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+14 NationalDay04 [(7001,7003), (8002, 8004)] 2018-10-4 2018-10-4 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+15 NationalDay05 [(7001,7003), (8002, 8004)] 2018-10-5 2018-10-5 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+16 NationalDay06 [(7001,7003), (8002, 8004)] 2018-10-6 2018-10-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+17 NationalDay07 [(7001,7003), (8002, 8004)] 2018-10-7 2018-10-7 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
+18 NationalDay08 [(7001,7003), (8002, 8004)] 2018-10-8 2018-10-8 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift1"] 110 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index adb3cf4..c0afa32 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/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 3ac62f2..74ce77d 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,8 +1,8 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset GiftbagList MailKey MailItemPrize
-1 3 4 120 50 0 [[6]] SellMail4 [[181,2,1],[4151,2,1]]
-2 5 6 0 50 0 [[7]] SellMail4 [[181,2,1],[4151,2,1]]
-3 7 8 0 50 0 [[8]] SellMail4 [[181,2,1],[4151,2,1]]
-4 9 10 0 50 0 [[9]] SellMail4 [[181,2,1],[4151,2,1]]
+1 3 4 120 50 0 [[6]] SellMail4
+2 5 6 0 50 0 [[7]] SellMail4
+3 7 8 0 50 0 [[8]] SellMail4
+4 9 10 0 50 0 [[9]] SellMail4
5 2018-9-1 2018-9-3 120 50 1 [[1,2,3]] SellMail4 [[13,2,1],[2,2,1]]
6 2018-9-1 2018-9-3 12:00|18:00 13:00|19:00 120 50 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
7 2018-9-7 2018-9-7 120 50 1 [[2]] SellMail4 [[13,2,1],[2,2,1]]
@@ -20,3 +20,11 @@
19 2018-9-16 2018-9-16 120 50 1 [[1]] SellMail4 [[13,2,1],[2,2,1]]
20 2018-9-17 2018-9-17 120 180 1 [[3]] SellMail4 [[13,2,1],[2,2,1]]
21 2018-9-20 2018-9-20 120 280 1 [[5]] SellMail4 [[13,2,1],[2,2,1]]
+22 2018-10-1 2018-10-1 120 110 0 [[8]] SellMail4
+23 2018-10-2 2018-10-2 110 0 [[10]] SellMail4
+24 2018-10-3 2018-10-3 110 0 [[13]] SellMail4
+25 2018-10-4 2018-10-4 110 0 [[10]] SellMail4
+26 2018-10-5 2018-10-5 110 0 [[9]] SellMail4
+27 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
+28 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
+29 2018-10-8 2018-10-8 110 0 [[12]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 42fe534..e711d99 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -9,3 +9,11 @@
8 2018-8-9 2018-8-9 120 100 1 [[27]] SellMail3 [[13,2,1],[2,2,1]]
9 2018-8-11 2018-8-11 120 100 1 [[28]] SellMail3 [[13,2,1],[2,2,1]]
10 2018-8-13 2018-8-13 120 100 1 [[29]] SellMail3 [[13,2,1],[2,2,1]]
+11 2018-10-1 2018-10-1 120 110 0 [[31]] SellMail3
+12 2018-10-2 2018-10-2 110 0 [[32]] SellMail3
+13 2018-10-3 2018-10-3 110 0 [[33]] SellMail3
+14 2018-10-4 2018-10-4 110 0 [[34]] SellMail3
+15 2018-10-5 2018-10-5 110 0 [[35]] SellMail3
+16 2018-10-6 2018-10-6 110 0 [[36]] SellMail3
+17 2018-10-7 2018-10-7 110 0 [[31]] SellMail3
+18 2018-10-8 2018-10-8 110 0 [[37]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 476d397..6d529aa 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -175,3 +175,5 @@
2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1
2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]] [[7750,0],[10000,1]] {2:[[2000,[8208,1]],[4000,[8221,1]],[6000,[8234,1]],[8000,[8247,1]],[10000,[8260,1]]], 10:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]} [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1
+2391 [[5,[5409,1]],[30,[3803,1]],[35,[8067,1]],[55,[4607,1]],[85,[4606,1]],[125,[4608,1]],[225,[3515,1]],[325,[3505,1]],[625,[3514,1]],[925,[3504,1]],[2000,[2324,1]],[4000,[3513,1]],[6000,[3503,1]],[8000,[4151,8]],[10000,[181,8]]] 1 [5409,3803,8067,4607,4606,4608,3515,3505]
+2392 4184_2|1145_15|952_3|913_2
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index c43a272..3f6b022 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -8,3 +8,8 @@
5 7 210 1 [(263,1,1),(181,80,1)] 263 LimitGift3
5 8 140 1 [(4220,1,1),(4151,80,1)] 4220 LimitGift3
8 9 360 1 [(262,1,1),(181,200,1)] 262 LimitGift3
+2 10 25 1 [(8353,2,1),(912,1,1),(142,50,1)] 8353 LimitGift3
+2 11 40 1 [(8353,2,1),(4010,2,1),(143,30,1)] 8353 LimitGift3
+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
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f200f6c..204d430 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -154,6 +154,13 @@
771 28 1 4610 2 1 [[2213,30,1]] 4610 0 0 0 1 1 388 1900 0 LimitGift7
772 29 1 3513 2 1 [[3503,2,1]] 3513 0 0 0 1 1 88 360 0 LimitGift6
773 29 1 4606 1 1 [[2213,40,1]] 4606 0 0 0 1 1 888 3000 0 LimitGift7
+774 31 1 2390 1 1 [[913,1,1]] 2390 0 0 0 1 1 388 1000 0 LimitGift6
+775 32 1 147 10 1 [[143,300,1]] 143 0 0 0 1 1 288 750 0 LimitGift6
+776 33 1 30 500 1 [[2389,2,1]] 2389 0 0 0 1 1 388 900 0 LimitGift6
+777 34 1 109 6 1 [[108,15,1]] 109 0 0 0 1 1 388 1100 0 LimitGift6
+778 35 1 2213 15 1 [[4606,1,1]] 4606 0 0 0 1 1 688 1450 0 LimitGift6
+779 36 1 30 500 1 [[1128,1,1]] 1128 0 0 0 1 1 388 1000 0 LimitGift6
+780 37 1 263 1 1 [[181,120,1]] 263 0 0 0 1 1 988 2100 0 LimitGift6
801 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
802 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
803 19 0 2213 1 1 [] 0 0 0 0 0 1 80 0 0
--
Gitblit v1.8.0