cehua_LC
2018-11-05 84ec8ed7c27cc67d9098eb8b02eec1a5b07123c7
Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
38个文件已修改
14个文件已添加
92 ■■■■■ 已修改文件
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Robot/AI/AIFile/AILoginout.pyc 补丁 | 查看 | 原始文档 | blame | 历史
Robot/framework/frame.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_1065.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_513.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_NoLineReduce.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4500.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4501.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4502.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4504.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4506.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4509.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4510.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4511.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4512.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4513.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4514.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4516.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4518.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4520.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4010.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4027.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4053.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4054.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4055.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4056.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4057.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagStore.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
db/PyMongoDataServer/PySysDB/tagVIPAward.txt 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
New file
@@ -0,0 +1,5 @@
CfgID    ActMark    ServerIDList    StartDate    EndDate    NotifyInfoStart    NotifyInfoEnd    NotifyInfoLoop    IsDayReset
1    test1    []    2018-5-29    2018-5-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
2    test2    []    2018-5-31    2018-5-1    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
3    test3    []    2018-5-2    2018-5-3    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
4    tast4    [7001,7002,7003,8002,8003,8004]    2018-9-29    2018-9-30    {0:["ConsumptionRebate1", []]}    {0:["ConsumptionRebate4", [2]]}    [120, "ConsumptionRebate1"]    0
Robot/AI/AIFile/AILoginout.pyc
Binary files differ
Robot/framework/frame.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_222.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_1065.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_513.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_NoLineReduce.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4500.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4501.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4502.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4503.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4504.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4506.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4507.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4509.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4510.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4511.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4512.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4513.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4514.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4516.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4517.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4518.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4520.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4010.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4027.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4053.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4054.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4055.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4056.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4057.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
New file
@@ -0,0 +1,5 @@
CfgID    StartDate    EndDate    LimitLV    IsDayReset    TemplateIDList
1    2018-5-29    2018-5-30    50    0    2
2    2018-5-31    2018-5-1    50    0    3
3    2018-5-2    2018-5-3    50    0    3
4    2018-9-29    2018-9-30    50    0    3
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -139,7 +139,7 @@
FamilyStoreItemRule2    8|9|10    4|0|3    0    0    0
PetFoodExchange    1130    1    50    999    0
PartyReward    [(26,12800,1),(28,25,1)]    [200,0]    ["PartyKing",1,[(28,25,1)]]    1    
FamilyPartySitAward    int(min((max(worldLV-reLV,0)*0.05+1),6)*18000*reExp)    int(min(max(worldLV-reLV,0)*0.25,10))
FamilyPartySitAward    int(min((max(worldlv-reLV,0)*0.05+1),6)*18000*reExp)    int(min(max(worldlv-reLV,0)*0.25,10))
FamilyPartyAreaAward    {"Exp":"int(reExp*300)"}    5    60        
FamilyPartyDesk    3200    10    [(3901,150,1)]        
FamilyActive    40|80|120|160|220    10|10|15|25|30            
@@ -241,6 +241,7 @@
ElderBattlefieldTopAward    [[2214,1,1]]                
ElderBattlefieldBuff    [23001,23002,23003,23004]    31609001    [102,105,106,107,108]    3    
CornerPresentedMoney    0    1            
CreateRoleMap    {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt    {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10}    350            
TransportPay    954    1            
GuardFBCageNPCID    32502001    32504001    3        
@@ -268,7 +269,7 @@
XMZZRobotSkill    {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}                
XMZZPKAward    [0,10,20,30,40,50,60,70,80,90]    addPer+100 + int(math.ceil(HPPer/10.0))    50    reExp*216*(100+addPer)/100    reExp*108
PayRMB    10                
OSCBillboardOpen    {"2":[20,1,2],"7":[40,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}    10
OSCBillboardOpen    {"2":[20,1,2],"7":[50,3,3],"3":[12,4,4],"4":[200,5,5],"5":[7,6,6],"6":[1200000,7,7]}    10
OSCRankRedpackAward    {1:80,(2,5):81}                
WeekResetSuccType    []                
InvestCost    {"1":[300],"2":[98],"3":[300,680,1280,1880]}                
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -74,12 +74,12 @@
10403001    1000    205    2    0    [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]    30    {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(2500,1),(10000,2)],5:[(10000,2)]}    [1,3,4,[(8000,1),(10000,2)],107]    []    {2320:100000,2339:20000,2340:80000}    {}    {}    {}    {}    25    800    1077    1615    []    [999,3904]
10503001    1000    300    2    0    [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]}    [1,4,4,[(10000,2)],107]    []    {3801:300000,3802:10000,2320:100000,2340:80000,2339:20000,2404:50000}    {}    {}    {}    {}    25    800    1115    1673    []    [999,3904]
10603001    1000    350    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:16000,9051:3472,2320:100000,2340:80000,2339:20000,2404:60000}    {}    {}    {}    {}    25    800    1123    1685    []    [999,3904]
10703001    290    400    2    0    [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,3803:5000,9051:6173,2320:100000,2340:80000,2339:20000,2404:80000}    {}    {}    {}    {}    25    800    1129    1694    []    [999,3904]
10703001    1000    400    2    0    [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,3803:1000,9051:6173,2320:100000,2340:80000,2339:20000,2404:80000}    {}    {}    {}    {}    25    800    1129    1694    []    [999,3904]
10803001    1000    450    2    0    [(397839,0),(541172,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:2500,9051:7330,2320:100000,2340:80000,2339:20000,2404:100000}    {}    {}    {}    {}    25    800    1129    1694    []    [999,3904]
10903001    1000    500    2    0    [(397839,0),(541172,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:50000,3802:20000,3803:5000,9051:9259,2320:100000,2340:80000,2339:20000,5408:2222,2404:140000}    {}    {}    {}    {}    25    800    1129    1694    []    [998,3904]
11003001    1000    550    2    0    [(397839,0),(541172,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:30000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {}    {}    {}    25    800    1129    1694    []    [998,3904]
11103001    1000    600    2    0    [(397839,0),(541172,(10,2,107)),(1000000,(10,3,107))]    30    {(10,4,107):1000000,(10,5,107):50000,(10,2,108):100000,(10,3,108):10000,(10,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:20000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {}    {}    {}    25    800    1129    1694    []    [998,3904]
10703001    290    400    2    0    [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,3803:5000,9051:6173,2320:100000,2340:80000,2339:20000,2404:80000}    {}    {}    {}    {}    25    800    1129    1694    []    [999,3904]
10703001    1000    400    2    0    [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,3803:1000,9051:6173,2320:100000,2340:80000,2339:20000,2404:80000}    {}    {}    {}    {}    25    800    1129    1694    []    [999,3904]
10803001    1000    450    2    0    [(397839,0),(541172,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:2500,9051:7330,2320:100000,2340:80000,2339:20000,2404:100000}    {}    {}    {}    {}    25    800    1129    1694    []    [999,3904]
10903001    1000    500    2    0    [(397839,0),(541172,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:50000,3802:20000,3803:5000,9051:9259,2320:100000,2340:80000,2339:20000,5408:2222,2404:140000}    {}    {}    {}    {}    25    800    1129    1694    []    [998,3904]
11003001    1000    550    2    0    [(397839,0),(541172,(9,2,107)),(1000000,(9,3,107))]    30    {(9,4,107):1000000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:30000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {}    {}    {}    25    800    1129    1694    []    [998,3904]
11103001    1000    600    2    0    [(397839,0),(541172,(10,2,107)),(1000000,(10,3,107))]    30    {(10,4,107):1000000,(10,5,107):50000,(10,2,108):100000,(10,3,108):10000,(10,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:20000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {}    {}    {}    25    800    1129    1694    []    [998,3904]
30201000    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []
30201001    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []
30201002    0    0    0    0    []    0    {}    0    {}    {}    []    []    {}    {}    {}    {}    {}    0    0    0    0    []    []
@@ -118,32 +118,32 @@
20103002    210    245    2    0    [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]    30    {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(500,1),(10000,2)],5:[(10000,2)]}    [1,3,4,[(10000,2)],107]    []    {2320:100000,2340:80000,2339:20000}    {}    {}    {}    {}    25    800    1077    1615    []    [1005,3904]
20103003    210    260    2    0    [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    [1,4,4,[(10000,2)],107]    []    {3801:300000,2320:100000,2340:80000,2339:20000}    {}    {}    {}    {}    25    800    1115    1673    [1,0,0,[3801]]    [999,3904]
20103004    210    280    2    0    [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]}    [1,4,5,[(10000,2)],107]    []    {3801:300000,2320:100000,5202:420000,2340:80000,2339:20000}    {}    {2:499200}    {}    {2:5}    25    800    1115    1673    []    [999,3904]
20103005    210    315    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4500,1),(10000,2)],5:[(10000,2)]}    [1,5,5,[(10000,2)],107]    []    {3801:300000,3802:50000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000}    {}    {2:582400}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20103005    210    315    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    [1,5,5,[(10000,2)],107]    []    {3801:300000,3802:50000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000}    {}    {2:582400}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20103006    210    335    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    [1,5,5,[(10000,2)],107]    []    {3801:300000,3802:50000,2320:100000,5202:460000,2340:80000,2339:20000,2404:60000}    {}    {2:665600}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20103007    210    365    2    0    [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    [1,6,5,[(10000,2)],107]    []    {3801:300000,3802:50000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000}    {}    {2:748800}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203001    210    355    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203002    210    360    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203003    210    405    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:5000,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203004    210    410    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:5000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203005    210    455    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203006    210    460    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203007    210    505    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {2:800000}    {}    {2:5}    25    800    1588    1962    []    [999,3904]
20103007    210    365    2    0    [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}    [1,6,5,[(10000,2)],107]    []    {3801:300000,3802:50000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000}    {}    {2:748800}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203001    210    355    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203002    210    360    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203003    210    405    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:5000,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203004    210    410    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:5000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203005    210    455    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203006    210    460    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203007    210    505    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:300000,3802:50000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {2:800000}    {}    {2:5}    25    800    1588    1962    []    [999,3904]
20103001    1000    225    2    0    [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]    30    {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(1500,1),(10000,2)],5:[(10000,2)]}    [1,3,4,[(10000,2)],107]    []    {2320:100000,2340:80000,2339:20000}    {}    {}    {}    {}    25    800    1077    1615    []    [999,3904]
20103002    1000    245    2    0    [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]    30    {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(500,1),(10000,2)],5:[(10000,2)]}    [1,3,4,[(10000,2)],107]    []    {2320:100000,2340:80000,2339:20000}    {}    {}    {}    {}    25    800    1077    1615    []    [999,3904]
20103003    1000    260    2    0    [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    [1,4,4,[(10000,2)],107]    []    {3801:300000,2320:100000,2340:80000,2339:20000}    {}    {}    {}    {}    25    800    1115    1673    [1,0,0,[3801]]    [999,3904]
20103004    1000    280    2    0    [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]}    [1,4,5,[(10000,2)],107]    []    {3801:300000,2320:100000,5202:420000,2340:80000,2339:20000}    {}    {2:499200}    {}    {2:5}    25    800    1115    1673    []    [999,3904]
20103005    1000    315    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4500,1),(10000,2)],5:[(10000,2)]}    [1,5,5,[(10000,2)],107]    []    {3801:300000,3802:12000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000}    {}    {2:582400}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20103005    1000    315    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    [1,5,5,[(10000,2)],107]    []    {3801:300000,3802:12000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000}    {}    {2:582400}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20103006    1000    335    2    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    [1,5,5,[(10000,2)],107]    []    {3801:300000,3802:14000,2320:100000,5202:460000,2340:80000,2339:20000,2404:60000}    {}    {2:665600}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20103007    1000    365    2    0    [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    [1,6,5,[(10000,2)],107]    []    {3801:200000,3802:18000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000}    {}    {2:748800}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203001    1000    355    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203002    1000    360    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203003    290    405    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:5000,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203004    290    410    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:5000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203003    1000    405    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:1500,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203004    1000    410    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:2000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203005    1000    455    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:20000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203006    1000    460    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:20000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203007    1000    505    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:20000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {2:800000}    {}    {2:5}    25    800    1588    1962    []    [999,3904]
20103007    1000    365    2    0    [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}    [1,6,5,[(10000,2)],107]    []    {3801:200000,3802:18000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000}    {}    {2:748800}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203001    1000    355    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203002    1000    360    2    0    [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))]    30    {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:200000,3802:20000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000}    {}    {2:800000}    {}    {2:5}    25    800    1123    1685    []    [999,3904]
20203003    290    405    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:5000,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203004    290    410    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:5000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203003    1000    405    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:1500,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203004    1000    410    2    0    [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))]    30    {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:100000,3802:20000,3803:2000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000}    {}    {2:800000}    {}    {2:5}    25    800    1129    1694    []    [999,3904]
20203005    1000    455    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:20000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203006    1000    460    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:20000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000}    {}    {2:800000}    {}    {2:5}    25    800    1356    1824    []    [999,3904]
20203007    1000    505    2    0    [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]    30    {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}    1    {4:4,5:2}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:20000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000}    {}    {2:800000}    {}    {2:5}    25    800    1588    1962    []    [999,3904]
30303001    1000    255    0    0    [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):50000,(4,2,108):50000,(4,3,108):5000,(4,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,2320:50000}    {}    {}    {}    {}    20    800    1123    1685    []    [1004]
30303002    1000    280    0    0    [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]    30    {(4,4,107):1000000,(4,5,107):80000,(4,2,108):50000,(4,3,108):5000,(4,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,2320:50000}    {}    {}    {}    {}    20    800    1129    1694    []    [1004]
30303003    1000    310    0    0    [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]    30    {(5,4,107):1000000,(5,5,107):20000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0}    1    {4:2,5:1}    {3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}    []    []    {3801:80000,3802:5000,2320:50000}    {}    {}    {}    {}    20    800    1129    1694    []    [1004]
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -1,8 +1,8 @@
RangListType    Condition    Gift
2    15    {"1":[[181,15],[4303,2]],"2":[[181,15],[4303,2]],"3":[[181,15],[4303,2]]}
2    10    {"1":[[181,10],[4303,1]],"2":[[181,10],[4303,1]],"3":[[181,10],[4303,1]]}
7    30    {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
7    20    {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
7    40    {"1":[[3502,2],[3512,2]],"2":[[3502,2],[3512,2]],"3":[[3502,2],[3512,2]]}
7    30    {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
3    9    {"1":[[4151,15],[3,2]],"2":[[4151,15],[3,2]],"3":[[4151,15],[3,2]]}
3    6    {"1":[[4151,10],[3,1]],"2":[[4151,10],[3,1]],"3":[[4151,10],[3,1]]}
4    190    {"1":[[106,1],[103,1]],"2":[[106,1],[103,1]],"3":[[106,1],[103,1]]}
db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -122,8 +122,8 @@
562    13    0    4608    1    0    []    0        0    0    0    0    0    25    5000    0    0    ShopBuyBroadcast_2    
563    13    0    912    1    0    []    0        0    0    0    0    0    25    100    0    0    ShopBuyBroadcast_2    
651    14    0    58    1    1    [[194,1,1],[5,1,1],[912,1,1]]    58        0    0    0    1    0    1    188    500    0    Bargaingift1    
652    14    0    4208    1    1    [[4151,60,1],[5,1,1],[913,1,1]]    4208        0    0    0    1    0    1    388    1200    0    Bargaingift2
653    14    0    255    1    1    [[196,1,1],[181,140,1],[913,1,1]]    255        0    0    0    1    0    1    1088    2780    0    Bargaingift3
652    14    0    4208    1    1    [[4151,50,1],[5,1,1],[913,1,1]]    4208        0    0    0    1    0    1    388    1200    0    Bargaingift2
653    14    0    255    1    1    [[196,1,1],[181,80,1],[913,1,1]]    255        0    0    0    1    0    1    1088    2780    0    Bargaingift3
701    15    0    912    1    1    [[142,300,1]]    142        0    0    106    1    0    1    188    600    1    OpenTakePreferential1    
702    15    0    982    10    1    []    982        0    0    106    1    0    1    888    2500    1    OpenTakePreferential2    
703    15    0    2343    1    1    []    2343        0    0    106    1    0    1    188    500    2    OpenTakePreferential1    
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
New file
@@ -0,0 +1,13 @@
TemplateID    NeedRechargeGold    AwardIndex    AwardItem    NotifyKey
1    128    0    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
1    588    1    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
1    1588    2    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
1    5000    3    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate2
2    60    0    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
2    150    1    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
2    300    2    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
2    1500    3    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate2
3    60    0    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
3    150    1    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
3    300    2    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate3
3    1500    3    {"1":[[199,1,1]],"2":[[199,1,1]],"3":[[199,1,1]]}    ConsumptionRebate2
db/PyMongoDataServer/PySysDB/tagVIPAward.txt
@@ -2,8 +2,8 @@
1    {"1":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"2":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]],"3":[[2122,1,1],[911,1,1],[2,2,1],[923,1,1],[181,10,1]]}    88    500
2    {"1":[[206,1,1],[912,1,1],[3,1,1],[923,1,1],[4151,20,1]],"2":[[206,1,1],[912,1,1],[3,1,1],[923,1,1],[4151,20,1]],"3":[[206,1,1],[912,1,1],[3,1,1],[923,1,1],[4151,20,1]]}    188    800
3    {"1":[[2123,1,1],[106,1,1],[913,1,1],[3,2,1],[181,40,1]],"2":[[2123,1,1],[106,1,1],[913,1,1],[3,2,1],[181,40,1]],"3":[[2123,1,1],[106,1,1],[913,1,1],[3,2,1],[181,40,1]]}    388    1500
4    {"1":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,80,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,80,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,80,1]]}    588    2000
5    {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,100,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,100,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,100,1]]}    1288    4000
4    {"1":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,50,1]],"2":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,50,1]],"3":[[254,1,1],[912,1,1],[3,3,1],[103,3,1],[181,50,1]]}    588    2000
5    {"1":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,70,1]],"2":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,70,1]],"3":[[4212,1,1],[913,1,1],[3504,1,1],[3514,2,1],[4151,70,1]]}    1288    4000
6    {"1":[[2124,1,1],[913,1,1],[3505,1,1],[3515,2,1],[5,1,1]],"2":[[2124,1,1],[913,1,1],[3505,1,1],[3515,2,1],[5,1,1]],"3":[[2124,1,1],[913,1,1],[3505,1,1],[3515,2,1],[5,1,1]]}    1888    6000
7    {"1":[[202,1,1],[3505,2,1],[3515,2,1],[3807,1,1],[7,1,1]],"2":[[202,1,1],[3505,2,1],[3515,2,1],[3807,1,1],[7,1,1]],"3":[[202,1,1],[3505,2,1],[3515,2,1],[3807,1,1],[7,1,1]]}    2888    10000
8    {"1":[[4189,1,1],[3506,1,1],[3516,2,1],[4151,150,1],[7,1,1]],"2":[[4189,1,1],[3506,1,1],[3516,2,1],[4151,150,1],[7,1,1]],"3":[[4189,1,1],[3506,1,1],[3516,2,1],[4151,150,1],[7,1,1]]}    6888    15000