From d5f39e761dc339ea4fe4997742e548ba2e5faf70 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期四, 27 十二月 2018 14:10:15 +0800
Subject: [PATCH] Merge branch '1.3.20' of http://192.168.0.87:10010/r/snxx_server into 1.3.20
---
CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt | 2 +
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 2 +
db/PyMongoDataServer/PySysDB/tagActSpringSale.txt | 4 +-
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 12 +++---
db/PyMongoDataServer/PySysDB/tagStore.txt | 4 +-
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 3 +
db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 6 +-
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 2 +
db/PyMongoDataServer/PySysDB/tagActExpRate.txt | 1
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 3 -
CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt | 2
db/PyMongoDataServer/PySysDB/tagActWishingWell.txt | 2 +
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt | 4 +-
db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt | 4 +-
CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt | 6 +-
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt | 4 +-
db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt | 6 +-
19 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 640c8f4..ff8ae08 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -10,3 +10,5 @@
9 daxuefh18 [] [] 2018-12-5 2018-12-7 1 {0:["BossFHOpen", []]} {} 110 1
10 sdq1211 [] [] 2018-12-13 2018-12-16 1 {0:["BossFHOpen", []]} {} 110 1
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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index a9b2ec9..4ce7432 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -8,4 +8,5 @@
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
9 DecemberExp16 [] [] 2018-12-16 2018-12-16 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
-10 DecemberExp23 [] [] 2018-12-23 2018-12-23 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "ExpActivity_Goahead", [2]] 110 10000
+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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
index 431d439..45f3f68 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFairyCeremony.txt
@@ -1,3 +1,3 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV
-1 test1 [] [] 2018-12-19 2018-12-19 2 {0:["CeremonyStart", []],30:["CeremonyStart", []],60:["CeremonyStart", []],180:["CeremonyStart", []],360:["CeremonyStart", []]} {-60:["CeremonyEnd", []],-30:["CeremonyEnd", []],0:["CeremonyOver", []]} 110
+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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index f47dc51..4367e49 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -64,6 +64,6 @@
63 December16 [] [] 2018-12-16 2018-12-16 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
64 December17 [] [] 2018-12-17 2018-12-17 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
65 December18 [] [] 2018-12-18 2018-12-18 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-66 December22 [] [] 2018-12-22 2018-12-22 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-67 December23 [] [] 2018-12-23 2018-12-23 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
-68 December26 [] [] 2018-12-26 2018-12-26 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+66 Dec27 [] [] 2018-12-27 2018-12-27 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+67 Dec31 [] [] 2018-12-31 2018-12-31 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
+68 Jan2 [] [] 2019-1-2 2019-1-2 {0:["LimitGift1",[]]} {-60:["LimitGift2",[]]} [120, "LimitGift1"] 110 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index f9709e0..3fd730e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,4 +1,3 @@
CfgID ActMark PlatformList ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV LimitPoint
1 opensever [] [] 6 7 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
-2 guoqing11 [] [7001,7002,7003,8002,8003,8004] 2018-10-4 2018-10-5 1 {0:["MultipleXXDOpen", []]} {} 2 110 3000
-3 daxuexx18 [] [] 2018-12-9 2018-12-10 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/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index ab11ba9..e6c261a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -40,5 +40,5 @@
39 December20 [] [] 2018-12-20 2018-12-20 120 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
40 December21 [] [] 2018-12-21 2018-12-21 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
41 December22 [] [] 2018-12-22 2018-12-22 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-42 December23 [] [] 2018-12-23 2018-12-23 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
-43 December24 [] [] 2018-12-24 2018-12-24 {0:["LimitGift4",[]]} {-60:["LimitGift5",[]]} [120, "LimitGift4"] 110 0
+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
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 18f3289..4dd0e56 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -28,5 +28,5 @@
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
29 December14 [] [] 2018-12-14 2018-12-14 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-30 December20 [] [] 2018-12-20 2018-12-20 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
-31 December24 [] [] 2018-12-24 2018-12-24 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+30 December29 [] [] 2018-12-29 2018-12-29 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
+31 December30 [] [] 2018-12-30 2018-12-30 {0:["AccumulatedTopUp1", []]} {0:["AccumulatedTopUp3", [2]]} {0:["AccumulatedTopUp1", []]} 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index ed28656..069b096 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -13,3 +13,5 @@
12 sdq1220 [] [] 2018-12-20 2018-12-20 1 0 {0:["XYCOpen", []]} {} [] 110
13 sdq1224 [] [] 2018-12-24 2018-12-24 1 0 {0:["XYCOpen", []]} {} [] 110
14 sdq1226 [] [] 2018-12-26 2018-12-26 1 0 {0:["XYCOpen", []]} {} [] 110
+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
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index 1f1804d..cacab6b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index deb822c..24a2c55 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -10,3 +10,5 @@
9 2018-12-5 2018-12-7 1 110 1
10 2018-12-13 2018-12-16 1 110 1
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
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index b6d491c..781551a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -9,3 +9,4 @@
8 110 10000
9 110 10000
10 110 10000
+11 110 20000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index c2b6ff1..f55c47c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -64,6 +64,6 @@
63 2018-12-16 2018-12-16 110 0 [[52]] SellMail4
64 2018-12-17 2018-12-17 110 0 [[53]] SellMail4
65 2018-12-18 2018-12-18 110 0 [[54]] SellMail4
-66 2018-12-22 2018-12-22 110 0 [[55]] SellMail4
-67 2018-12-23 2018-12-23 110 0 [[56]] SellMail4
-68 2018-12-26 2018-12-26 110 0 [[57]] SellMail4
+66 2018-12-27 2018-12-27 110 0 [[55]] SellMail4
+67 2018-12-31 2018-12-31 110 0 [[56]] SellMail4
+68 2019-1-2 2019-1-2 110 0 [[57]] SellMail4
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
index cff6044..ae53aea 100644
--- a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -1,4 +1,3 @@
CfgID Multiple LimitLV LimitPoint
1 2 110 3000
2 2 110 3000
-3 2 110 3000
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 7f23185..951ba29 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -40,5 +40,5 @@
39 2018-12-20 2018-12-20 120 110 0 [[120]] SellMail3
40 2018-12-21 2018-12-21 110 0 [[121]] SellMail3
41 2018-12-22 2018-12-22 110 0 [[122]] SellMail3
-42 2018-12-23 2018-12-23 110 0 [[123]] SellMail3
-43 2018-12-24 2018-12-24 110 0 [[124]] SellMail3
+42 2018-12-31 2018-12-31 110 0 [[123]] SellMail3
+43 2019-1-3 2019-1-3 110 0 [[124]] SellMail3
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index 478460f..b901acd 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -28,5 +28,5 @@
27 2018-12-10 2018-12-10 5 0 12
28 2018-12-11 2018-12-11 5 0 13
29 2018-12-14 2018-12-14 5 0 14
-30 2018-12-20 2018-12-20 5 0 15
-31 2018-12-24 2018-12-24 5 0 16
+30 2018-12-29 2018-12-29 5 0 15
+31 2018-12-30 2018-12-30 5 0 16
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 7e1113e..7752ed2 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -13,3 +13,5 @@
12 2018-12-20 2018-12-20 1 0 110 1
13 2018-12-24 2018-12-24 1 0 110 1
14 2018-12-26 2018-12-26 1 0 110 1
+15 2018-12-31 2018-12-31 1 0 110 1
+16 2019-1-4 2019-1-4 1 0 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 01f2fde..3da7170 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -53,6 +53,6 @@
2 52 25 1 [(912,1,1),(4694,1,1)] 4694 LimitGift3
4 53 130 1 [(913,1,1),(3807,10,1)] 3807 LimitGift3
4 54 130 1 [(4606,1,1),(2213,25,1)] 4606 LimitGift3
-4 55 131 1 [(4606,1,1),(2213,30,1)] 4606 LimitGift3
-4 56 150 1 [(913,1,1),(4694,10,1)] 913 LimitGift3
-2 57 27 1 [(912,1,1),(2213,10,1)] 912 LimitGift3
+2 55 24 1 [(105,10,1),(106,2,1)] 105 LimitGift3
+4 56 108 1 [(111,30,1),(112,12,1)] 111 LimitGift3
+4 57 110 1 [(913,1,1),(4694,6,1)] 913 LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 6b1659f..237a06b 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -199,8 +199,8 @@
786 120 1 3807 2 1 [[912,1,1]] 3807 0 0 0 1 0 1 88 350 0 LimitGift6
787 121 1 983 20 1 [[4306,1000,1]] 983 0 0 0 1 0 1 388 1600 0 LimitGift6
788 122 1 4223 1 1 [[4151,150,1]] 4223 0 0 0 1 0 1 988 2780 0 LimitGift6
-789 123 1 111 30 1 [[112,12,1]] 111 0 0 0 1 0 1 388 1080 0 LimitGift6
-790 124 1 912 1 1 [[2213,15,1]] 912 0 0 0 1 0 1 88 337 0 LimitGift6
+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
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
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index a5663ca..9cf65fa 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -37,9 +37,9 @@
14 6 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
14 30 1 {"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]} AccumulatedTopUp2
14 198 2 {"1":[[4680,1,1],[5411,5,1]],"2":[[4681,1,1],[5411,5,1]],"3":[[4681,1,1],[5411,5,1]]} AccumulatedTopUp2
-15 6 0 {"1":[[5303,100,1]],"2":[[5303,100,1]],"3":[[5303,100,1]]} AccumulatedTopUp2
-15 30 1 {"1":[[5412,20,1]],"2":[[5412,20,1]],"3":[[5412,20,1]]} AccumulatedTopUp2
-15 128 2 {"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]} AccumulatedTopUp2
-16 6 0 {"1":[[144,40,1]],"2":[[144,40,1]],"3":[[144,40,1]]} AccumulatedTopUp2
-16 30 1 {"1":[[153,20,1]],"2":[[153,20,1]],"3":[[153,20,1]]} AccumulatedTopUp2
-16 128 2 {"1":[[4010,6,1]],"2":[[4010,6,1]],"3":[[4010,6,1]]} AccumulatedTopUp2
+15 6 0 {"1":[[5412,30,1],[30,100,1]],"2":[[5412,30,1],[30,100,1]],"3":[[5412,30,1],[30,100,1]]} AccumulatedTopUp2
+15 30 1 {"1":[[4681,1,1],[30,100,1]],"2":[[4681,1,1],[30,100,1]],"3":[[4681,1,1],[30,100,1]]} AccumulatedTopUp2
+15 128 2 {"1":[[4680,1,1]],"2":[[4680,1,1]],"3":[[4680,1,1]]} AccumulatedTopUp2
+16 6 0 {"1":[[912,1,1],[30,100,1]],"2":[[912,1,1],[30,100,1]],"3":[[912,1,1],[30,100,1]]} AccumulatedTopUp2
+16 30 1 {"1":[[4694,2,1],[30,100,1]],"2":[[4694,2,1],[30,100,1]],"3":[[4694,2,1],[30,100,1]]} AccumulatedTopUp2
+16 128 2 {"1":[[4694,3,1],[913,1,1]],"2":[[4694,3,1],[913,1,1]],"3":[[4694,3,1],[913,1,1]]} AccumulatedTopUp2
--
Gitblit v1.8.0