From afb2b110b6701bb7f981787ba9c8feb596a6c39d Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 01 三月 2019 20:27:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 30 +++++++++++++++---------------
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 16 ++++++++--------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2 +-
6 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 11c313e..0b15c23 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -9,7 +9,7 @@
BourseSaleLimit 8 1440 21600 0 0
BourseUpdataCD 2000
BourseMaxRecord 30
-AuctionHouse 1 20 30 180
+AuctionHouse 0 20 30 180 10
AuctionTaxrate 15 8 10
CreatRolePoint1 2_54|3_18|4_15|5_8 0 0 0 0
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index 65171e1..ba7a0e9 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc
index 2c97c14..7c3427b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b1f08c8..6f2f8b6 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -66,7 +66,7 @@
Coins1 万 亿 0 0 0
BoursePriceLimit 2 100000000
BourseCharge 1 0
-AuctionItem 24 10
+AuctionItem 24 0
SkillXPAddByFB 31090|31060|31250 0 0 0 0
PassSkillEquipLimit {"0":{"level":70},"1":{"level":70},"2":{"OpenSkillSlots":2},"3":{"OpenSkillSlots":3},"4":{"OpenSkillSlots":4},"5":{"OpenSkillSlots":5}} 6 3 2_20005|3_20006|4_20007|5_20008
TalentResetBook 948 380
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index e0fe8ad..69d77a4 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -8,7 +8,7 @@
100 7 293 6|7|23 3135|156|20 0
100 8 314 6|7|23 3580|179|20 0
100 9 332 6|7|23 4026|201|20 0
-100 10 0 6|7|23 4474|223|20 49101 MountUpLv0
+100 10 0 6|7|23 4474|223|20 49101 MountUpLv
101 1 163 6|7|23 1679|83|40 0
101 2 193 6|7|23 2334|116|40 0
101 3 225 6|7|23 3002|150|40 0
@@ -28,7 +28,7 @@
101 17 1106 6|7|23 13238|661|40 0
101 18 1191 6|7|23 14041|702|40 0
101 19 1275 6|7|23 14862|743|40 0
-101 20 1490 6|7|23 15704|785|40 49202 MountUpLv13
+101 20 1490 6|7|23 15704|785|40 49202 MountUpLv1
101 21 1704 6|7|23 16577|828|40 0
101 22 2048 6|7|23 17475|873|40 0
101 23 2513 6|7|23 18407|920|40 0
@@ -78,7 +78,7 @@
301 17 1556 6|7|23 29036|1451|60 0
301 18 1676 6|7|23 30395|1519|60 0
301 19 1792 6|7|23 31784|1589|60 0
-301 20 1852 6|7|23 33209|1660|60 49407 MountUpLv15
+301 20 1852 6|7|23 33209|1660|60 49407 MountUpLv2
301 21 1912 6|7|23 34637|1731|60 0
301 22 2008 6|7|23 36073|1803|60 0
301 23 2137 6|7|23 37510|1875|60 0
@@ -198,7 +198,7 @@
303 17 1867 6|7|23 29480|1474|60 0
303 18 2011 6|7|23 30947|1547|60 0
303 19 2151 6|7|23 32447|1622|60 0
-303 20 2223 6|7|23 33986|1699|60 49417 MountUpLv17
+303 20 2223 6|7|23 33986|1699|60 49417 MountUpLv2
303 21 2295 6|7|23 35528|1776|60 0
303 22 2410 6|7|23 37078|1853|60 0
303 23 2565 6|7|23 38630|1931|60 0
@@ -233,7 +233,7 @@
304 17 1867 6|7|23 29248|1462|60 0
304 18 2011 6|7|23 30715|1535|60 0
304 19 2151 6|7|23 32215|1610|60 0
-304 20 2223 6|7|23 33754|1687|60 49422 MountUpLv18
+304 20 2223 6|7|23 33754|1687|60 49422 MountUpLv2
304 21 2295 6|7|23 35296|1764|60 0
304 22 2410 6|7|23 36846|1842|60 0
304 23 2565 6|7|23 38398|1919|60 0
@@ -268,7 +268,7 @@
402 17 3043 6|7|23 84691|4234|80 0
402 18 3277 6|7|23 86783|4339|80 0
402 19 3506 6|7|23 88922|4446|80 0
-402 20 3623 6|7|23 91117|4555|80 49622 MountUpLv19
+402 20 3623 6|7|23 91117|4555|80 49622 MountUpLv16
402 21 3740 6|7|23 93317|4665|80 0
402 22 3928 6|7|23 95527|4776|80 0
402 23 4181 6|7|23 97741|4887|80 0
@@ -278,7 +278,7 @@
402 27 5058 6|7|23 106639|5331|80 0
402 28 5275 6|7|23 108880|5444|80 0
402 29 5487 6|7|23 111129|5556|80 0
-402 30 6027 6|7|23 113390|5669|80 49623 MountUpLv20
+402 30 6027 6|7|23 113390|5669|80 49623 MountUpLv13
402 31 6568 6|7|23 115858|5792|80 0
402 32 7432 6|7|23 118949|5947|80 0
402 33 8600 6|7|23 122207|6110|80 0
@@ -318,7 +318,7 @@
305 17 1556 6|7|23 25277|1263|60 0
305 18 1676 6|7|23 26499|1324|60 0
305 19 1792 6|7|23 27749|1387|60 0
-305 20 1852 6|7|23 29032|1451|60 49427 MountUpLv21
+305 20 1852 6|7|23 29032|1451|60 49427 MountUpLv2
305 21 1912 6|7|23 30317|1515|60 0
305 22 2008 6|7|23 31609|1580|60 0
305 23 2137 6|7|23 32902|1645|60 0
@@ -353,7 +353,7 @@
306 17 2536 6|7|23 62007|3100|80 0
306 18 2731 6|7|23 63945|3197|80 0
306 19 2922 6|7|23 65926|3296|80 0
-306 20 3019 6|7|23 67959|3397|80 49602 MountUpLv22
+306 20 3019 6|7|23 67959|3397|80 49602 MountUpLv16
306 21 3117 6|7|23 69995|3499|80 0
306 22 3273 6|7|23 72042|3602|80 0
306 23 3484 6|7|23 74092|3704|80 0
@@ -403,7 +403,7 @@
307 17 1328 6|7|23 16043|802|40 0
307 18 1430 6|7|23 17006|850|40 0
307 19 1530 6|7|23 17991|899|40 0
-307 20 1788 6|7|23 19002|950|40 49212 MountUpLv24
+307 20 1788 6|7|23 19002|950|40 49212 MountUpLv1
307 21 2045 6|7|23 20050|1002|40 0
307 22 2458 6|7|23 21127|1056|40 0
307 23 3015 6|7|23 22245|1112|40 0
@@ -428,7 +428,7 @@
308 17 1867 6|7|23 39392|1969|60 0
308 18 2011 6|7|23 41022|2051|60 0
308 19 2151 6|7|23 42689|2134|60 0
-308 20 2223 6|7|23 44400|2220|60 49402 MountUpLv12
+308 20 2223 6|7|23 44400|2220|60 49402 MountUpLv2
308 21 2295 6|7|23 46113|2305|60 0
308 22 2410 6|7|23 47836|2391|60 0
308 23 2565 6|7|23 49561|2478|60 0
@@ -463,7 +463,7 @@
309 17 1328 6|7|23 21538|1076|40 0
309 18 1430 6|7|23 22712|1135|40 0
309 19 1530 6|7|23 23912|1195|40 0
-309 20 1788 6|7|23 25144|1257|40 49217 MountUpLv26
+309 20 1788 6|7|23 25144|1257|40 49217 MountUpLv1
309 21 2045 6|7|23 26421|1321|40 0
309 22 2458 6|7|23 27734|1386|40 0
309 23 3015 6|7|23 29095|1454|40 0
@@ -488,7 +488,7 @@
310 17 1867 6|7|23 39392|1969|60 0
310 18 2011 6|7|23 41022|2051|60 0
310 19 2151 6|7|23 42689|2134|60 0
-310 20 2223 6|7|23 44400|2220|60 49432 MountUpLv12
+310 20 2223 6|7|23 44400|2220|60 49432 MountUpLv2
310 21 2295 6|7|23 46113|2305|60 0
310 22 2410 6|7|23 47836|2391|60 0
310 23 2565 6|7|23 49561|2478|60 0
@@ -513,7 +513,7 @@
311 7 439 6|7|23 4540|227|20 0
311 8 472 6|7|23 5208|260|20 0
311 9 498 6|7|23 5877|293|20 0
-311 10 0 6|7|23 6549|327|20 49106 MountUpLv28
+311 10 0 6|7|23 6549|327|20 49106 MountUpLv
312 1 276 6|7|23 26312|1315|60 0
312 2 325 6|7|23 28511|1425|60 0
312 3 381 6|7|23 30754|1537|60 0
@@ -533,7 +533,7 @@
312 17 1867 6|7|23 65113|3255|60 0
312 18 2011 6|7|23 67808|3390|60 0
312 19 2151 6|7|23 70563|3528|60 0
-312 20 2223 6|7|23 73391|3669|60 49437 MountUpLv12
+312 20 2223 6|7|23 73391|3669|60 49437 MountUpLv2
312 21 2295 6|7|23 76224|3811|60 0
312 22 2410 6|7|23 79071|3953|60 0
312 23 2565 6|7|23 81922|4096|60 0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 90908b2..93398b8 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -1,7 +1,7 @@
ID Quality UnlockSys UnLockNeedItemID UnLockNeedItemCnt DecomposeExp InitRank MaxRank UseNeedRank SkillID SkillUnLock SkillUnLockSys InitFightPower
-50106001 2 GetPet13 4201 1 1000 1 10 1 48200|48201 4|10 ['PetUpLv','PetUpLv','PetUpLv'] 1620
-50106002 2 GetPet 4202 1 1000 1 10 4 48205|48206 4|10 ['PetUpLv','PetUpLv','PetUpLv'] 1620
-50106307 2 GetPet1 4215 1 1000 1 10 6 48210|48211 4|10 ['PetUpLv','PetUpLv','PetUpLv'] 2267
+50106001 2 GetPet13 4201 1 1000 1 10 1 48200|48201 4|10 ['PetUpLv','PetUpLv'] 1620
+50106002 2 GetPet 4202 1 1000 1 10 4 48205|48206 4|10 ['PetUpLv','PetUpLv'] 1620
+50106307 2 GetPet1 4215 1 1000 1 10 6 48210|48211 4|10 ['PetUpLv','PetUpLv'] 2267
50106308 3 GetPet17 4216 1 1000 1 25 6 48300|48301|48302 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 13915
50106312 3 GetPet18 4220 1 1000 1 25 6 48305|48306|48307 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 16371
50106101 3 GetPet2 4203 1 1000 1 25 6 48310|48311|48312 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 6139
@@ -18,8 +18,8 @@
50106310 4 GetPet15 4218 1 1000 1 35 6 48520|48521|48522|48523 4|10|20|30 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv12'] 28426
50106314 4 GetPet20 4222 1 1000 1 35 6 48525|48526|48527|48528 4|10|20|30 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv9'] 32743
50106315 4 GetPet21 4223 1 1000 1 35 6 48530|48531|48532|48533 4|10|20|30 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv10'] 32743
-50106309 5 GetPet14 4217 1 1000 1 50 6 48700|48701|48702|48703|48704 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv11'] 136445
-50106301 5 GetPet8 4206 1 1000 1 50 6 48710|48711|48712|48713|48714 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv4'] 170557
-50106302 5 GetPet9 4207 1 1000 1 50 6 48720|48721|48722|48723|48724 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv5'] 163699
-50106304 5 GetPet10 4210 1 1000 1 50 6 48730|48731|48732|48733|48734 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv6'] 102334
-50106316 5 GetPet25 4226 1 1000 1 50 6 48740|48741|48742|48743|48744 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv13'] 254894
+50106309 5 GetPet14 4217 1 1000 1 50 6 48700|48701|48702|48703|48704 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv14','PetUpLv11'] 136445
+50106301 5 GetPet8 4206 1 1000 1 50 6 48710|48711|48712|48713|48714 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv15','PetUpLv4'] 170557
+50106302 5 GetPet9 4207 1 1000 1 50 6 48720|48721|48722|48723|48724 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv16','PetUpLv5'] 163699
+50106304 5 GetPet10 4210 1 1000 1 50 6 48730|48731|48732|48733|48734 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv17','PetUpLv6'] 102334
+50106316 5 GetPet25 4226 1 1000 1 50 6 48740|48741|48742|48743|48744 4|10|20|30|40 ['PetUpLv','PetUpLv','PetUpLv','PetUpLv18','PetUpLv13'] 254894
--
Gitblit v1.8.0