From 5c5414707d1145d79f7734c0bcb48335249aad2d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 20 十月 2018 20:05:05 +0800
Subject: [PATCH] 4240 微信商城，订单汇报优化
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
index 9dd33bc..d1bdcc9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -1501,7 +1501,8 @@
if relation[0] == ChConfig.Type_Relation_Enemy :
return True
- AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
+ if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_FbSkill:
+ AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
return False
##玩家释放有目标技能, 检查目标对象是否符合要求, 可攻击怪物
@@ -1534,7 +1535,8 @@
if relation[0] == ChConfig.Type_Relation_Friend :
return True
- AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
+ if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_FbSkill:
+ AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1])
return False
#---------------------------------------------------------------------
@@ -1782,7 +1784,11 @@
if curSkill.GetFuncType() == ChConfig.Def_SkillFuncType_HorseSkill and SkillCommon.isPassiveAttr(curSkill):
PlayerHorse.RefreshHorseAttr(curPlayer)
else:
- PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPlayer, curSkill.GetSkillID())
+ if SkillCommon.isPassiveAttr(curSkill):
+ curControl = PlayerControl.PlayerControl(curPlayer)
+ curControl.RefreshPlayerAttrState()
+ else:
+ PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPlayer, curSkill.GetSkillID())
#curControl = PlayerControl.PlayerControl(curPlayer)
#curControl.CalcPassiveBuffAttr()
#curControl.RefreshAllState()
@@ -1806,27 +1812,7 @@
return True
#---------------------------------------------------------------------
-##技能升级消耗逻辑
-# @param curPlayer 玩家实例
-# @param curSkill 技能实例
-# @param curSkillID 技能ID
-# @return BOOL 是否扣除消耗成功
-def DoLogic_PlayerSkillLVUpCost(curPlayer, curSkill, curSkillID):
- #GameWorld.Log("尝试升级技能名 = %s, 当前等级 = %s"%(curSkill.GetSkillName(),curSkill.GetSkillLV()) , curPlayer.GetPlayerID())
-
- curSkillLV = curSkill.GetSkillLV()
-
- if curSkillLV == curSkill.GetSkillMaxLV():
- #已经是最高等级
- PlayerControl.NotifyCode(curPlayer, "UseMagicLost16")
- return False
-
- #--获得下一级技能---
- curSkillTypeID = curSkill.GetSkillTypeID()
-
- return DoLogic_PlayerSkillLvUpCost(curPlayer, curSkillTypeID, curSkillID, curSkillLV + 1, curSkill)
-
##学习技能消耗逻辑
# @param curPlayer 玩家实例
# @param curSkillTypeID 技能类型ID
@@ -3440,6 +3426,10 @@
if skillAim == ChConfig.Def_UseSkillAim_None:
if curSkill.GetSkillType() in ChConfig.Def_CanAttackSkill_List:
+ if target and target.GetGameObjType() == IPY_GameWorld.gotNPC and target.GetType() == IPY_GameWorld.ntElf:
+ # 有害技能特殊处理，不能对自己的召唤物释放
+ target = None
+
result = DoLogic_UseSkill(attacker, target, curSkill, tick, attacker.GetPosX(), attacker.GetPosY(), isEnhanceSkill=isEnhanceSkill)
else:
result = DoLogic_UseSkill(attacker, attacker, curSkill, tick, isEnhanceSkill=isEnhanceSkill)
--
Gitblit v1.8.0