From e775e135c3dd1f946f2b8ddc1f175d95e5ae3f66 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 11 九月 2018 12:00:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
Robot/AI/AIFile/AILoginout.pyc | 0
Robot/Robot/RobotMgr.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
10 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index c883218..5f5fea0 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/Robot/AI/AIFile/AILoginout.pyc b/Robot/AI/AIFile/AILoginout.pyc
index 476f8c4..efd8eb1 100644
--- a/Robot/AI/AIFile/AILoginout.pyc
+++ b/Robot/AI/AIFile/AILoginout.pyc
Binary files differ
diff --git a/Robot/Robot/RobotMgr.pyc b/Robot/Robot/RobotMgr.pyc
index dfcf230..5cc2340 100644
--- a/Robot/Robot/RobotMgr.pyc
+++ b/Robot/Robot/RobotMgr.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 357c9ff..f442901 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 826e516..4d6cdb1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index c4befb0..e4cec38 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 38ff54b..41f123b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
index 0c45cb5..8ef137f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 32d8189..2b466ca 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -75,7 +75,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*10+FinalHurtReduce*10+(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*10.0+PVPAtkBackHP*20.0)) 0 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*10+FinalHurtReduce*10+(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*10.0+PVPAtkBackHP*20.0+NPCHurtAddPer/10000.0*240000)) 0 0 0 0
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
RealmSitNPCID 10000
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index d084117..94de463 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -124,7 +124,7 @@
600 1 0 时装1 91 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 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
601 1 0 时装2 92 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 220 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
602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-800 1 0 1200万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 12000000 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
+800 1 0 1200万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 12000000 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
801 1 0 2500万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 400 0 20 0 1 0 0 201 25000000 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
901 1 0 气血散（小） 9 0 1 0 0 300 1 1 1 0 1 0 0 0 1 10000 1 1 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 6000 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
902 25 0 气血散（中） 9 0 1 0 0 300 25 1 1 0 1 0 0 0 1 10000 1 1 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 6001 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0