From fbfecebdb5e55b790687a9c42cef2e5b2215c6c7 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 08 一月 2019 21:30:09 +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/tagActBossReborn.txt | 1
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 2 +
db/PyMongoDataServer/PySysDB/tagStore.txt | 47 +++++++++++++++++++++++
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt | 1
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 2 +
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt | 1
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2 +
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 2 +
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 2 +
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 47 +++++++++++++++++++++++
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 2 +
14 files changed, 113 insertions(+), 0 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index ff8ae08..9e119dd 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -12,3 +12,4 @@
11 sdq1221 [] [] 2018-12-21 2018-12-23 1 {0:["BossFHOpen", []]} {} 110 1
12 sdq1228 [] [] 2018-12-28 2018-12-30 1 {0:["BossFHOpen", []]} {} 110 1
13 sdq0102 [] [] 2019-1-2 2019-1-4 1 {0:["BossFHOpen", []]} {} 110 1
+14 20190111 [] [] 2019-1-11 2019-1-12 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index cb83bb5..705754b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -11,3 +11,4 @@
10 DecemberExp30 [] [] 2018-12-30 2018-12-30 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
11 JanuaryExp1 [] [] 2019-1-2 2019-1-2 18:00 20:00 { 0:["ExpActivity_Start", [3]]} {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]} [30, "ExpActivity_Goahead", [3]] 110 20000
12 JanuaryExp2 [] [] 2019-1-6 2019-1-6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+13 20190113 [] [] 2019-1-13 2019-1-13 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/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 752ceb5..0a89f25 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -69,3 +69,5 @@
68 Jan2 [] [] 2019-1-2 2019-1-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
69 Jan3 [] [] 2019-1-5 2019-1-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
70 Jan4 [] [] 2019-1-9 2019-1-9 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+71 20190111 [] [] 2019-1-11 2019-1-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+72 20190113 [] [] 2019-1-13 2019-1-13 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index e0d2e83..eb9bf2b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -3,3 +3,4 @@
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 2:00|14:00|18:00|22:00|24:00 240 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[210,211,212,213,214]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index 4bf7f96..fc24763 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -43,3 +43,5 @@
42 Dec31 [] [] 2018-12-31 2018-12-31 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
43 Jan3 [] [] 2019-1-3 2019-1-3 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
44 Jan4 [] [] 2019-1-6 2019-1-6 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+45 20190112 [] [] 2019-1-12 2019-1-12 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+46 20190115 [] [] 2019-1-15 2019-1-15 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 2ad8272..9ec299f 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -16,3 +16,5 @@
15 sdq1231 [] [] 2018-12-31 2018-12-31 1 0 {0:["XYCOpen", []]} {} [] 110
16 sdq0104 [] [] 2019-1-4 2019-1-4 1 0 {0:["XYCOpen", []]} {} [] 110
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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index ee8a127..7d57e66 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -204,6 +204,8 @@
789 123 0 0
790 124 0 0
791 125 0 0
+792 126 0 0
+793 127 0 0
801 19 0 0
802 19 0 0
803 19 0 0
@@ -316,6 +318,51 @@
1099 209 0 20
1100 209 0 20
1101 209 0 20
+1102 210 0 5
+1103 210 0 5
+1104 210 0 10
+1105 210 0 20
+1106 210 0 20
+1107 210 0 20
+1108 210 0 20
+1109 210 0 20
+1110 210 0 20
+1111 211 0 2
+1112 211 0 5
+1113 211 0 10
+1114 211 0 20
+1115 211 0 20
+1116 211 0 20
+1117 211 0 20
+1118 211 0 20
+1119 211 0 20
+1120 212 0 10
+1121 212 0 20
+1122 212 0 20
+1123 212 0 20
+1124 212 0 20
+1125 212 0 20
+1126 212 0 20
+1127 212 0 20
+1128 212 0 20
+1129 213 0 2
+1130 213 0 2
+1131 213 0 3
+1132 213 0 3
+1133 213 0 3
+1134 213 0 3
+1135 213 0 3
+1136 213 0 10
+1137 213 0 10
+1138 214 0 2
+1139 214 0 5
+1140 214 0 5
+1141 214 0 10
+1142 214 0 20
+1143 214 0 20
+1144 214 0 20
+1145 214 0 20
+1146 214 0 20
1200 16 0 0
1201 16 0 0
1202 16 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 24a2c55..d75749c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -12,3 +12,4 @@
11 2018-12-21 2018-12-23 1 110 1
12 2018-12-28 2018-12-30 1 110 1
13 2019-1-2 2019-1-4 1 110 1
+14 2019-1-11 2019-1-12 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 2c8f916..eed8491 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -69,3 +69,5 @@
68 2019-1-2 2019-1-2 110 0 [[57]] SellMail4
69 2019-1-5 2019-1-5 110 0 [[58]] SellMail4
70 2019-1-9 2019-1-9 110 0 [[59]] SellMail4
+71 2019-1-11 2019-1-11 110 0 [[60]] SellMail4
+72 2019-1-13 2019-1-13 110 0 [[61]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 4c1f5b3..aebb961 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -3,3 +3,4 @@
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 2:00|14:00|18:00|22:00|24:00 240 100 0 [[210,211,212,213,214]] SellMail5
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 446857b..f031d7b 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -43,3 +43,5 @@
42 2018-12-31 2018-12-31 110 0 [[123]] SellMail3
43 2019-1-3 2019-1-3 110 0 [[124]] SellMail3
44 2019-1-6 2019-1-6 110 0 [[125]] SellMail3
+45 2019-1-12 2019-1-12 110 0 [[127]] SellMail3
+46 2019-1-15 2019-1-15 110 0 [[126]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 04a59eb..082bff8 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -16,3 +16,5 @@
15 2018-12-31 2018-12-31 1 0 110 1
16 2019-1-4 2019-1-4 1 0 110 1
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
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index a7f87dd..91fe235 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -58,3 +58,5 @@
4 57 110 1 [(913,1,1),(4694,6,1)] 913 LimitGift3
4 58 108 1 [(111,30,1),(112,12,1)] 112 LimitGift3
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
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 582b22b..305b791 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -204,6 +204,8 @@
789 123 1 4222 1 1 [[4151,25,1]] 4222 0 0 0 1 0 1 666 1530 0 LimitGift6
790 124 1 4606 1 1 [[2213,50,1]] 4606 0 0 0 1 0 1 388 1625 0 LimitGift6
791 125 1 913 1 1 [[4694,10,1]] 913 0 0 0 1 0 1 388 1500 0 LimitGift6
+792 126 1 912 1 1 [[2213,20,1]] 912 0 0 0 1 0 1 88 400 0 LimitGift6
+793 127 1 112 20 1 [[110,60,1]] 112 0 0 0 1 0 1 388 1320 0 LimitGift7
801 19 0 2391 1 0 [] 0 0 0 0 0 0 1 60 0 0
802 19 0 2393 1 0 [] 0 0 0 0 0 0 1 60 0 0
803 19 0 2395 1 0 [] 0 0 0 0 0 0 1 60 0 0
@@ -316,6 +318,51 @@
1099 209 2 144 200 1 [] 144 0 0 0 1 20 1 100 600 0 FlashRushToBuy2 FlashToSnapUp
1100 209 2 153 100 1 [] 153 0 0 0 1 20 1 100 600 0 FlashRushToBuy2 FlashToSnapUp
1101 209 2 2213 120 1 [] 2213 0 0 0 1 20 1 300 1500 0 FlashRushToBuy2 FlashToSnapUp
+1102 210 2 5408 1 1 [] 5408 0 0 0 1 5 1 588 2500 0 FlashRushToBuy2 FlashToSnapUp
+1103 210 2 4607 1 1 [] 4607 0 0 0 1 5 1 388 2000 0 FlashRushToBuy2 FlashToSnapUp
+1104 210 2 4606 1 1 [] 4606 0 0 0 1 10 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp
+1105 210 2 4608 2 1 [] 4608 0 0 0 1 20 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp
+1106 210 2 4610 2 1 [] 4610 0 0 0 1 20 1 68 400 0 FlashRushToBuy2 FlashToSnapUp
+1107 210 2 2213 50 1 [] 2213 0 0 0 1 20 1 120 625 0 FlashRushToBuy2 FlashToSnapUp
+1108 210 2 912 2 1 [] 912 0 0 0 1 20 1 60 300 0 FlashRushToBuy2 FlashToSnapUp
+1109 210 2 913 1 1 [] 913 0 0 0 1 20 1 98 500 0 FlashRushToBuy2 FlashToSnapUp
+1110 210 2 4694 3 1 [] 4694 0 0 0 1 20 1 60 300 0 FlashRushToBuy2 FlashToSnapUp
+1111 211 2 8077 1 1 [] 8077 0 0 0 1 2 1 2588 8250 0 FlashRushToBuy2 FlashToSnapUp
+1112 211 2 5408 1 1 [] 5408 0 0 0 1 5 1 588 2500 0 FlashRushToBuy2 FlashToSnapUp
+1113 211 2 4606 1 1 [] 4606 0 0 0 1 10 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp
+1114 211 2 4608 2 1 [] 4608 0 0 0 1 20 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp
+1115 211 2 103 10 1 [] 103 0 0 0 1 20 1 128 600 0 FlashRushToBuy2 FlashToSnapUp
+1116 211 2 106 10 1 [] 106 0 0 0 1 20 1 138 600 0 FlashRushToBuy2 FlashToSnapUp
+1117 211 2 112 10 1 [] 112 0 0 0 1 20 1 150 600 0 FlashRushToBuy2 FlashToSnapUp
+1118 211 2 2213 50 1 [] 2213 0 0 0 1 20 1 120 625 0 FlashRushToBuy2 FlashToSnapUp
+1119 211 2 4010 6 1 [] 4010 0 0 0 1 20 1 99 480 0 FlashRushToBuy2 FlashToSnapUp
+1120 212 2 4680 1 1 [] 4680 0 0 0 1 10 1 188 750 0 FlashRushToBuy2 FlashToSnapUp
+1121 212 2 5411 5 1 [] 5411 0 0 0 1 20 1 99 500 0 FlashRushToBuy2 FlashToSnapUp
+1122 212 2 4681 1 1 [] 4681 0 0 0 1 20 1 60 250 0 FlashRushToBuy2 FlashToSnapUp
+1123 212 2 5303 200 1 [] 5303 0 0 0 1 20 1 38 200 0 FlashRushToBuy2 FlashToSnapUp
+1124 212 2 5412 50 1 [] 5412 0 0 0 1 20 1 58 250 0 FlashRushToBuy2 FlashToSnapUp
+1125 212 2 1503 2 1 [] 1503 0 0 0 1 20 1 20 100 0 FlashRushToBuy2 FlashToSnapUp
+1126 212 2 4007 3 1 [] 4007 0 0 0 1 20 1 50 240 0 FlashRushToBuy2 FlashToSnapUp
+1127 212 2 181 50 1 [] 181 0 0 0 1 20 1 99 500 0 FlashRushToBuy2 FlashToSnapUp
+1128 212 2 4151 50 1 [] 4151 0 0 0 1 20 1 99 500 0 FlashRushToBuy2 FlashToSnapUp
+1129 213 2 8077 1 1 [] 8077 0 0 0 1 2 1 2588 8250 0 FlashRushToBuy2 FlashToSnapUp
+1130 213 2 5408 3 1 [] 5408 0 0 0 1 2 1 1888 7500 0 FlashRushToBuy2 FlashToSnapUp
+1131 213 2 10973 1 1 [] 10973 [[10973,20973]] 0 0 0 1 3 1 688 2340 0 FlashRushToBuy2 FlashToSnapUp
+1132 213 2 10974 1 1 [] 10974 [[10974,20974]] 0 0 0 1 3 1 688 2340 0 FlashRushToBuy2 FlashToSnapUp
+1133 213 2 10976 1 1 [] 10976 [[10976,20976]] 0 0 0 1 3 1 688 2340 0 FlashRushToBuy2 FlashToSnapUp
+1134 213 2 10977 1 1 [] 10977 [[10977,20977]] 0 0 0 1 3 1 688 2340 0 FlashRushToBuy2 FlashToSnapUp
+1135 213 2 10975 1 1 [] 10975 [[10975,20975]] 0 0 0 1 3 1 688 2340 0 FlashRushToBuy2 FlashToSnapUp
+1136 213 2 2397 1 1 [] 2397 0 0 0 1 10 1 588 2000 0 FlashRushToBuy2 FlashToSnapUp
+1137 213 2 2389 5 1 [] 2389 0 0 0 1 10 1 188 900 0 FlashRushToBuy2 FlashToSnapUp
+1138 214 2 5409 2 1 [] 5409 0 0 0 1 2 1 6666 25000 0 FlashRushToBuy2 FlashToSnapUp
+1139 214 2 5408 1 1 [] 5408 0 0 0 1 5 1 588 2500 0 FlashRushToBuy2 FlashToSnapUp
+1140 214 2 4607 1 1 [] 4607 0 0 0 1 5 1 388 2000 0 FlashRushToBuy2 FlashToSnapUp
+1141 214 2 2397 1 1 [] 2397 0 0 0 1 10 1 588 2000 0 FlashRushToBuy2 FlashToSnapUp
+1142 214 2 5411 5 1 [] 5411 0 0 0 1 20 1 99 500 0 FlashRushToBuy2 FlashToSnapUp
+1143 214 2 106 10 1 [] 106 0 0 0 1 20 1 138 600 0 FlashRushToBuy2 FlashToSnapUp
+1144 214 2 112 10 1 [] 112 0 0 0 1 20 1 150 600 0 FlashRushToBuy2 FlashToSnapUp
+1145 214 2 912 2 1 [] 912 0 0 0 1 20 1 60 300 0 FlashRushToBuy2 FlashToSnapUp
+1146 214 2 2213 50 1 [] 2213 0 0 0 1 20 1 120 625 0 FlashRushToBuy2 FlashToSnapUp
1200 16 0 3513 1 1 [[3503,1,1]] 4681 0 0 58 1 0 1 18 180 86400
1201 16 0 4151 20 1 [] 4151 0 0 65 1 0 1 18 200 86400
1202 16 0 181 20 1 [] 181 0 0 80 1 0 1 18 200 86400
--
Gitblit v1.8.0