From 05cc42cc23454e9078c87f1af2950ca0f3042da7 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 05 三月 2019 21:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt | 24 +++++++----
db/PyMongoDataServer/SysDB/tagChinItem.txt | 5 ++
db/PyMongoDataServer/PySysDB/tagEquipStarUp.txt | 72 ++++++++++++++++++++++++++++++++----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
4 files changed, 85 insertions(+), 18 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipStarUp.txt b/db/PyMongoDataServer/PySysDB/tagEquipStarUp.txt
index 7734e5d..c683ffb 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipStarUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipStarUp.txt
@@ -1,9 +1,65 @@
Level EquipPlace Star CostEquipPlace CostEquipColor CostEquipCnt SuitTotalRate CostItemDict StarAttrInfo BaseAttrInfo
-1 1 1 1|2|3|4|5|6|7|8 4 5 100 0 6_100 6_100
-1 2 2 1|2|3|4|5|6|7|8 4 5 100 0 6_100 6_101
-1 3 3 1|2|3|4|5|6|7|8 4 5 100 0 6_100 6_102
-1 4 4 1|2|3|4|5|6|7|8 4 5 100 0 6_100|7_100 6_103
-1 5 5 1|2|3|4|5|6|7|8 4|5 5 100 0 6_100|7_100 6_104
-1 6 6 1|2|3|4|5|6|7|8 4|5 5 100 0 6_100|7_100 6_105
-1 7 7 1|2|3|4|5|6|7|8 5 5 100 0 6_100|7_100 6_106
-1 8 8 1|2|3|4|5|6|7|8 5 5 100 0 6_100|7_100 6_107
+1 1 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_147
+1 2 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_128
+1 3 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1200 6_1401|8_42
+1 4 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1200 6_1888|8_30
+1 5 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_102
+1 6 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1200 6_1645|8_36
+1 7 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1200 6_1158|8_48
+1 8 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_83
+2 1 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_150
+2 2 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_131
+2 3 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_1426|8_43
+2 4 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_1921|8_30
+2 5 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_103
+2 6 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_1674|8_37
+2 7 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_1178|8_49
+2 8 1 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_85
+2 1 2 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_300
+2 2 2 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_262
+2 3 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_2852|8_86
+2 4 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_3842|8_60
+2 5 2 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_206
+2 6 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_3348|8_74
+2 7 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1300 6_2356|8_98
+2 8 2 1|2|3|4|5|6|7|8 4 1 100 0 7_60 7_170
+2 1 3 1|2|3|4|5|6|7|8 4 2 100 0 7_60 7_749
+2 2 3 1|2|3|4|5|6|7|8 4 2 100 0 7_60 7_655
+2 3 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1300 6_7130|8_215
+2 4 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1300 6_9605|8_150
+2 5 3 1|2|3|4|5|6|7|8 4 2 100 0 7_60 7_515
+2 6 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1300 6_8369|8_184
+2 7 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1300 6_5890|8_244
+2 8 3 1|2|3|4|5|6|7|8 4 2 100 0 7_60 7_424
+3 1 1 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_166
+3 2 1 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_144
+3 3 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_1574|8_47
+3 4 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_2122|8_34
+3 5 1 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_114
+3 6 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_1848|8_40
+3 7 1 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_1301|8_54
+3 8 1 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_93
+3 1 2 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_332
+3 2 2 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_288
+3 3 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_3148|8_94
+3 4 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_4244|8_68
+3 5 2 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_228
+3 6 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_3696|8_80
+3 7 2 1|2|3|4|5|6|7|8 4 1 100 0 6_1400 6_2602|8_108
+3 8 2 1|2|3|4|5|6|7|8 4 1 100 0 7_70 7_186
+3 1 3 1|2|3|4|5|6|7|8 4 2 100 0 7_70 7_829
+3 2 3 1|2|3|4|5|6|7|8 4 2 100 0 7_70 7_720
+3 3 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1400 6_7870|8_234
+3 4 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1400 6_10609|8_169
+3 5 3 1|2|3|4|5|6|7|8 4 2 100 0 7_70 7_569
+3 6 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1400 6_9239|8_200
+3 7 3 1|2|3|4|5|6|7|8 4 2 100 0 6_1400 6_6504|8_270
+3 8 3 1|2|3|4|5|6|7|8 4 2 100 0 7_70 7_465
+3 1 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 7_70|60_180 7_1823
+3 2 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 7_70|60_180 7_1584
+3 3 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 6_1400|60_180 6_17314|8_515
+3 4 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 6_1400|60_180 6_23339|8_372
+3 5 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 7_70|60_180 7_1251
+3 6 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 6_1400|60_180 6_20326|8_440
+3 7 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 6_1400|60_180 6_14308|8_594
+3 8 4 1|2|3|4|5|6|7|8 4 2 100 5418_1 7_70|60_180 7_1023
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
index 5173810..1530987 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
@@ -1,10 +1,16 @@
suiteID suiteCnt star attr skillID isNotify
-101 2 0 6_101 35800 1
-101 2 3 6_101 0 1
-101 2 6 6_102 0 1
-101 5 0 6_100 0 1
-101 5 3 6_101 0 1
-101 5 6 6_102 0 1
-101 8 0 6_100 0 1
-101 8 3 6_101 0 1
-101 8 6 0 35800 1
+101 2 0 6_5741 0
+101 5 0 7_431 0
+101 8 0 35800 1
+102 2 0 6_5992 0
+102 5 0 7_449 0
+102 8 0 50_125 1
+102 2 3 6_5033|7_168 0
+102 5 3 7_377|35_252 0
+102 8 3 35800 1
+103 2 0 6_10546 0
+103 5 0 7_791 0
+103 8 0 50_150 1
+103 2 3 6_8858|7_295 0
+103 5 3 7_664|35_443 0
+103 8 3 35800 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index edfbe32..fdf7203 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -352,6 +352,6 @@
MixServerMail [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]] [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]] [500, 2000000] [[947,1,1]] 100
MysteryShopGoods 10 [(3000,5),(5000,6),(7000,7),(10000,8)]
MysteryShopRefresh 3809 {"5":1,"10":2,"15":3,"100000":5} 10 21600 {0:[4,20000]}
-EquipPartStar {"4":{"1":1,"2":2,"3":3,"4":4,"5":9,"6":9}}
+EquipPartStar {"4":{"1":1,"2":3,"3":4,"4":6,"5":7,"6":9}}
EquipPartStarNotify [1,4,7]
EquipMaxClasslv 5
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index cf9f67c..f25489c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1247,6 +1247,11 @@
5415 1 0 高阶原石 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 250 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5416 1 0 高阶雷尘 138 0 1 0 0 999 1 1 0 0 1 0 0 0 0 0 1 500 0 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5417 1 0 厉兽魂石 139 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5418 1 0 初级装备升星石 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 10 0 20 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5419 1 0 高级装备升星石 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5420 1 0 仙绳升星石 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 50 0 20 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5421 1 0 莲台升星石 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 50 0 20 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+5422 1 0 仙器升星石 34 0 1 0 0 9999 1 1 1 0 1 0 0 0 0 0 1 200 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5500 1 0 诛仙宝石碎片 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 10 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5501 1 0 1级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 3 1 5502 6 860 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5502 1 0 2级诛仙生命宝石 140 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 3 2 5503 6 1720 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0