From 82a94e55b5710d50643b3d0bf8581afbb3f58cf2 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 18 六月 2019 16:15:05 +0800
Subject: [PATCH] 7339 子 【开发】【2.0】称号,灵宠,技能附带效果 / 【后端】【2.0】新增效果

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 ed073ad..2b5af45 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -3451,8 +3451,8 @@
     if addPoint == None:
         raise Exception('玩家获得升级属性点异常, curLV = %s PlayerID = %s' % (curLV, curPlayerID))
         return
-    
-    return int(addPoint) + GetFabaoAddPoint(curPlayer)
+    multiple = GetLVAddPointMultiple(curPlayer)
+    return int(addPoint+ GetFabaoAddPoint(curPlayer)) * multiple
 
 def GetAllPointByLV(curPlayer):
     ##获取当前等级可得到属性点数
@@ -3460,19 +3460,28 @@
     curLV = curPlayer.GetLV()
     if curLV < openLV:
         return 0
-    # 初始点+升级点+境界点
+    # 初始点+(升级点+法宝效果)*称号效果倍数+境界点
     setFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2)
     fabaoAddPoint = GetFabaoAddPoint(curPlayer)
+    multiple = GetLVAddPointMultiple(curPlayer)
     addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {})
     for rangLVs, point in addPointDict.items():
         if curLV < rangLVs[0]:
             continue
-        setFreePoint += (point + fabaoAddPoint) * (min(curLV, rangLVs[1]) - rangLVs[0] + 1)
+        setFreePoint += (point + fabaoAddPoint) * multiple * (min(curLV, rangLVs[1]) - rangLVs[0] + 1)
     
     #境界提升点数
     setFreePoint += curPlayer.GetOfficialRank() * IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 3)
     return setFreePoint
 
+def GetLVAddPointMultiple(curPlayer):
+    # 获取等级加点的倍数
+    multiple = 1
+    titleID = IpyGameDataPY.GetFuncCfg("TitleAddPoint")
+    if titleID and curPlayer.GetDienstgradManager().GetDienstgrad(titleID):
+        multiple = IpyGameDataPY.GetFuncCfg("TitleAddPoint", 2) or 1
+    return multiple
+
 def GetFabaoAddPoint(curPlayer):
     #法宝额外增加玩家每级获得的灵根点
     mwID = IpyGameDataPY.GetFuncCfg('FabaoAddPoint', 1)

--
Gitblit v1.8.0