From 157a8787e84d14d3907aadb13f639964b6bd95d4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 11 十二月 2018 10:53:03 +0800
Subject: [PATCH] 5390  【后端】【1.3】【1.3.100】神兵特效展示界面新增战力与属性展示

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py          |   10 ++++++++--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py |   12 ++++++++++--
 PySysDB/PySysDBPY.h                                                                           |    2 ++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index e9b8833..663ac40 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -1427,4 +1427,6 @@
 	BYTE		GWType;	//神兵类型
 	WORD		Level;	//神兵等级
 	char		NotifyCode;	//广播
+	DWORD		FightPower;	//增加战力
+	dict		Attr;	//属性加成
 };
\ No newline at end of file
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 1f76954..3d06030 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -1127,6 +1127,8 @@
                         ("BYTE", "GWType", 0),
                         ("WORD", "Level", 0),
                         ("char", "NotifyCode", 0),
+                        ("DWORD", "FightPower", 0),
+                        ("dict", "Attr", 0),
                         ),
                 }
 
@@ -3423,12 +3425,16 @@
     def __init__(self):
         self.GWType = 0
         self.Level = 0
-        self.NotifyCode = ""
+        self.NotifyCode = ""
+        self.FightPower = 0
+        self.Attr = {}
         return
         
     def GetGWType(self): return self.GWType # 神兵类型
     def GetLevel(self): return self.Level # 神兵等级
-    def GetNotifyCode(self): return self.NotifyCode # 广播
+    def GetNotifyCode(self): return self.NotifyCode # 广播
+    def GetFightPower(self): return self.FightPower # 增加战力
+    def GetAttr(self): return self.Attr # 属性加成
 
 
 def Log(msg, playerID=0, par=0):
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 d6acc7c..3e80fe5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.py
@@ -143,8 +143,16 @@
             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)
+        #特效等级属性战力
+        godWeaponEffectData = IpyGameDataPY.InterpolationSearch("GodWeaponEffect", "Level", attrLV, {"GWType":gwType})
+        if godWeaponEffectData:
+            for attrID, attrValue in godWeaponEffectData.GetAttr().items():
+                PlayerControl.CalcAttrDict_Type(attrID, attrValue, allAttrList)
+            fightPowerEx += godWeaponEffectData.GetFightPower()
+        
+        
+    # 附加战力
+    curPlayer.SetDict(ChConfig.Def_PlayerKey_MFPEx % ShareDefine.Def_MFPType_GodWeapon, fightPowerEx)
     GameWorld.DebugLog("神兵属性:%s" % allAttrList)
     # 保存计算值
     PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_GodWeapon, allAttrList)   

--
Gitblit v1.8.0