From bb145c61250ecd0a262d762ad687a67b7ffe996e Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期二, 27 十一月 2018 20:52:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 6 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
12 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index f2a34ff..a7cead8 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 2fc11f7..2b8f8f5 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index d13dfbc..c419f35 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -120,8 +120,8 @@
"PVE_1_5" :"int((wReFightPower/15.0+SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+aNPCHurtAddPer/10000.0*(aMinAtk+aMaxAtk)/2.0,(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))*(1+aFinalHurtPer/10000.0))",
#助战机器人：参数: suppressNPCFightPower-助战玩家战力; fbFightPower-副本战力; fbBaseHurt-保底伤害
- "HelpRobot_Atk" :"fbBaseHurt*suppressNPCFightPower/(fbFightPower if fbFightPower else suppressNPCFightPower)",
- "HelpRobot_Def" :"fbBaseHurt*fbFightPower/(suppressNPCFightPower if suppressNPCFightPower else fbFightPower)",
+ "HelpRobot_Atk" :"int(fbBaseHurt*suppressNPCFightPower*1.0/fbFightPower)",
+ "HelpRobot_Def" :"int(fbBaseHurt*fbFightPower/(suppressNPCFightPower if suppressNPCFightPower else fbFightPower))",
}
)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 37a2639..fd71925 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
index 999464b..4ad6a76 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index cf75a2f..ddf907d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index c9933c1..85b45d5 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -66,9 +66,9 @@
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [3,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [3,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [3,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
-31160 0 31160 110 230 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160 1 31160 231 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 0 31160 110 230 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}
+31160 1 31160 231 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}
+31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2]], 2:[[101,2]],3 :[[101,2]], 4:[[101,4]], 5:[[101,4]], 6:[[101,6]]}
31250 0 31250 0 0 0 0 0 0 0 0 0 [30,18] [0,300,10] [312501,312502,312503] [0,4235]
52010 0 52020 20 0 0 0 0 0 0 0 0 [17,19,8] 10 [520101,520102,520103,520104]
52010 1 52020 40 0 0 0 0 0 0 0 0 [17,19,8] 10 [520105,520106,520107,520108]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 31ea183..d956134 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -236,7 +236,7 @@
MunekadoTrialStarTime {0:[[20],[20],[30,30,30,30]],1:[[20],[20],[20],[30,30,30,30]],2:[[20],[20],[20],[30,30,30,30]],3:[[20],[20],[30,30,30,30]],4:[[20],[20],[30,30,30,30]],5:[[20],[20],[30,30,30,30]]}
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
-ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
+ChaosDemonReward {} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 {0:[20,0,20],1:[20,0,20],2:[20,0,20]} [200,600,1200,2000,3200,4800]
ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index ac44a30..3e6eec5 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -104,8 +104,8 @@
31401003 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0
31403003 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401004 0 2 0 800 10000 1000 8000 3 9900 50 12 0 0 0 0
-31403004 0 2 0 6900 10000 0 8000 3 9900 50 1 0 0 50 0
-31401005 0 2 0 2500 10000 0 8000 3 9900 50 12 0 0 0 0
+31403004 0 2 0 3500 10000 0 8000 3 9900 50 1 0 0 50 0
+31401005 0 2 0 2800 10000 0 8000 3 9900 50 12 0 0 0 0
31403005 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401006 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0
31403006 0 2 0 2400 10000 0 8000 3 9900 50 1 0 0 50 0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 0d9a25d..b9d1cbb 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -182,7 +182,7 @@
773 108 1 4606 1 1 [[2213,70,1]] 4606 0 0 0 1 0 1 288 8750 0 LimitGift7
774 108 1 982 10 1 [] 982 0 0 0 1 0 1 888 2500 0 LimitGift8
775 109 1 913 1 1 [[109,6,1]] 913 0 0 0 1 0 1 388 1400 0 LimitGift6
-776 110 1 4664 2 1 [[4673,2,1]] 4664 0 0 0 1 0 1 88 320 0 LimitGift6
+776 110 1 4664 2 1 [[4674,2,1]] 4664 0 0 0 1 0 1 88 320 0 LimitGift6
777 111 1 4606 1 1 [[2213,25,1]] 4606 0 0 0 1 0 1 388 1375 0 LimitGift7
778 112 1 181 10 1 [[4151,20,1]] 181 0 0 0 1 0 1 88 300 0 LimitGift6
779 113 1 983 30 1 [] 983 0 0 0 1 0 1 188 900 0 LimitGift6
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 94d02c8..2563070 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -683,7 +683,7 @@
31401002 2 0 试炼木人 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
31401003 2 0 冰霜毒蝎 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1
31401004 2 0 顽固之石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 180 1 1
-31401005 2 0 虾兵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
+31401005 2 0 虾兵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1
31401006 2 0 深渊刺客 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401007 2 0 海马勇士 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
31401008 2 0 花精灵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 30 23045 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 21e3bf4..4f2599f 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -621,7 +621,7 @@
23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23041 冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 100000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 5000 0 0 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23043 冰晶矿脉减少攻击 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
23044 冰晶矿脉增加攻击 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 3 0 10 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 200 0 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 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
--
Gitblit v1.8.0