From 52d3c5885a4c25730bddc486d932ffadec576d96 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期三, 10 十月 2018 15:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc | 0
db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 40 ++++++------
db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 16 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 59 +++++++++++++++++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0
db/PyMongoDataServer/Common/CommFunc.pyc | 0
db/PyMongoDataServer/PySysDB/tagHorse.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.pyc | 0
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 10 +-
db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc | 0
17 files changed, 88 insertions(+), 41 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
index 18099d2..8a32934 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
index 9b70235..7f5d0f4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index 161df97..56c6568 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc
index 1868338..3abe19d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyWar.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.pyc
index 0028a75..9efcadd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ManorWar.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc
index 273ab67..1702fb5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 1f2638e..264905c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
index f158c01..0fbdd81 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index 2c36629..cff2005 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/Common/CommFunc.pyc b/db/PyMongoDataServer/Common/CommFunc.pyc
index 15c87df..e0dd0c6 100644
--- a/db/PyMongoDataServer/Common/CommFunc.pyc
+++ b/db/PyMongoDataServer/Common/CommFunc.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
index 71693d8..dbe464c 100644
--- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
+++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5612588..c66de8f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -294,5 +294,5 @@
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 2 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
SamboSpecialUnlock 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018
-BindJadeWheelCfg 88 {"1":110,"2":130,"3":150,"4":150,"5":200,"6":200,"7":300,"8":300,"9":588} [(3879,1),(7379,2),(8379,3),(9379,4),(9679,5),(9979,6),(9989,7),(9999,8),(10000)] {1:[(6000,3),(10000,5)]} [[0,20],[20,40],[40,60],[60,80],[80,100],[100,120],[120,140],[140,200],[200,360]]
+BindJadeWheelCfg 88 {"1":110,"2":130,"3":150,"4":150,"5":200,"6":200,"7":300,"8":300,"9":588} [(3879,1),(7379,2),(8379,3),(9379,4),(9679,5),(9979,6),(9989,7),(9999,8),(10000,9)] {1:[(6000,3),(10000,5)]} [[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
BindJadeWheelNotice 150
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index 930e290..240a038 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -13,3 +13,5 @@
307 291 261 1 1 30 1 3 2116 GetMount11
308 292 262 1 1 40 1 4 6048 GetMount12
309 293 263 1 1 30 1 3 3528 GetMount13
+310 294 264 1 1 40 1 4 2116 GetMount14
+311 295 265 1 1 20 1 2 2116 GetMount15
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 92f9b27..6ec60e1 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -579,23 +579,23 @@
310 48 24677 6|7|23 203605|10180|80 0
310 49 25511 6|7|23 211008|10550|80 0
310 50 0 6|7|23 218656|10932|80 0
-311 1 1945 6|7|23 10584|529|80 0
-311 2 2111 6|7|23 12140|607|80 0
-311 3 2291 6|7|23 13776|688|80 0
-311 4 2486 6|7|23 15495|774|80 49150
-311 5 2694 6|7|23 17297|864|80 0
-311 6 2915 6|7|23 19183|959|80 0
-311 7 3151 6|7|23 21204|1060|80 0
-311 8 3400 6|7|23 23366|1168|80 0
-311 9 3663 6|7|23 25675|1283|80 0
-311 10 3940 6|7|23 28137|1406|80 49155
-311 11 4231 6|7|23 30757|1537|80 0
-311 12 4535 6|7|23 33501|1675|80 0
-311 13 4853 6|7|23 36368|1818|80 0
-311 14 5185 6|7|23 39355|1967|80 0
-311 15 5531 6|7|23 42462|2123|80 0
-311 16 5891 6|7|23 45684|2284|80 0
-311 17 6264 6|7|23 49018|2450|80 0
-311 18 6651 6|7|23 52461|2623|80 0
-311 19 7052 6|7|23 56006|2800|80 0
-311 20 7467 6|7|23 59649|2982|80 49160
+311 1 493 6|7|23 1764|88|40 0
+311 2 535 6|7|23 2553|127|40 0
+311 3 581 6|7|23 3384|169|40 0
+311 4 630 6|7|23 4257|212|40 49195
+311 5 683 6|7|23 5172|258|40 0
+311 6 740 6|7|23 6129|306|40 0
+311 7 799 6|7|23 7155|357|40 0
+311 8 863 6|7|23 8252|412|40 0
+311 9 929 6|7|23 9424|471|40 0
+311 10 1000 6|7|23 10674|533|40 49200
+311 11 1073 6|7|23 12004|600|40 0
+311 12 1151 6|7|23 13397|669|40 0
+311 13 1231 6|7|23 14852|742|40 0
+311 14 1316 6|7|23 16368|818|40 0
+311 15 1403 6|7|23 17945|897|40 0
+311 16 1495 6|7|23 19581|979|40 0
+311 17 1590 6|7|23 21274|1063|40 0
+311 18 1688 6|7|23 23021|1151|40 0
+311 19 1790 6|7|23 24821|1241|40 0
+311 20 1895 6|7|23 26670|1333|40 49205
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index b66e9ff..0571c7f 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -16,8 +16,8 @@
50106309 5 GetPet14 4217 1 1000 1 50 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
50106310 4 GetPet15 4218 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
50106311 3 GetPet16 4219 1 1000 1 30 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
-50106312 3 GetPet17 4220 1 1000 1 30 6 48470|48475|48480 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2448
-50106308 2 GetPet13 4216 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
-50106313 4 GetPet18 4221 1 1000 1 40 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
-50106314 4 GetPet19 4222 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
-50106315 4 GetPet20 4223 1 1000 1 40 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
+50106308 2 GetPet17 4216 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
+50106312 3 GetPet18 4220 1 1000 1 30 6 48470|48475|48480 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2448
+50106313 4 GetPet19 4221 1 1000 1 40 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
+50106314 4 GetPet20 4222 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
+50106315 4 GetPet21 4223 1 1000 1 40 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 7e0569a..1ec5d88 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -68,7 +68,6 @@
351 48 12 0 0 3_100000 0 0 107 10
352 39 1 4|4 0 3_100000 0 0 107 10
353 2 40 0 0 3_100000 0 0 107 10
-354 54 1 1|1|2 0 3_100000 0 0 107 10
361 50 5 0 0 3_100000 0 0 107 10
363 81 20 31080 0 3_100000 0 0 107 10
364 36 1 60203008 0 3_100000 0 0 107 10
@@ -86,6 +85,7 @@
406 58 1 50106001|15 0 3_100000 0 0 108 10
407 42 1 308 0 3_100000 0 0 108 10
408 128 2 0 0 3_100000 0 0 108 10
+409 54 1 1|1|2 0 3_100000 0 0 108 10
421 50 6 0 0 3_100000 0 0 108 10
422 91 5 50005|55005|60005 0 3_100000 0 0 108 10
423 91 5 50105|55105|60105 0 3_100000 0 0 108 10
@@ -210,8 +210,6 @@
643 36 1 60203013 0 3_200000 0 0 110 10
644 62 1 86 0 3_200000 0 0 110 10
645 63 1 6 0 3_200000 0 0 110 10
-646 125 12 0 0 3_200000 0 0 110 10
-647 125 14 0 0 3_200000 0 0 110 10
648 127 6 6 0 3_200000 0 0 110 10
649 127 12 6 0 3_200000 0 0 110 10
650 127 18 6 0 3_200000 0 0 110 10
@@ -227,9 +225,6 @@
661 50 15 0 0 3_200000 0 0 110 10
662 70 1 6 0 3_200000 0 0 110 10
663 62 1 98 0 3_200000 0 0 110 10
-664 125 16 0 0 3_200000 0 0 110 10
-665 125 18 0 0 3_200000 0 0 110 10
-666 125 20 0 0 3_200000 0 0 110 10
667 127 30 6 0 3_200000 0 0 110 10
668 127 36 6 0 3_200000 0 0 110 10
669 127 42 6 0 3_200000 0 0 110 10
@@ -238,12 +233,25 @@
672 127 60 6 0 3_200000 0 0 110 10
673 49 1 6 0 3_200000 0 0 110 10
674 42 1 804 0 3_200000 0 0 110 10
-675 42 1 808 0 3_200000 0 0 110 10
676 26 380 0 0 3_200000 0 0 110 10
677 26 400 0 0 3_200000 0 0 110 10
678 92 5 5|1|1 0 3_200000 0 0 110 10
679 63 1 8 0 3_200000 0 0 110 10
680 124 1 1|5|3 0 3_200000 0 0 110 10
+681 129 1 1 0 3_200000 0 0 110 10
+682 129 1 2 0 3_200000 0 0 110 10
+683 129 1 3 0 3_200000 0 0 110 10
+684 129 1 4 0 3_200000 0 0 110 10
+685 131 1 20302002 0 3_200000 0 0 110 10
+686 131 2 20302002 0 3_200000 0 0 110 10
+687 131 10 20302001 0 3_200000 0 0 110 10
+688 131 20 20302001 0 3_200000 0 0 110 10
+689 131 30 20302001 0 3_200000 0 0 110 10
+690 131 40 20302001 0 3_200000 0 0 110 10
+691 130 10 0 0 3_200000 0 0 110 10
+692 130 20 0 0 3_200000 0 0 110 10
+693 130 40 0 0 3_200000 0 0 110 10
+694 130 60 0 0 3_200000 0 0 110 10
701 1 70 0 0 0 0 0 0
702 1 100 0 0 0 0 0 0
703 1 125 0 0 0 0 0 0
@@ -355,3 +363,40 @@
984 119 64000 0 2213_1 0 0
985 119 72000 0 4609_1 0 0
986 119 80000 0 2213_1 0 0
+1001 50 16 0 0 3_200000 0 0 111 10
+1002 62 1 134 0 3_200000 0 0 111 10
+1003 36 1 60203014 0 3_200000 0 0 111 10
+1004 39 1 7|5 0 3_200000 0 0 111 10
+1005 130 80 0 0 3_200000 0 0 111 10
+1021 50 17 0 0 3_200000 0 0 111 10
+1022 129 1 5 0 3_200000 0 0 111 10
+1023 131 10 20302002 0 3_200000 0 0 111 10
+1024 131 12 20302002 0 3_200000 0 0 111 10
+1025 131 14 20302002 0 3_200000 0 0 111 10
+1026 130 120 0 0 3_200000 0 0 111 10
+1027 39 2 7|5 0 3_200000 0 0 111 10
+1028 62 1 182 0 3_200000 0 0 111 10
+1029 42 1 808 0 3_200000 0 0 111 10
+1030 92 2 6|1|1 0 3_200000 0 0 111 10
+1031 71 1 6 0 3_200000 0 0 111 10
+1041 50 18 0 0 3_200000 0 0 111 10
+1042 62 1 236 0 3_200000 0 0 111 10
+1043 36 1 60203015 0 3_200000 0 0 111 10
+1044 129 1 6 0 3_200000 0 0 111 10
+1045 131 16 20302002 0 3_200000 0 0 111 10
+1046 131 18 20302002 0 3_200000 0 0 111 10
+1047 131 20 20302002 0 3_200000 0 0 111 10
+1048 130 160 0 0 3_200000 0 0 111 10
+1049 39 3 7|5 0 3_200000 0 0 111 10
+1050 42 1 904 0 3_200000 0 0 111 10
+1051 92 3 6|1|1 0 3_200000 0 0 111 10
+1052 70 1 7 0 3_200000 0 0 111 10
+1061 50 19 0 0 3_200000 0 0 111 10
+1062 62 1 284 0 3_200000 0 0 111 10
+1063 129 1 7 0 3_200000 0 0 111 10
+1064 130 200 0 0 3_200000 0 0 111 10
+1065 42 1 908 0 3_200000 0 0 111 10
+1066 39 4 7|5 0 3_200000 0 0 111 10
+1067 39 5 7|5 0 3_200000 0 0 111 10
+1068 92 5 6|1|1 0 3_200000 0 0 111 10
+1069 71 1 7 0 3_200000 0 0 111 10
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 7a930c5..594a049 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -21,10 +21,10 @@
107 1 50 2
107 2 100 6_15000
107 3 110 3
-107 4 130 50500|55500|60500
+107 4 120 50500|55500|60500
108 0 0
108 1 80 7_500
-108 2 120 4
+108 2 130 4
108 3 150 6
108 4 180 50600|55600|60600
109 0 0
@@ -35,8 +35,8 @@
110 0 0
110 1 70 7_500
110 2 150 8
-110 3 180 10
-110 4 200 50800|55800|60800
+110 3 200 10
+110 4 260 50800|55800|60800
201 0 0 50900|55900|60900
202 0 0 50901|55901|60901
203 0 0 50902|55902|60902
@@ -60,10 +60,10 @@
307 0 0 60_3000
308 0 0 18_2000
111 0 0
-111 1 80
-111 2 170 7_1000
-111 3 220
-111 4 220 20049|20049|20049
+111 1 50 6_20000
+111 2 90 9
+111 3 110 1
+111 4 120 51000|56000|61000
112 0 0
112 1 80
112 2 170 7_1000
--
Gitblit v1.8.0