From 1cf93b1137ba569eaae96483cadf5fa8fc2af62d Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 04 十二月 2018 14:19:46 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 20 ++++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 49 +++++++--------
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 1
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc | 0
db/PyMongoDataServer/PySysDB/tagActFlashSale.txt | 2
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 8 ++
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt | 2
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 5 +
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 8 ++
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 5 +
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 45 +++++++--------
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 16 ++++-
21 files changed, 102 insertions(+), 60 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index f40b2ee..6e9ac83 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -6,3 +6,4 @@
5 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
6 NovemberExp25 [] [] 2018-11-25 2018-11-25 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
7 DecemberExp2 [] [] 2018-12-2 2018-12-2 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+8 DecemberExp8 [] [] 2018-12-8 2018-12-8 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 b9d608d..7e4b4ec 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -52,3 +52,11 @@
51 December4 [] [] 2018-12-2 2018-12-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
52 December5 [] [] 2018-12-3 2018-12-3 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
53 December6 [] [] 2018-12-4 2018-12-4 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 50 0
+54 December7 [] [] 2018-12-5 2018-12-5 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+55 December8 [] [] 2018-12-6 2018-12-6 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+56 December9 [] [] 2018-12-7 2018-12-7 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+57 December10 [] [] 2018-12-8 2018-12-8 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+58 December11 [] [] 2018-12-9 2018-12-9 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+59 December12 [] [] 2018-12-10 2018-12-10 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+60 December13 [] [] 2018-12-11 2018-12-11 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+61 December14 [] [] 2018-12-12 2018-12-12 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
index bdddccf..c3ec7d0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashSale.txt
@@ -1,2 +1,4 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate StartTime EndTime AdvanceMinutes NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV IsDayReset ShopTypeList
1 OpenServer [] [] 7 7 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 {0:["FlashRushToBuy3",[]]} [] [] 100 1 [[200,201,202,203]]
+2 New1 [] [] 2018-11-16 2018-11-16 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[204,205,206,207]]
+3 December12 [] [] 2018-12-12 2018-12-12 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 {0:["FlashRushToBuy3",[]]} [] [] 100 0 [[204,205,206,207]]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 3e770fc..54792da 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -22,3 +22,8 @@
21 New7 [] [] 2018-11-22 2018-11-22 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
22 New8 [] [] 2018-12-1 2018-12-1 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
23 New9 [] [] 2018-12-2 2018-12-2 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+24 December5 [] [] 2018-12-5 2018-12-5 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+25 December6 [] [] 2018-12-6 2018-12-6 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+26 December7 [] [] 2018-12-7 2018-12-7 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+27 December10 [] [] 2018-12-10 2018-12-10 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+28 December11 [] [] 2018-12-11 2018-12-11 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 4f5851f..391f692 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -233,31 +233,28 @@
1028 203 0 999
1029 203 0 999
1030 204 0 1
-1031 204 0 3
+1031 204 0 10
1032 204 0 10
-1033 204 0 999
-1034 204 0 999
-1035 204 0 999
-1036 205 0 1
-1037 205 0 2
-1038 205 0 3
-1039 205 0 5
-1040 205 0 5
-1041 205 0 999
-1042 205 0 999
-1043 205 0 999
-1044 206 0 2
-1045 206 0 3
-1046 206 0 5
-1047 206 0 999
-1048 206 0 999
-1049 207 0 1
-1050 207 0 1
-1051 207 0 5
-1052 207 0 10
-1053 207 0 999
-1054 207 0 999
-1055 207 0 999
+1033 204 0 10
+1034 204 0 10
+1035 204 0 20
+1036 205 0 3
+1037 205 0 20
+1038 205 0 20
+1039 205 0 20
+1040 205 0 20
+1041 206 0 5
+1042 206 0 10
+1043 206 0 20
+1044 206 0 20
+1045 206 0 20
+1046 206 0 20
+1047 207 0 1
+1048 207 0 3
+1049 207 0 20
+1050 207 0 20
+1051 207 0 20
+1052 207 0 20
1056 16 0 0
1057 16 0 0
1058 16 0 0
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index d61f729..dbc7994 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 8dc5527..a5a8160 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/GM/Commands/SetOSCRecordData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.pyc
index 0ba1094..a485b21 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetOSCRecordData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
index 16fd021..127a9ea 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MunekadoTrial.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index a73d912..a18b97e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 946a7ee..9427c61 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index 426162f..f3d96c9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
index 437e56a..59114f8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.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 dbedf6f..40de330 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/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 898d760..cdc68bc 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -6,3 +6,4 @@
5 110 10000
6 110 10000
7 110 10000
+8 110 10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 02e3ab2..1f266bb 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -32,10 +32,10 @@
31 2018-10-6 2018-10-6 110 0 [[11]] SellMail4
32 2018-10-7 2018-10-7 110 0 [[14]] SellMail4
33 2018-10-8 2018-10-8 110 0 [[12]] SellMail4
-34 2018-11-9 2018-11-9 120 50 0 [[22]] SellMail4 双11活动
-35 2018-11-10 2018-11-10 50 0 [[23]] SellMail4 双11活动
-36 2018-11-11 2018-11-11 50 0 [[24]] SellMail4 双11活动
-37 2018-11-12 2018-11-12 50 0 [[25]] SellMail4 双11活动
+34 2018-11-9 2018-11-9 120 50 0 [[22]] SellMail4
+35 2018-11-10 2018-11-10 50 0 [[23]] SellMail4
+36 2018-11-11 2018-11-11 50 0 [[24]] SellMail4
+37 2018-11-12 2018-11-12 50 0 [[25]] SellMail4
38 2018-11-14 2018-11-14 120 50 0 [[27]] SellMail4
39 2018-11-15 2018-11-15 50 0 [[28]] SellMail4
40 2018-11-17 2018-11-17 120 50 0 [[29]] SellMail4
@@ -52,3 +52,11 @@
51 2018-12-2 2018-12-2 50 0 [[40]] SellMail4
52 2018-12-3 2018-12-3 50 0 [[41]] SellMail4
53 2018-12-4 2018-12-4 50 0 [[42]] SellMail4
+54 2018-12-5 2018-12-5 110 0 [[43]] SellMail4
+55 2018-12-6 2018-12-6 110 0 [[44]] SellMail4
+56 2018-12-7 2018-12-7 110 0 [[45]] SellMail4
+57 2018-12-8 2018-12-8 110 0 [[46]] SellMail4
+58 2018-12-9 2018-12-9 110 0 [[47]] SellMail4
+59 2018-12-10 2018-12-10 110 0 [[48]] SellMail4
+60 2018-12-11 2018-12-11 110 0 [[49]] SellMail4
+61 2018-12-12 2018-12-12 110 0 [[50]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
index 25ed1d3..264fd46 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashSale.txt
@@ -1,2 +1,4 @@
CfgID StartDate EndDate StartTime EndTime AdvanceMinutes LimitLV IsDayReset ShopTypeList MailKey MailItemPrize
1 7 7 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 100 1 [[200,201,202,203]] SellMail5
+2 2018-11-16 2018-11-16 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 100 0 [[204,205,206,207]] SellMail5
+3 2018-12-12 2018-12-12 12:00|16:00|20:00|22:00 13:00|17:00|21:00|23:00 1440 100 0 [[204,205,206,207]] SellMail5
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index 10de887..3af326a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -22,3 +22,8 @@
21 2018-11-22 2018-11-22 5 0 5
22 2018-12-1 2018-12-1 5 0 6
23 2018-12-2 2018-12-2 5 0 7
+24 2018-12-5 2018-12-5 5 0 10
+25 2018-12-6 2018-12-6 5 0 10
+26 2018-12-7 2018-12-7 5 0 11
+27 2018-12-10 2018-12-10 5 0 12
+28 2018-12-11 2018-12-11 5 0 13
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 738594f..33250e6 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -41,3 +41,11 @@
4 40 110 1 [(4694,6,1),(913,1,1)] 4694 LimitGift3
2 41 33 1 [(2213,10,1),(4610,1,1)] 2213 LimitGift3
4 42 110 1 [(4151,100,1),(1500,4,1)] 4151 LimitGift3
+2 43 34 1 [(4007,3,1),(30,100,1)] 4007 LimitGift3
+4 44 94 1 [(4010,8,1),(30,300,1)] 4010 LimitGift3
+2 45 25 1 [(4182,1,1),(30,100,1)] 4182 LimitGift3
+5 46 128 1 [(4221,1,1),(4151,60,1)] 4221 LimitGift3
+4 47 95 1 [(4608,1,1),(2213,30,1)] 4608 LimitGift3
+2 48 30 1 [(1503,4,1),(30,100,1)] 1503 LimitGift3
+2 49 25 1 [(1500,5,1),(30,100,1)] 1500 LimitGift3
+8 50 318 1 [(264,1,1),(181,150,1)] 264 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 3d4b2eb..2d0a9b3 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -232,32 +232,29 @@
1027 203 2 2213 100 1 [] 2213 0 0 0 1 10 1 500 1250 0 FlashRushToBuy2 FlashToSnapUp
1028 203 2 4608 2 1 [] 4608 0 0 0 1 999 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp
1029 203 2 198 3 1 [] 198 0 0 0 1 999 1 88 900 0 FlashRushToBuy2 FlashToSnapUp
-1030 204 2 4606 3 1 [] 4606 0 0 0 1 1 1 666 3000 0 FlashRushToBuy2 FlashToSnapUp
-1031 204 2 4606 1 1 [] 4606 0 0 0 1 3 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp
-1032 204 2 2213 50 1 [] 2213 0 0 0 1 10 1 150 625 0 FlashRushToBuy2 FlashToSnapUp
-1033 204 2 1503 2 1 [] 1503 0 0 0 1 999 1 20 100 0 FlashRushToBuy2 FlashToSnapUp
-1034 204 2 4007 3 1 [] 4007 0 0 0 1 999 1 60 240 0 FlashRushToBuy2 FlashToSnapUp
-1035 204 2 4622 5 1 [] 4622 0 0 0 1 999 1 88 400 0 FlashRushToBuy2 FlashToSnapUp
-1036 205 2 3516 2 1 [] 3516 0 0 0 1 1 1 666 4860 0 FlashRushToBuy2 FlashToSnapUp
-1037 205 2 947 1 1 [] 947 0 0 0 1 2 1 188 1000 0 FlashRushToBuy2 FlashToSnapUp
-1038 205 2 2050 6 1 [] 2050 0 0 0 1 3 1 30 300 0 FlashRushToBuy2 FlashToSnapUp
-1039 205 2 953 1 1 [] 953 0 0 0 1 5 1 88 500 0 FlashRushToBuy2 FlashToSnapUp
-1040 205 2 4681 1 1 [] 4681 0 0 0 1 5 1 50 250 0 FlashRushToBuy2 FlashToSnapUp
-1041 205 2 4184 1 1 [] 4184 0 0 0 1 999 1 38 230 0 FlashRushToBuy2 FlashToSnapUp
-1042 205 2 4010 4 1 [] 4010 0 0 0 1 999 1 100 320 0 FlashRushToBuy2 FlashToSnapUp
-1043 205 2 4609 2 1 [] 4609 0 0 0 1 999 1 50 200 0 FlashRushToBuy2 FlashToSnapUp
-1044 206 2 4607 2 1 [] 4607 0 0 0 1 2 1 666 4000 0 FlashRushToBuy2 FlashToSnapUp
-1045 206 2 196 1 1 [] 196 0 0 0 1 3 1 200 800 0 FlashRushToBuy2 FlashToSnapUp
-1046 206 2 195 5 1 [] 195 0 0 0 1 5 1 300 1500 0 FlashRushToBuy2 FlashToSnapUp
-1047 206 2 4610 1 1 [] 4610 0 0 0 1 999 1 60 200 0 FlashRushToBuy2 FlashToSnapUp
-1048 206 2 5410 3 1 [] 5410 0 0 0 1 999 1 88 150 0 FlashRushToBuy2 FlashToSnapUp
-1049 207 2 5409 2 1 [] 5409 0 0 0 1 1 1 8888 25000 0 FlashRushToBuy2 FlashToSnapUp
-1050 207 2 2389 5 1 [] 2390 0 0 0 1 1 1 150 900 0 FlashRushToBuy2 FlashToSnapUp
-1051 207 2 4680 1 1 [] 4680 0 0 0 1 5 1 188 750 0 FlashRushToBuy2 FlashToSnapUp
-1052 207 2 2389 1 1 [] 2390 0 0 0 1 10 1 20 180 0 FlashRushToBuy2 FlashToSnapUp
-1053 207 2 2213 100 1 [] 2213 0 0 0 1 999 1 200 1250 0 FlashRushToBuy2 FlashToSnapUp
-1054 207 2 4608 2 1 [] 4608 0 0 0 1 999 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp
-1055 207 2 198 3 1 [] 198 0 0 0 1 999 1 88 900 0 FlashRushToBuy2 FlashToSnapUp
+1030 204 2 4607 2 1 [] 4607 0 0 0 1 1 1 666 4000 0 FlashRushToBuy2 FlashToSnapUp
+1031 204 2 2213 50 1 [] 2213 0 0 0 1 10 1 180 750 0 FlashRushToBuy2 FlashToSnapUp
+1032 204 2 4306 1000 1 [] 4306 0 0 0 1 10 1 280 1000 0 FlashRushToBuy2 FlashToSnapUp
+1033 204 2 4681 1 1 [] 4681 0 0 0 1 10 1 66 250 0 FlashRushToBuy2 FlashToSnapUp
+1034 204 2 4680 1 1 [] 4680 0 0 0 1 10 1 188 750 0 FlashRushToBuy2 FlashToSnapUp
+1035 204 2 4007 3 1 [] 4007 0 0 0 1 20 1 60 240 0 FlashRushToBuy2 FlashToSnapUp
+1036 205 2 3516 2 1 [] 3516 0 0 0 1 3 1 888 4860 0 FlashRushToBuy2 FlashToSnapUp
+1037 205 2 4010 4 1 [] 4010 0 0 0 1 20 1 88 320 0 FlashRushToBuy2 FlashToSnapUp
+1038 205 2 1503 2 1 [] 1503 0 0 0 1 20 1 20 100 0 FlashRushToBuy2 FlashToSnapUp
+1039 205 2 4610 2 1 [] 4610 0 0 0 1 20 1 50 200 0 FlashRushToBuy2 FlashToSnapUp
+1040 205 2 4611 1 1 [] 4611 0 0 0 1 20 1 50 200 0 FlashRushToBuy2 FlashToSnapUp
+1041 206 2 4606 2 1 [] 4606 0 0 0 1 5 1 388 2000 0 FlashRushToBuy2 FlashToSnapUp
+1042 206 2 4608 2 1 [] 4608 0 0 0 1 10 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp
+1043 206 2 4622 5 1 [] 4622 0 0 0 1 20 1 88 400 0 FlashRushToBuy2 FlashToSnapUp
+1044 206 2 983 20 1 [] 983 0 0 0 1 20 1 188 600 0 FlashRushToBuy2 FlashToSnapUp
+1045 206 2 2213 20 1 [] 2213 0 0 0 1 20 1 66 300 0 FlashRushToBuy2 FlashToSnapUp
+1046 206 2 144 100 1 [] 144 0 0 0 1 20 1 66 300 0 FlashRushToBuy2 FlashToSnapUp
+1047 207 2 5409 2 1 [] 5409 0 0 0 1 1 1 8888 25000 0 FlashRushToBuy2 FlashToSnapUp
+1048 207 2 2389 5 1 [] 2389 0 0 0 1 3 1 388 900 0 FlashRushToBuy2 FlashToSnapUp
+1049 207 2 198 3 1 [] 198 0 0 0 1 20 1 88 900 0 FlashRushToBuy2 FlashToSnapUp
+1050 207 2 195 5 1 [] 195 0 0 0 1 20 1 288 1500 0 FlashRushToBuy2 FlashToSnapUp
+1051 207 2 5410 3 1 [] 5410 0 0 0 1 20 1 88 150 0 FlashRushToBuy2 FlashToSnapUp
+1052 207 2 5411 3 1 [] 5411 0 0 0 1 20 1 188 300 0 FlashRushToBuy2 FlashToSnapUp
1056 16 0 3513 1 1 [[3503,1,1]] 4681 0 0 58 1 0 1 18 180 86400
1057 16 0 4151 20 1 [] 4151 0 0 65 1 0 1 18 200 86400
1058 16 0 181 20 1 [] 181 0 0 80 1 0 1 18 200 86400
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index a677b06..c530e3b 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -1,16 +1,16 @@
TemplateID NeedRechargeGold AwardIndex AwardItem NotifyKey
1 6 0 {"1":[[986,1,1],[181,10,1],[3,2,1]],"2":[[986,1,1],[181,10,1],[3,2,1]],"3":[[986,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
1 30 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]} AccumulatedTopUp2
-1 300 2 {"1":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]]} AccumulatedTopUp2
+1 300 2 {"1":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]]} AccumulatedTopUp2
2 6 0 {"1":[[983,1,1],[181,10,1],[3,2,1]],"2":[[983,1,1],[181,10,1],[3,2,1]],"3":[[983,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
2 30 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]} AccumulatedTopUp2
-2 300 2 {"1":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
+2 300 2 {"1":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
3 6 0 {"1":[[1128,1,1],[181,10,1],[3,2,1]],"2":[[1128,1,1],[181,10,1],[3,2,1]],"3":[[1128,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
3 30 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
-3 300 2 {"1":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
+3 300 2 {"1":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
4 6 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
4 30 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
-4 300 2 {"1":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
+4 300 2 {"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
5 6 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
5 30 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
5 100 2 {"1":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
@@ -22,7 +22,15 @@
7 150 2 {"1":[[4010,6,1],[30,600,1]],"2":[[4010,6,1],[30,600,1]],"3":[[4010,6,1],[30,600,1]]} AccumulatedTopUp2
8 6 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]}
8 30 1 {"1":[[881,1,1],[4151,10,1],[4306,50,1]],"2":[[881,1,1],[4151,10,1],[4306,50,1]],"3":[[881,1,1],[4151,10,1],[4306,50,1]]}
-8 300 2 {"1":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]]}
+8 300 2 {"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}
9 6 0 {"1":[[983,3,1],[181,10,1],[3,2,1]],"2":[[983,3,1],[181,10,1],[3,2,1]],"3":[[983,3,1],[181,10,1],[3,2,1]]}
9 30 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]}
-9 300 2 {"1":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]]}
+9 300 2 {"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]}
+10 6 0 {"1":[[1128,1,1],[5411,1,1]],"2":[[1128,1,1],[5411,1,1]],"3":[[1128,1,1],[5411,1,1]]} AccumulatedTopUp2
+10 30 1 {"1":[[4681,1,1],[5411,3,1]],"2":[[4681,1,1],[5411,3,1]],"3":[[4681,1,1],[5411,3,1]]} AccumulatedTopUp2
+11 6 0 {"1":[[4671,2,1],[4674,2,1]],"2":[[4671,2,1],[4674,2,1]],"3":[[4671,2,1],[4674,2,1]]} AccumulatedTopUp2
+11 30 1 {"1":[[4182,3,1],[923,5,1]],"2":[[4182,3,1],[923,5,1]],"3":[[4182,3,1],[923,5,1]]} AccumulatedTopUp2
+12 6 0 {"1":[[4695,1,1],[912,1,1]],"2":[[4695,1,1],[912,1,1]],"3":[[4695,1,1],[912,1,1]]} AccumulatedTopUp2
+12 30 1 {"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]} AccumulatedTopUp2
+13 6 0 {"1":[[4007,2,1]],"2":[[4007,2,1]],"3":[[4007,2,1]]} AccumulatedTopUp2
+13 30 1 {"1":[[108,6,1],[109,2,1]],"2":[[108,6,1],[109,2,1]],"3":[[108,6,1],[109,2,1]]} AccumulatedTopUp2
--
Gitblit v1.8.0