From 8a3b39e2b66ab9f7d1f1ac65082980d1de8a9582 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 31 十月 2018 14:52:30 +0800
Subject: [PATCH] 4498 【后端】【1.2.0】增加【助战特定副本】的任务接口

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   49 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 39 insertions(+), 10 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 89a8f5d..4204d7a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -1316,15 +1316,17 @@
 
 def GetPlayerLeaveServerTick(playerID):
     # 获取玩家从本地图中离线时的tick, 最大支持1小时, 如果有需要大于1小时的请调整超时限制
-    # 注: 返回值为None时,只能代表玩家不是在本地图离线1小时内,并不能代表玩家当前是否在线状态,可能在其他地图
+    # 注: 返回值为0时,只能代表玩家不是在本地图离线1小时内,并不能代表玩家当前是否在线状态,可能在其他地图
     if playerID not in PyGameData.g_disconnectPlayer:
-        return
+        return 0
     return PyGameData.g_disconnectPlayer[playerID][0]
 
 def GetPlayerLeaveServerPos(playerID):
     # 获取玩家从本地图中离线时的坐标
+    # 注:使用本函数时,一定要先使用函数 GetPlayerLeaveServerTick 确保是从本地图中离线的才可使用
+    # @return: posX, posY
     if playerID not in PyGameData.g_disconnectPlayer:
-        return
+        return 0, 0
     return PyGameData.g_disconnectPlayer[playerID][1:3]
 
 def RemoveTimeoutLeaveServerPlayerInfo(tick):
@@ -3318,18 +3320,33 @@
 # @remarks 获得玩家升级, 获得的属性点
 def GetLvUp_AddPoint(curPlayer):
     curPlayerID = curPlayer.GetID()
-    curReinCnt = curPlayer.GetReincarnationLv() # 当前转生次数
+    curLV = curPlayer.GetLV() # 当前等级
     
-    addPointList = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1)
-    
-    addPoint = addPointList[-1] if curReinCnt >= len(addPointList) else addPointList[curReinCnt]
+    addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {})
+    addPoint = GameWorld.GetDictValueByRangeKey(addPointDict, curLV, 0)
     
     if addPoint == None:
-        raise Exception('玩家获得升级属性点异常, reincarnationLv = %s PlayerID = %s' % (curReinCnt, curPlayerID))
+        raise Exception('玩家获得升级属性点异常, curLV = %s PlayerID = %s' % (curLV, curPlayerID))
         return
     
     return int(addPoint)
 
+def DoAddPointOpen(curPlayer):
+    '''加点功能开启 处理给自由属性点及老号处理  
+                    清除老服玩家未加点的点数(清零),以前加的加点属性不清除,属性不变,战力不减, 根据最新的加点开启等级和老服玩家的当前等级,相差的差值给予玩家对应的加点点数'''
+    beforeFreePoint = curPlayer.GetFreePoint()
+    addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {})
+    initFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2)
+    openLV = GameFuncComm.GetFuncLimitLV(ShareDefine.GameFuncID_AddPoint)
+    setFreePoint = initFreePoint
+    curLV = curPlayer.GetLV()
+    for lv in xrange(openLV, curLV+1):
+        setFreePoint += GameWorld.GetDictValueByRangeKey(addPointDict, lv, 0)
+    addDataDict = {'beforeFreePoint':beforeFreePoint}
+    DataRecordPack.DR_Freepoint(curPlayer, "AddPointOpen", setFreePoint, addDataDict)
+    curPlayer.SetFreePoint(setFreePoint)
+    GameWorld.DebugLog('    加点功能开启处理  beforeFreePoint=%s,curLV=%s, setFreePoint=%s'%(beforeFreePoint, curLV, setFreePoint), curPlayer.GetID())
+    return
 #---------------------------------------------------------------------
 
 ## 功能模块战斗力类
@@ -3339,7 +3356,8 @@
     
     __AttrName = "%s" # 参数为ChConfig.Def_Calc_AllAttrType_MAX对应所有属性列表索引
     __AttrNameNoline = "Noline_%s" # 参数为ChConfig.Def_Calc_AllAttrType_MAX对应所有属性列表索引
-    __NolineAttrList = [ChConfig.TYPE_Calc_AttrSpeed] # 需要记录的非线性战斗属性
+    __NolineAttrList = [ChConfig.TYPE_Calc_AttrSpeed, ChConfig.TYPE_Calc_AttrATKMin, ChConfig.TYPE_Calc_AttrATKMax, 
+                        ChConfig.TYPE_Calc_AttrMaxHP] # 需要记录的非线性战斗属性
     
     ## 初始化
     #  @param self 类实例
@@ -3448,9 +3466,20 @@
         AtkSpeedParameter = fpParam.GetCftAtkSpeed()
         LuckyHitParameter = fpParam.GetCftLuckyHit()
         
+        fpEx = 0
+        #装备模块特殊处理
+        if self.mfpType == ShareDefine.Def_MFPType_Equip:
+            AtkPer = getattr(self, self.__AttrNameNoline % ChConfig.TYPE_Calc_AttrATKMax) * fpParam.GetCftAtkPer() # 攻击百分比系数
+            MaxHPPer = getattr(self, self.__AttrNameNoline % ChConfig.TYPE_Calc_AttrMaxHP) * fpParam.GetCftMaxHPPer() # 生命百分比系数
+            fpEx = eval(IpyGameDataPY.GetFuncCompileCfg("FightpowerFormula", 3))
+            GameWorld.DebugLog("装备模块攻击生命百分比传奇属性战力: fpEx=%s" % fpEx)
+        else:
+            AtkPer = 0
+            MaxHPPer = 0
+            
         #获取策划配置的表格
         FightpowerFormula = IpyGameDataPY.GetFuncCfg("FightpowerFormula")
-        totalFightPower = eval(FormulaControl.GetCompileFormula("FightpowerFormula", FightpowerFormula))
+        totalFightPower = eval(FormulaControl.GetCompileFormula("FightpowerFormula", FightpowerFormula)) + fpEx
         
         #GameWorld.DebugLog("MfpType=%s,FightPower=%s, %s" % (self.mfpType, totalFightPower, self.GetMFPAttrStr()))
         if totalFightPower > ShareDefine.Def_UpperLimit_DWord:

--
Gitblit v1.8.0