Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_wcy

2018-12-26 e254df06ed1996ef6a2eb0436f250a1d68a881a8

Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

 CoreServerGroup/GameServer/PyNetPack.ini

@@ -148,36 +148,6 @@
PacketSubCMD_2=0x08

PacketCallFunc_2=QueryFamilyActionInfo





;跨服报名(上传数据)

[MergeRegister]

ScriptName = Player\PlayerMergeRegister.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 2



PacketCMD_1=0xC0

PacketSubCMD_1=0x11

PacketCallFunc_1=MergeWarRegisterPack



PacketCMD_2=0xC0

PacketSubCMD_2=0x12

PacketCallFunc_2=MergeWarAccQueryPack



;跨服玩家

[MergePlayer]

ScriptName = Player\MergePlayer.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 1



PacketCMD_1=0xC0

PacketSubCMD_1=0x15

PacketCallFunc_1=OnGotoMergeServer





;排行榜

[PlayerBillboard]

ScriptName = Player\PlayerBillboard.py

@@ -345,6 +315,28 @@
PacketSubCMD_4=0x04

PacketCallFunc_4=OnQueryBossInfo



[CrossRealmPK]

ScriptName = GameWorldLogic\CrossRealmPK.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 1



PacketCMD_1=0xC0

PacketSubCMD_1=0x01

PacketCallFunc_1=OnViewCrossPKBillboard



[CrossRealmPlayer]

ScriptName = Player\CrossRealmPlayer.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 1



PacketCMD_1=0xC0

PacketSubCMD_1=0x02

PacketCallFunc_1=OnViewCrossPlayerInfo



[PlayerXMZZ]

ScriptName = Player\PlayerXMZZ.py

Writer = xdh


 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


 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt

@@ -8,3 +8,5 @@
7    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

8    DecemberExp8    []    []    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

9    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-1    2019-1-1    18:00    20:00    { 0:["ExpActivity_Start", [3]]}    {-5:["ExpActivity_End", [3]], 0:["ExpActivity_Close", [3]]}    [30, "ExpActivity_Goahead", [3]]    110    20000


 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


 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


 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt

@@ -1,3 +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

2    Jan01    []    []    2019-1-3    2019-1-3    1    {0:["MultipleXXDOpen", []]}    {}    2    110    3000


 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


 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


 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    sdq1230    []    []    2018-12-30    2018-12-30    1    0    {0:["XYCOpen", []]}    {}    []    110

16    sdq0104    []    []    2019-1-4    2019-1-4    1    0    {0:["XYCOpen", []]}    {}    []    110


 CoreServerGroup/GameServer/Script/ChConfig.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/DataRecordPack.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/EventReport.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GM/Commands/MergeKingFast.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GM/Commands/MergeKingGroup.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GM/Commands/SetMergePKInfo.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GM/GMShell.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldAverageLv.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeBoss.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergePK.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMixServerCampaign.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/MergeBroadCastRecive.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/MergeChildMsg.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerCompensation.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerExam.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerFB.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerMergeEvent.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerMergeRegister.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/Player/PlayerTalk.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/PyDataManager.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/PyGameDataStruct.pyc

Binary files differ

 CoreServerGroup/GameServer/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini

@@ -583,23 +583,6 @@
PacketSubCMD_1=0x04

PacketCallFunc_1=OnExitCrossRealm



;王者争霸

[PlayerMergeKing]

ScriptName = Player\PlayerMergeKing.py

Writer = hxp

Releaser = hxp

RegType = 0

RegisterPackCount = 2



PacketCMD_1=0xC1

PacketSubCMD_1=0x11

PacketCallFunc_1=Client_MergeKingSupport



PacketCMD_2=0xC1

PacketSubCMD_2=0x08

PacketCallFunc_2=Client_MergeKingWorship





;改名功能

[UpdatePlayerName]

ScriptName = Player\UpdatePlayerName.py


 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChNetSendPack.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/EventReport.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergeKing.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMergePKAward.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetCrossPK.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeKing.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergePK.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerArrestTask.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeEvent.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergeKing.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMergePK.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTalk.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTruck.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKSeasonOrder.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeEvent.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeKing.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAddCnt.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKAward.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergePKRecoverWinCost.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRank.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_MergeWarRegister.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_RewardOnLogin.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/UpdatePlayerName.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc

Binary files differ

 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerScript.ini

@@ -173,7 +173,7 @@
PacketSubCMD_1=0x6

PacketCallFunc_1=GameSever_PlayerCountByCountry



[PlayerMergeWar]

[GY_Query_CrossRealmReg]

ScriptName = Player\RemoteQuery\GY_Query_CrossRealmReg.py

Writer = hxp

Releaser = hxp


 db/PyMongoDataServer/Collections/CollectionDefine.pyc

Binary files differ

 db/PyMongoDataServer/Collections/DataServerPlayerData.pyc

Binary files differ

 db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc

Binary files differ

 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


 db/PyMongoDataServer/PySysDB/tagActExpRate.txt

@@ -8,3 +8,5 @@
7    110    10000

8    110    10000

9    110    10000

10    110    10000

11    110    20000


 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	

 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	

 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


 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-30    2018-12-30    1    0    110    1

16    2019-1-4    2019-1-4    1    0    110    1


 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


 db/PyMongoDataServer/PySysDB/tagStore.txt

@@ -201,8 +201,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        


 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":[[4680,1,1],[5411,5,1]],"3":[[4680,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,1,1],[30,100,1]],"2":[[5412,1,1],[30,100,1]],"3":[[5412,1,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