From bd3d2f04d2923bc6970b9a9d56ba2e282c60abbd Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 10 十二月 2018 14:37:30 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3
---
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 2 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 32 ++++++++++++++++----------------
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 8 ++++----
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
index cd0768e..4fbe501 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -19,7 +19,7 @@
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
20 0 0 0 0 1 1 1 2 2 2 2 3 3 3 3 3
-21 1 1 1 1 2 2 3 3 3 3 3 3 3 3 3 3
+21 0 0 0 0 1 1 2 2 2 2 2 3 3 3 3 3
22 0 0 0 0 0 1 1 1 1 1 2 2 2 2 2 2
23 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
24 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6e5184d..cb89dd8 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -84,7 +84,7 @@
ExpAttenuation max(baseExp*max(1-max(playerLV-npcLV-10,0)*0.02,0),1) 0 0 0 0
AtkInterval int(1000*max(1/math.sqrt(atkSpeed/10000.0),0.5)) 0 0 0 0
MoveSpeed max(int(1.0/(3+(math.sqrt(speed/100.0)-1)*2)/2.0*1000),100) 50 25 0 0
-FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700+ProDefPer/10000.0*2350015)) equipScoreTotal*4 0 0 0
+FightpowerFormula int(((MinAtk+MaxAtk)*20/2.0+Def*20+MaxHP+IceAtk*20+IceDef*20+SuperHit*SuperHitRate/10000.0*40+Hit/10000.0+Miss/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedParameter+DamagePer/10000.0+DamReduce/10000.0+IgnoreDefRate/10000.0+LuckyHitRate/10000.0*LuckyHitParameter+LuckyHit/10000.0*LuckyHitParameter+DamBackPer/10000.0+DamagePerPVP/10000.0+DamagePerPVPReduce/10000.0+FinalHurt*20+FinalHurtReduce*20+(PetMinAtk+PetMaxAtk)/2.0*(1+PetDamPer/10000.0)*10+DamChanceDef/10000.0+AtkBackHP*20+BleedDamage/10000.0+FaintRate/10000.0+SuperHitReduce/10000.0+LuckyHitRateReduce/10000.0+IgnoreDefRateReduce/10000.0+SkillAtkRate/10000.0+SkillAtkRateReduce/10000.0+OnlyFinalHurt*20.0+PVPAtkBackHP*20.0+SpeedPer/10000.0+NPCHurtAddPer/10000.0*1153700+ProDefPer/10000.0*2068666)) equipScoreTotal*4 0 0 0
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
RealmSitNPCID 10000
@@ -99,11 +99,11 @@
GodWeapon1 101|102|103 0 0 0 0
GodWeapon2 104|105|106 0 0 0 0
GodWeapon3 107|108|109 0 0 0 0
-GodWeapon4 110|111|112 int(35469+maxHP*proDefPer/10000.0) 0 0 0
+GodWeapon4 110|111|112 int(46870+maxHP*proDefPer/10000.0) 0 0 0
GodWeaponActive 1 {"2":[[1,100]], "4":[[2,150]]} {"2":250, "4":320} 0 0
GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
GodMagicExp {"1":[1,10],"2":[1,10],"4":[1,10]}
-MagicExterior {"1":0,"2":0,"3":0,"4":0} 0 500
+MagicExterior {"1":0,"2":0,"3":0,"4":35470} 0 500
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
EquipSuitLimit 4 2 3 0 0
EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
@@ -205,7 +205,7 @@
FairylandNPC [[(0,60),30801001], [(61,120),30801002], [(121,180),30801003]] max(min(2000-(heroCnt-1)*400,2000),800) 25
FairylandNPCCnt min(max(10+(heroCnt-1)*10,12+(heroCnt-1)*12-npcCnt),40+(heroCnt-1)*10-npcCnt)
FairylandPoint [104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120] 1 [101,102,103]
-XjmjMonsterExp baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp*(1+max(min(playerCnt-1,1),0)*0.06+max(min(playerCnt-2,1),0)*0.02-max(min(playerCnt-3,1),0)*0.03)*0.8 2 0 0 0
+XjmjMonsterExp baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp 2 0 0 0
XjmjFirstEnter [5000, 25, 911] 350000
XjmjAddHarm 20 20061
AlchemyNotify 3 4716 4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index cd0768e..4fbe501 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -19,7 +19,7 @@
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
20 0 0 0 0 1 1 1 2 2 2 2 3 3 3 3 3
-21 1 1 1 1 2 2 3 3 3 3 3 3 3 3 3 3
+21 0 0 0 0 1 1 2 2 2 2 2 3 3 3 3 3
22 0 0 0 0 0 1 1 1 1 1 2 2 2 2 2 2
23 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
24 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 11aff0f..6a6759d 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -567,22 +567,22 @@
2419 1 0 神兵石豪华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 0 5 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
2420 1 0 灵宠丹大礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 380 0 5 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
2421 1 0 灵宠丹豪华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 0 5 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
-3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 840 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
-3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 1260 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
-3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 2041 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
-3504 1 0 4级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 1 4 3505 6 4116 0 0 8 50 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
-3505 1 0 5级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 1 5 3506 6 10780 0 0 8 75 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
-3506 1 0 6级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 1 6 3507 6 11547 0 0 8 100 0 0 20 100 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
-3507 1 0 7级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 100 0 0 0 1 225 1 7 3508 6 52490 0 0 8 150 0 0 20 125 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
-3508 1 0 8级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 100 0 0 0 1 225 1 8 0 6 155438 0 0 8 200 0 0 20 150 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
-3511 1 0 1级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 2 1 3512 7 42 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
-3512 1 0 2级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 2 2 3513 7 63 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
-3513 1 0 3级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 2 3 3514 7 102 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
-3514 1 0 4级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 2 4 3515 7 255 0 0 13 81 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
-3515 1 0 5级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 2 5 3516 7 614 0 0 13 162 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
-3516 1 0 6级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 2 6 3517 7 677 0 0 13 325 0 0 12 100 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
-3517 1 0 7级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 100 0 0 0 1 225 2 7 3518 7 2774 0 0 13 650 0 0 12 125 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
-3518 1 0 8级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 100 0 0 0 1 225 2 8 0 7 7971 0 0 13 1300 0 0 12 150 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
+3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 600 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
+3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 840 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
+3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1080 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
+3504 1 0 4级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 1 4 3505 6 3860 0 0 8 50 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
+3505 1 0 5级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 1 5 3506 6 4980 0 0 8 75 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
+3506 1 0 6级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 1 6 3507 6 22300 0 0 8 100 0 0 20 100 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
+3507 1 0 7级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 100 0 0 0 1 225 1 7 3508 6 26160 0 0 8 150 0 0 20 125 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
+3508 1 0 8级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 100 0 0 0 1 225 1 8 0 6 39740 0 0 8 200 0 0 20 150 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
+3511 1 0 1级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 2 1 3512 7 30 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
+3512 1 0 2级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 2 2 3513 7 42 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
+3513 1 0 3级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 2 3 3514 7 54 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
+3514 1 0 4级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 270 0 20 0 0 0 1 225 2 4 3515 7 243 0 0 13 81 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
+3515 1 0 5级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 810 0 50 0 0 0 1 225 2 5 3516 7 324 0 0 13 162 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
+3516 1 0 6级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2430 0 50 0 0 0 1 225 2 6 3517 7 1215 0 0 13 325 0 0 12 100 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
+3517 1 0 7级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 7290 0 100 0 0 0 1 225 2 7 3518 7 1458 0 0 13 650 0 0 12 125 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
+3518 1 0 8级攻击炎晶 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 21870 0 100 0 0 0 1 225 2 8 0 7 2187 0 0 13 1300 0 0 12 150 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
3710 5 0 幽尘之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 2000 0 0 19 1500 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 1 0 0 0 0 3 0 0 0 0 0 0 3600 0 0 0 0 0 0 0
3711 5 0 幽尘之羽 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 280 0 5 0 0 0 0 6 50000 0 0 19 800 0 0 23 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 2 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3712 6 0 风炎之翼 111 11 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 4680 0 10 0 0 0 0 6 120000 0 0 19 2500 0 0 23 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 6 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