From a301a1c1b6c6615bd1fed5328db91baaabd8b8fc Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 08 十月 2018 17:00:17 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 16 ++++++++--------
db/PyMongoDataServer/PySysDB/tagLVAward.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index d2b97be..76b7319 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -85,7 +85,7 @@
BigRealmSitTime 12|14 18|20
RealmGroup 2|5|7|9|12|15|18|21|24|27|28 {1:1000,2:1000,3:3000,4:1000,5:1000,6:3000,7:1000,8:3000,9:1000,10:3000,11:1000,12:1000,13:3000,14:1000,15:1000,16:3000,17:1000,18:1000,19:3000,20:1000,21:1000,22:3000} {1:1000,2:1000,3:3000,4:1000,5:1000,6:3000,7:1000,8:3000,9:1000,10:3000,11:1000,12:1000,13:3000,14:1000,15:1000,16:3000,17:1000,18:1000,19:3000,20:1000,21:1000,22:3000}
BugleItem 2050 0 0 0 0
-PetUpItem 4151
+PetUpItem 4151 100
SignConsumption 10
ShopItemBuyCntLimitNPC [] 0 0 0 0
GodWeapon1 101|102|103 0 0 0 0
@@ -166,7 +166,7 @@
LegendAttrValueByClassLV {29:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15:2100}} 0 0 0 0
EquipGSTypeForSort 101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123 0 0 0 0
EquipGSFormula int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0)) [67,68,6,7,8,11,20,19,23] int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0) 0 0
-HorseUpItem 181 20 0 0 0
+HorseUpItem 181 100 0 0 0
HorseSuperRate {} 0 0 0 0
NeedSysHorseLV {100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}
VIPCard 1_978|2_979|3_980
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 6975772..0961a23 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -197,14 +197,14 @@
196 21185 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2 1
197 21186 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2 1
198 21187 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2 1
-199 9003 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-200 9004 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-201 9005 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
-202 9006 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
-203 9015 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-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
+199 6603 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+200 6604 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+201 6605 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+202 6606 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+203 6615 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+204 6616 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+205 6617 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+206 6618 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
207 9075 9074 3 0 0 0 10000 0 0 EquipComposeSuccess6 1
208 9077 9075 3 5305 10 0 10000 0 0 EquipComposeSuccess1 1
209 9078 9077 3 5306 20 0 10000 0 0 EquipComposeSuccess2 1
diff --git a/db/PyMongoDataServer/PySysDB/tagLVAward.txt b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
index 35d9a11..b9c8129 100644
--- a/db/PyMongoDataServer/PySysDB/tagLVAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
@@ -1,6 +1,6 @@
RewardID LV LimitNUM Reward VIPLimit VIPAward
-1 60 0 {"1":[[922,1],[4151,2],[911,1],[2,1]],"2":[[922,1],[4151,2],[911,1],[2,1]],"3":[[922,1],[4151,2],[911,1],[2,1]]} 2 [[4151,10]]
-2 80 0 {"1":[[3511,1],[1500,1],[2,1],[2107,1]],"2":[[3511,1],[1500,1],[2,1],[2107,1]],"3":[[3511,1],[1500,1],[2,1],[2107,1]]} 2 [[181,10]]
+1 60 0 {"1":[[922,1],[924,1],[911,1],[4151,2]],"2":[[922,1],[924,1],[911,1],[4151,2]],"3":[[922,1],[924,1],[911,1],[4151,2]]} 2 [[4151,10]]
+2 80 0 {"1":[[3511,1],[1500,1],[923,1],[2107,1]],"2":[[3511,1],[1500,1],[923,1],[2107,1]],"3":[[3511,1],[1500,1],[923,1],[2107,1]]} 2 [[181,10]]
3 100 0 {"1":[[4151,5],[1502,1],[4001,1],[2107,1]],"2":[[4151,5],[1502,1],[4001,1],[2107,1]],"3":[[4151,5],[1502,1],[4001,1],[2107,1]]} 2 [[194,1]]
4 120 0 {"1":[[105,2],[102,5],[141,60],[911,1]],"2":[[105,2],[102,5],[141,60],[911,1]],"3":[[105,2],[102,5],[141,60],[911,1]]} 2 [[1001,1]]
5 150 0 {"1":[[1501,1],[142,60],[151,1],[30,100]],"2":[[1501,1],[142,60],[151,1],[30,100]],"3":[[1501,1],[142,60],[151,1],[30,100]]} 3 [[5,1]]
--
Gitblit v1.8.0