From bf78ded072f95e416e9f272813ec5c5cc7040a50 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 22 十二月 2020 11:35:00 +0800
Subject: [PATCH] 8665 【主干】【后端】移植-成长特惠; (BT单: 8611 【BT】成长必买;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py
index 4121653..e9a1dbe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.py
@@ -21,7 +21,6 @@
 import BaseAttack
 import IPY_GameWorld
 import ItemControler
-import SkillDataBoost
 import GameObj
 import SkillCommon
 
@@ -72,7 +71,7 @@
     summonNPC = curPlayer.SummonNewNPC()
     
     #设置召唤兽基础信息
-    summonNPC.SetNPCTypeID(summonID)
+    summonNPC.SetNPCTypeID(summonID)    # 即设置了基础属性,技能等
     lvSummonNPC = curPlayer.GetLV()
     summonNPC.SetLV(lvSummonNPC)
     summonNPC.SetCountry(curPlayer.GetCountry())
@@ -94,19 +93,21 @@
     summonNPC.SetBornTime(tick)
     summonNPC.SetLastTime(curSkill.GetLastTime())
     
-    atkper = 1
+    atkper = 10000  # 默认百分百继承属性
     findEffect = SkillCommon.GetSkillEffectByEffectID(curSkill, ChConfig.Def_Skill_Effect_SummonAttr)
-
     if findEffect:
-        atkper = float(findEffect.GetEffectValue(0))/ChConfig.Def_MaxRateValue
+        atkper = findEffect.GetEffectValue(0)
         
         if findEffect.GetEffectValue(1) == 0:
             # 跟随人物攻击
             summonNPC.SetDict(ChConfig.Def_PlayerKey_AttackFollowMaster, 1)
             
+    # 召唤兽继承主人所有属性标识,计算时直接取主人属性
+    summonNPC.SetDict(ChConfig.Def_GameObjKey_InheritOwner, atkper)
+            
     #---设置基础值---
-    summonNPC.SetBaseMinAtk(int(curPlayer.GetMinAtk()*atkper))
-    summonNPC.SetBaseMaxAtk(int(curPlayer.GetMaxAtk()*atkper))
+    #summonNPC.SetBaseMinAtk(int(curPlayer.GetMinAtk()*atkper))
+    #summonNPC.SetBaseMaxAtk(int(curPlayer.GetMaxAtk()*atkper))
     summonNPC.SetBaseHit(curPlayer.GetHit())
     
     #取人的攻击间隔
@@ -114,10 +115,11 @@
     summonNPC.SetBaseMissRate(curPlayer.GetMiss())
     summonNPC.SetBaseSuperHiteRate(curPlayer.GetSuperHitRate())
     
+    # 继承技能等级
+    SkillCommon.SetSummonNPCSkillLV(summonNPC, curSkill)
+    
     summonNPC.SetVisible(True)
     summonNPC.SetCanAttack(False)
-    
-    #SkillDataBoost.SetSummonNPCSkillBoost(curPlayer, summonNPC, curSkill)
     
     return True
 
@@ -169,18 +171,23 @@
     summonNPC.SetBornTime(tick)
     summonNPC.SetLastTime(curSkill.GetLastTime())
     
-    atkper = 1
+    atkper = 10000
     findEffect = SkillCommon.GetSkillEffectByEffectID(curSkill, ChConfig.Def_Skill_Effect_SummonAttr)
 
     if findEffect:
-        atkper = float(findEffect.GetEffectValue(0))/ChConfig.Def_MaxRateValue
+        atkper = findEffect.GetEffectValue(0)
 
-            
+    # 召唤兽继承主人所有属性标识,计算时直接取主人属性
+    summonNPC.SetDict(ChConfig.Def_GameObjKey_InheritOwner, atkper)
+
     #---设置基础值---
-    summonNPC.SetBaseMinAtk(int(curNPC.GetMinAtk()*atkper))
-    summonNPC.SetBaseMaxAtk(int(curNPC.GetMaxAtk()*atkper))
+    #summonNPC.SetBaseMinAtk(int(curNPC.GetMinAtk()*atkper))
+    #summonNPC.SetBaseMaxAtk(int(curNPC.GetMaxAtk()*atkper))
     summonNPC.SetBaseHit(curNPC.GetHit())
-    
+
+    #NPCCommon.SetRealmLV(summonNPC, NPCCommon.GetRealmLV(curNPC))   # 继承境界
+    #NPCCommon.SetFinalHurt(summonNPC, NPCCommon.GetFinalHurt(curNPC))   # 最终伤害
+
     #summonNPC.SetBaseAtkInterval(500)
     summonNPC.SetBaseMissRate(curNPC.GetMiss())
     

--
Gitblit v1.8.0