From 2638c8b67d1dcac1c774f942ac144579c6f82ec1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 九月 2018 21:41:11 +0800
Subject: [PATCH] 3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑（自动加入匹配中的队伍）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py | 17 ++++-------------
1 files changed, 4 insertions(+), 13 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 9275dd5..99e5fb4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.py
@@ -32,7 +32,6 @@
import ReadChConfig
import DataRecordPack
import ChItem
-import SkillDataBoost
import PlayerActivity
import ShareDefine
import PlayerGodWeapon
@@ -930,7 +929,8 @@
return
if not CheckClientAttackTick(curPlayer, clientTick, tick):
- AttackFailNotify(curPlayer, curSkill, ChConfig.SkillFail_AtkInterval)
+ AttackFailNotify(curPlayer, curSkill, ChConfig.SkillFail_AtkInterval)
+ curPlayer.Sync_ClientTick()
return
#已经在攻击中
@@ -2982,7 +2982,7 @@
# if attacker.GetGameObjType() == IPY_GameWorld.gotPlayer and useSkill.GetSkillTypeID() in ChConfig.Def_SkillID_Trig:
# attacker.GetSkillManager().SetTrigBuffSkillTick(tick)
- GameWorld.Log("当前技能 = %s,触发附加技能成功 = %s,触发几率 = %s"%(useSkill.GetSkillName(),exSkill.GetSkillName(),rate))
+ #GameWorld.Log("当前技能 = %s,触发附加技能成功 = %s,触发几率 = %s"%(useSkill.GetSkillName(),exSkill.GetSkillName(),rate))
#----------------------------处理附加技能
return DoLogic_UseSkill(attacker, defender, exSkill, tick, destX, destY, True)
@@ -2993,14 +2993,6 @@
# @return 概率
def GetSkillOfSeriesHitRate(attacker, defender, exSkill):
baseRate = exSkill.GetHappenRate()
- #===========================================================================
- # addRate = SkillDataBoost.GetSkillBoostValeByType(attacker, exSkill, ChConfig.BoostType_HappenRate)
- # weakRate = 0
- # if defender:
- # weakRate = SkillDataBoost.GetSkillWeakenValeByType(defender, exSkill, ChConfig.WeakenType_HappenRate)
- # hitRate = max(0, baseRate + addRate - weakRate)
- #===========================================================================
- #GameWorld.DebugLog("触发几率: base=%s,add=%s,weak=%s, hitRate=%s" % (baseRate, addRate, weakRate, hitRate))
return baseRate
##检查触发技能的使用条件
@@ -3124,7 +3116,6 @@
tagRoundPosX = attacker.GetPosX()
tagRoundPosY = attacker.GetPosY()
- #curSkill = SkillDataBoost.ChangeSkillData(attacker, defender, curSkill, isEnhanceSkill)
#这个技能是Buff
if SkillCommon.IsBuff(curSkill):
@@ -3241,7 +3232,7 @@
moduleSuffix = GetBuffModuleSuffix(curEffect)
- changeBuffValueDict = {}#SkillDataBoost.GetBuffValueDict(curSkill, effectID)
+ changeBuffValueDict = {}
#是否是持续性技能
if curSkill.GetSkillType() in ChConfig.Def_LstBuff_List:
--
Gitblit v1.8.0