From e3b5f645a34fe57e0a8da069e4112aa00418afd6 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 24 十一月 2018 17:29:02 +0800
Subject: [PATCH] 4762 Add: B3 11 助战记录列表 #tagGCHelpBattleRecordList Add: B2 08 获得仙缘币信息 #tagMCAddXianyuanCoinMsg

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
index 4d95da1..0e92874 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
@@ -39,6 +39,11 @@
 
 import random
 
+Def_GodWeaponType_HP = 1  # 生命神兵类型
+Def_GodWeaponType_Atk = 2  # 攻击神兵类型
+Def_GodWeaponType_SuperHit = 3  # 暴击神兵类型
+Def_GodWeaponType_Def = 4  # 护盾神兵类型
+
 ## 神器功能登录处理
 #  @param curPlayer 玩家
 #  @return None
@@ -49,6 +54,7 @@
     
     #老号相关神兵场景特效等级同步支持
     if curPlayer.GetExAttr15() == 0:
+        playerID = curPlayer.GetPlayerID()
         ipyDataMgr = IpyGameDataPY.IPY_Data()
         maxType = ipyDataMgr.GetGodWeaponByIndex(ipyDataMgr.GetGodWeaponCount()-1).GetType()
         for setWeaponType in xrange(1, maxType + 1):
@@ -56,16 +62,25 @@
             if not setLV:
                 continue
             SetGodWeaponLV(curPlayer, setWeaponType, setLV)
-            GameWorld.Log("老号设置神兵场景等级: setWeaponType=%s,setLV=%s" % (setWeaponType, setLV), curPlayer.GetPlayerID())
+            
+            giveSkillList = []
+            for attrLV in xrange(1, setLV + 1):
+                godWeaponData = IpyGameDataPY.GetIpyGameData('GodWeapon', setWeaponType, attrLV)
+                if godWeaponData:
+                    giveSkillID = GodWeaponLVUP(curPlayer, godWeaponData, attrLV)
+                    if giveSkillID:
+                        giveSkillList.append(giveSkillID)
+            GameWorld.Log("老号设置神兵场景等级: setWeaponType=%s,setLV=%s, giveSkillList=%s" % (setWeaponType, setLV, giveSkillList), playerID)
+            
     return
 
 def SetGodWeaponLV(curPlayer, weaponType, lv):
     ## 设置神兵等级,同步设置场景神兵等级
     PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_GodWeaponLV % weaponType, lv)
-    sceneEffectsDict = {1:[lambda curObj, value:curObj.SetExAttr15(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_1],
-                        2:[lambda curObj, value:curObj.SetExAttr16(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_2],
-                        3:[lambda curObj, value:curObj.SetExAttr17(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_3],
-                        4:[lambda curObj, value:curObj.SetExAttr18(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_4],
+    sceneEffectsDict = {Def_GodWeaponType_HP:[lambda curObj, value:curObj.SetExAttr15(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_1],
+                        Def_GodWeaponType_Atk:[lambda curObj, value:curObj.SetExAttr16(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_2],
+                        Def_GodWeaponType_SuperHit:[lambda curObj, value:curObj.SetExAttr17(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_3],
+                        Def_GodWeaponType_Def:[lambda curObj, value:curObj.SetExAttr18(value), ShareDefine.CDBPlayerRefresh_GodWeaponLV_4],
                         }
     if weaponType in sceneEffectsDict:
         setFunc, notifyType = sceneEffectsDict[weaponType]
@@ -102,6 +117,7 @@
     ipyDataMgr = IpyGameDataPY.IPY_Data()
     maxType = ipyDataMgr.GetGodWeaponByIndex(ipyDataMgr.GetGodWeaponCount()-1).GetType()
 
+    fightPowerEx = 0  # 额外增加的战力
     allAttrList = [{} for i in range(4)]
     for gwType in xrange(1, maxType + 1):
         # 因为神兵解锁条件做了调整,由之前的0~1阶解锁改为由前置神兵类型等级解锁,默认解锁后为1阶
@@ -116,6 +132,9 @@
         for i, attrID in enumerate(attrTypeList):
             PlayerControl.CalcAttrDict_Type(attrID, attrValueList[i], allAttrList)
         
+        fightPowerEx += IpyGameDataPY.GetFuncEvalCfg('MagicExterior').get(str(gwType), 0)
+        # 附加战力
+        curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_GodWeapon, fightPowerEx)
     GameWorld.DebugLog("神兵属性:%s" % allAttrList)
     # 保存计算值
     PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_GodWeapon, allAttrList)   
@@ -180,7 +199,7 @@
     
     #1.判断表中有没此类型,2.是否满级,3.判断是否有物品
     attrLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GodWeaponLV % weaponType)
-    if not attrLV:
+    if not attrLV and Def_GodWeaponType_SuperHit != weaponType:
         GameWorld.DebugLog("神兵未解锁,无法升级!weaponType=%s,attrLV=%s" % (weaponType, attrLV))
         return
       
@@ -301,6 +320,9 @@
             sysMark = godWeaponData.GetSysMark()
             if sysMark:
                 PlayerControl.WorldNotify(0, sysMark, [curPlayer.GetName(), attrLV, skillID])
+            return skillID
+    return
+    
 
 
 

--
Gitblit v1.8.0