From 039380507f8725e17c3cff5e7c36d1833b2c52ff Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 05 十二月 2018 13:42:36 +0800
Subject: [PATCH] 5240 【后端】【1.3】【1.3.100】仙族法宝激活增加战力

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py |    6 ++++--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py            |    7 +++++--
 PySysDB/PySysDBPY.h                                                                             |    1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 220f95d..fe91079 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -666,6 +666,7 @@
 	DWORD		ActiveMWID;	//激活法宝ID
 	list		ItemAward;	//物品奖励[itemID,cnt,isbind]
 	DWORD		ActiveSoulID;	//激活魂ID
+	DWORD		PowerEx;	//额外固定战力
 };
 
 //法宝特权表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index bfc23d2..87f794c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -560,6 +560,7 @@
                         ("DWORD", "ActiveMWID", 0),
                         ("list", "ItemAward", 0),
                         ("DWORD", "ActiveSoulID", 0),
+                        ("DWORD", "PowerEx", 0),
                         ),
 
                 "TreasurePrivilege":(
@@ -2219,7 +2220,8 @@
         self.UnLockSkill = []
         self.ActiveMWID = 0
         self.ItemAward = []
-        self.ActiveSoulID = 0
+        self.ActiveSoulID = 0
+        self.PowerEx = 0
         return
         
     def GetMWID(self): return self.MWID # 法宝ID
@@ -2229,7 +2231,8 @@
     def GetUnLockSkill(self): return self.UnLockSkill # 解锁的技能
     def GetActiveMWID(self): return self.ActiveMWID # 激活法宝ID
     def GetItemAward(self): return self.ItemAward # 物品奖励[itemID,cnt,isbind]
-    def GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
+    def GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
+    def GetPowerEx(self): return self.PowerEx # 额外固定战力
 
 # 法宝特权表
 class IPY_TreasurePrivilege():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
index 487b97e..672f459 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -500,7 +500,8 @@
     allAttrList1 = [{} for _ in range(4)] #人族法宝
     allAttrList2 = [{} for _ in range(4)] #魔族法宝
     allAttrList3 = [{} for _ in range(4)] #仙族法宝
-
+    mwTypeMfpTypeDict = {1:ShareDefine.Def_MFPType_MagicWeapon1,2:ShareDefine.Def_MFPType_MagicWeapon2,3:ShareDefine.Def_MFPType_MagicWeapon3}
+    addPowerDict = {} #额外战力
     signDayMWID = IpyGameDataPY.GetFuncCfg('MWSignDayAttr', 2)
     ipyDataMgr = IpyGameDataPY.IPY_Data()
     for i in xrange(ipyDataMgr.GetTreasureCount()):
@@ -520,6 +521,7 @@
         #=======================================================================
         treasureType = treasureIpyData.GetTreasureType()
         if isActive:
+            mfpType = mwTypeMfpTypeDict.get(treasureType, ShareDefine.Def_MFPType_Role)
             #等级属性
             curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % magicWeaponID)
             for lv in xrange(curMWLV+1):
@@ -527,6 +529,7 @@
                 if upIpyData:
                     attrDict = upIpyData.GetAddAttr()
                     GameWorld.AddDictValue(allAttrDict, attrDict)
+                    addPowerDict[mfpType] = addPowerDict.get(mfpType, 0) + upIpyData.GetPowerEx()
                     
             if magicWeaponID == signDayMWID:
                 #签到属性
@@ -570,7 +573,6 @@
     PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_MagicWeapon3, allAttrList3)
     #技能解锁战力
     nextSkillDict = GetPotentialsSkillInfo(curPlayer)
-    addPowerDict = {}
     for skillID, info in nextSkillDict.items():
         needSkilllv, nextSkillID, addPower = info
         skillManager = curPlayer.GetSkillManager()

--
Gitblit v1.8.0