From 9ab05a45269c3ef4c42bc146bcecb871b024b99e Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 10 十二月 2018 15:04:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 4 ++--
CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 6 +++---
CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc | 0
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc
index 373c369..3e15099 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/HelpCheckInInfo.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc
index 446e417..1157fa2 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc
index 3b9ff89..7c380d8 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerSocial.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index febcde0..3af6382 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -7,9 +7,9 @@
6 2 31080 86 1 30 0
7 2 31170 89 1 100 100
8 2 31180 98 1 30 30
-9 2 60010 88 1 20 60
+9 2 60010 88 1 20 0
10 2 31160 101 1 30 30
-11 2 51010 103 1 20 40
+11 2 51010 103 1 20 0
12 1 7 114 1 2 20
13 2 31220 111 1 100 200
14 2 31010 74 1 10 30
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0b9359a..b611565 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
--
Gitblit v1.8.0