From 899742e9e74e634eaa62b7dbcc8a8211b5a23250 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 31 八月 2018 16:49:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 51 +++++++++++++------------
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc | 0
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc | 0
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 6 +-
CoreServerGroup/GameServer/PySysDB/tagFamily.txt | 22 +++++-----
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 3 +
12 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamily.txt b/CoreServerGroup/GameServer/PySysDB/tagFamily.txt
index 03306b8..0b1761e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFamily.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFamily.txt
@@ -1,11 +1,11 @@
-familyLV memberCnt deputyLeaderCnt eliteCnt needMoney weekMissionMoneyMax
-1 30 1 5 930000 16275000
-2 32 1 5 1860000 17360000
-3 34 1 5 3022500 18445000
-4 36 1 5 5812500 19530000
-5 38 1 5 15112500 20615000
-6 40 1 5 24180000 21700000
-7 42 1 5 48360000 22785000
-8 44 1 5 120900000 23870000
-9 46 1 5 362700000 24955000
-10 48 1 5 465000000 26040000
+familyLV memberCnt deputyLeaderCnt eliteCnt needMoney weekMissionMoneyMax bossFBCnt
+1 30 1 5 930000 16275000 1
+2 32 1 5 1860000 17360000 2
+3 34 1 5 3022500 18445000 3
+4 36 1 5 5812500 19530000 3
+5 38 1 5 15112500 20615000 4
+6 40 1 5 24180000 21700000 4
+7 42 1 5 48360000 22785000 5
+8 44 1 5 120900000 23870000 5
+9 46 1 5 362700000 24955000 6
+10 48 1 5 465000000 26040000 6
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index 85b1f81..ba85114 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index e399673..c893cbe 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 59f68c4..589f7f2 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc
index 0098034..46ed178 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index fd438e0..334979e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -26,6 +26,7 @@
# suppressRealmHurtPer 境界压制加成百分比，存在负数, 配表获取
# isLuckyHit 是否会心一击 0否1是
# isSuperHit 是否暴击 0否1是
+# wReFightPower 世界等级对应等级表参考战力 固定值
#
# 攻击方：
# aLV 等级 固定值
@@ -129,7 +130,7 @@
"EVP_1_31190" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#抢boss
- "PVE_1_5" :"int(aReFightPower/15.0+SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
+ "PVE_1_5" :"int(wReFightPower/15.0+SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 6ca15ff..357c9ff 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc
index 5962fb2..8ef0728 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestManager.pyc
Binary files differ
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 3fbb673..0a4ce63 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/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 52d6cff..16a5e98 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -263,7 +263,7 @@
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
TreasureSet11 [1, 10] [248, 1984] [[982,1], [982, 8]] [0, 0] [10, 100]
-TreasureSet21 max(baseRate,int(min(curLuck,30)*1+min(max(curLuck-30,0),10)*2+min(max(curLuck-40,0),20)*5)) [1, 10] 1000
+TreasureSet21 max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10)) [1, 10] 1000
TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 8]] [1440, 0] [5, 50]
TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
OpenServerRedPacketType 5
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index af8e328..8bfe2e1 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -205,28 +205,29 @@
204 9016 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
205 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
206 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
-207 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1 1
-208 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2 1
-209 3502 0 0 3501 3 0 10000 0 0 0 1
-210 3503 0 0 3502 3 0 10000 0 0 0 1
-211 3504 0 0 3503 3 0 10000 0 0 0 1
-212 3505 0 0 3504 3 0 10000 0 0 0 1
-213 3506 0 0 3505 3 0 10000 0 0 0 1
-214 3507 0 0 3506 3 0 10000 0 0 0 1
-215 3508 0 0 3507 3 0 10000 0 0 0 1
-216 3512 0 0 3511 3 0 10000 0 0 0 1
-217 3513 0 0 3512 3 0 10000 0 0 0 1
-218 3514 0 0 3513 3 0 10000 0 0 0 1
-219 3515 0 0 3514 3 0 10000 0 0 0 1
-220 3516 0 0 3515 3 0 10000 0 0 0 1
-221 3517 0 0 3516 3 0 10000 0 0 0 1
-222 3518 0 0 3517 3 0 10000 0 0 0 1
-223 5012 0 0 5301 5 0 10000 0 0 0 1
-224 5022 0 0 5301 5 0 10000 0 0 0 1
-225 250 0 0 224 5 0 10000 0 0 EquipComposeSuccess3 2
-226 260 0 0 222 10 0 10000 0 0 EquipComposeSuccess3 2
-227 258 0 0 223 30 0 10000 0 0 EquipComposeSuccess3 2
-228 4202 0 0 4253 3 0 10000 0 0 EquipComposeSuccess3 2
-229 4213 0 0 4252 5 0 10000 0 0 EquipComposeSuccess3 2
-230 4209 0 0 4250 10 0 10000 0 0 EquipComposeSuccess3 2
-231 4210 0 0 4251 30 0 10000 0 0 EquipComposeSuccess3 2
+207 9075 9074 3 0 0 0 10000 0 0 EquipComposeSuccess6 1
+208 9077 9075 3 0 0 0 10000 0 0 EquipComposeSuccess1 1
+209 9078 9077 3 0 0 0 10000 0 0 EquipComposeSuccess2 1
+210 3502 0 0 3501 3 0 10000 0 0 0 1
+211 3503 0 0 3502 3 0 10000 0 0 0 1
+212 3504 0 0 3503 3 0 10000 0 0 0 1
+213 3505 0 0 3504 3 0 10000 0 0 0 1
+214 3506 0 0 3505 3 0 10000 0 0 0 1
+215 3507 0 0 3506 3 0 10000 0 0 0 1
+216 3508 0 0 3507 3 0 10000 0 0 0 1
+217 3512 0 0 3511 3 0 10000 0 0 0 1
+218 3513 0 0 3512 3 0 10000 0 0 0 1
+219 3514 0 0 3513 3 0 10000 0 0 0 1
+220 3515 0 0 3514 3 0 10000 0 0 0 1
+221 3516 0 0 3515 3 0 10000 0 0 0 1
+222 3517 0 0 3516 3 0 10000 0 0 0 1
+223 3518 0 0 3517 3 0 10000 0 0 0 1
+224 5012 0 0 5301 5 0 10000 0 0 0 1
+225 5022 0 0 5301 5 0 10000 0 0 0 1
+226 250 0 0 224 5 0 10000 0 0 EquipComposeSuccess3 2
+227 260 0 0 222 10 0 10000 0 0 EquipComposeSuccess3 2
+228 258 0 0 223 30 0 10000 0 0 EquipComposeSuccess3 2
+229 4202 0 0 4253 3 0 10000 0 0 EquipComposeSuccess3 2
+230 4213 0 0 4252 5 0 10000 0 0 EquipComposeSuccess3 2
+231 4209 0 0 4250 10 0 10000 0 0 EquipComposeSuccess3 2
+232 4210 0 0 4251 30 0 10000 0 0 EquipComposeSuccess3 2
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index c0822be..bd6caec 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,7 +1,7 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-1 0 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} 1
-1 200 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} 1
-1 250 {"1":[9075,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} 1
+1 0 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} 1
+1 200 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} 1
+1 250 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[2329,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} 1
2 0 {"1":[4425,1],"2":[4394,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4385,1],"8":[2332,1],"9":[4334,1],"10":[4384,1],"11":[4304,20],"12":[4395,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
2 200 {"1":[4425,1],"2":[4354,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4365,1],"8":[2332,1],"9":[4334,1],"10":[4364,1],"11":[4304,20],"12":[4355,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
2 250 {"1":[4425,1],"2":[4359,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4390,1],"8":[2332,1],"9":[4334,1],"10":[4389,1],"11":[4304,20],"12":[4360,1],"13":[2331,1],"14":[4305,10]} [] [(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)] [(1000,8),(3000,6),(6000,9),(10000,2)] {1:[(1000,2),(7000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]} [(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)] [(1000,3),(2000,5),(6000,8),(10000,12)] {1:[(1000,6),(7000,8),(10000,9)]} 1
--
Gitblit v1.8.0