From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期二, 16 十月 2018 15:04:06 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py index 216e37d..5f3d516 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py @@ -3740,7 +3740,7 @@ #未达到升级经验 if curTotalExp < lvUpNeedExp: return - + needSyncTalentPoint = False playerNeedDoLVUp = False curLV = curPlayer.GetLV() maxLV = IpyGameDataPY.GetFuncCfg("PlayerMaxLV", 1) @@ -3781,7 +3781,10 @@ lvIpyData = GetPlayerLVIpyData(curPlayer.GetLV()) # 大师天赋点 if lvIpyData: - PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, lvIpyData.GetTalentPoint()) + addTalentPoint = lvIpyData.GetTalentPoint() + if addTalentPoint: + needSyncTalentPoint = True + PlayerGreatMaster.AddGreatMasterSkillPointByLV(curPlayer, addTalentPoint) EventShell.EventResponse_LVUp(curPlayer) # 升级触发事件 @@ -3830,7 +3833,9 @@ # NotifyCode(curPlayer, "GeRen_liubo_127574") #=================================================================== - + # 天赋点通知 + if needSyncTalentPoint: + PlayerGreatMaster.Sync_GreatMasterFreeSkillPoint(curPlayer) # 升级需要执行的游戏功能处理 GameFuncComm.DoFuncOpenLogic(curPlayer) ChEquip.CalcEquips_OutOfPrint(curPlayer) # 缓存绝版属性 @@ -4663,6 +4668,7 @@ speed = int(speed * (ShareDefine.Def_MaxRateValue + buffSpeedPer) / float(ShareDefine.Def_MaxRateValue) + buffSpeed) GameWorld.DebugLog(" buff影响后速度值: speed=%s,buffSpeedPer=%s,buffSpeed=%s" % (speed, buffSpeedPer, buffSpeed)) + speed = max(speed, 0) #防小于0错误 if GetSpeedValue(curPlayer) != speed: SetSpeedValue(curPlayer, speed) moveSpeed = eval(FormulaControl.GetCompileFormula("MoveSpeed", moveSpeedFormat)) -- Gitblit v1.8.0