From 0cd15ea06a2d8bc9ffa3f4144c210e90b649f4ba Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 10 十月 2020 15:14:19 +0800
Subject: [PATCH] 4761 【主干】【长尾】【BT】开服许愿池第一天奖池是空的

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py |   49 ++++++++++++++++++++++++-------------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py
index f717c6a..e0064ba 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py
@@ -28,14 +28,14 @@
 #  @return None
 #  @remarks 函数详细说明.
 def OnExec(curPlayer, msgList):
-    
     mfpTypeName = {ShareDefine.Def_MFPType_Role:"角色",
+                   ShareDefine.Def_MFPType_LingGen:"灵根",
                    ShareDefine.Def_MFPType_Equip:"装备",
+                   ShareDefine.Def_MFPType_Star:"升星",
                    ShareDefine.Def_MFPType_Plus:"强化",
                    ShareDefine.Def_MFPType_Stone:"宝石",
-                   ShareDefine.Def_MFPType_Suit:"套装",
-                   ShareDefine.Def_MFPType_Wing:"翅膀",
                    ShareDefine.Def_MFPType_Wash:"洗练",
+                   ShareDefine.Def_MFPType_LingQi:"灵器",
                    ShareDefine.Def_MFPType_Pet:"灵宠",
                    ShareDefine.Def_MFPType_Horse:"坐骑",
                    ShareDefine.Def_MFPType_Prestige:"境界",
@@ -43,31 +43,29 @@
                    ShareDefine.Def_MFPType_Dienstgrad:"称号",
                    ShareDefine.Def_MFPType_Rune:"符印",
                    ShareDefine.Def_MFPType_GatherSoul:"聚魂",
-                   ShareDefine.Def_MFPType_Horcrux:"魂器",
-                   ShareDefine.Def_MFPType_MagicWeapon1:"人族",
                    ShareDefine.Def_MFPType_StoveYao:"丹药",
+                   ShareDefine.Def_MFPType_MagicWeapon1:"人族",
                    ShareDefine.Def_MFPType_MagicWeapon2:"魔族",
                    ShareDefine.Def_MFPType_MagicWeapon3:"仙族",
-                   ShareDefine.Def_MFPType_MagicWeapon4:"王者法宝",
+                   ShareDefine.Def_MFPType_MagicWeapon4:"王者",
                    ShareDefine.Def_MFPType_PetSoul:"宠魂",
                    ShareDefine.Def_MFPType_HorseSoul:"骑魂",
-                   ShareDefine.Def_MFPType_MagicWeaponSoul:"法宝之魂",
                    ShareDefine.Def_MFPType_Dogz:"神兽",
+                   ShareDefine.Def_MFPType_Coat:"时装",
                    ShareDefine.Def_MFPType_Other:"其他",
                    }
     
     funcIndexName = {
                      ChConfig.Def_CalcAttrFunc_RoleBase:"角色基础",
-                     ChConfig.Def_CalcAttrFunc_EquipBaseWeapon:"武器物品表基础属性",
-                     ChConfig.Def_CalcAttrFunc_EquipBaseArmor:"防具物品表基础属性",
-                     ChConfig.Def_CalcAttrFunc_EquipBaseRelics:"圣器物品表基础属性",
-                     ChConfig.Def_CalcAttrFunc_Equip:"装备其他",
-                     ChConfig.Def_CalcAttrFunc_PlusBase:"装备位强化基础",
-                     ChConfig.Def_CalcAttrFunc_PlusEx:"装备位强化累加",
-                     ChConfig.Def_CalcAttrFunc_Stone:"装备宝石",
-                     ChConfig.Def_CalcAttrFunc_Suit:"套装",
-                     ChConfig.Def_CalcAttrFunc_Wing:"翅膀",
+                     ChConfig.Def_CalcAttrFunc_LingGen:"灵根",
+                     ChConfig.Def_CalcAttrFunc_LingGenQuailty:"灵根品质",
+                     ChConfig.Def_CalcAttrFunc_Equip:"装备",
+                     ChConfig.Def_CalcAttrFunc_Star:"升星",
+                     ChConfig.Def_CalcAttrFunc_Plus:"强化",
+                     ChConfig.Def_CalcAttrFunc_Stone:"宝石",
                      ChConfig.Def_CalcAttrFunc_Wash:"洗练",
+                     ChConfig.Def_CalcAttrFunc_LingQi:"灵器",
+                     ChConfig.Def_CalcAttrFunc_LingQiAttr:"灵器属性",
                      ChConfig.Def_CalcAttrFunc_Pet:"灵宠",
                      ChConfig.Def_CalcAttrFunc_Horse:"坐骑",
                      ChConfig.Def_CalcAttrFunc_Prestige:"境界",
@@ -75,13 +73,6 @@
                      ChConfig.Def_CalcAttrFunc_Dienstgrad:"称号",
                      ChConfig.Def_CalcAttrFunc_Rune:"符印",
                      ChConfig.Def_CalcAttrFunc_GatherSoul:"聚魂",
-                     ChConfig.Def_CalcAttrFunc_Horcrux:"魂器",
-                     ChConfig.Def_CalcAttrFunc_MagicWeapon1:"人族法宝属性",
-                     ChConfig.Def_CalcAttrFunc_MagicWeapon2:"魔族法宝属性", 
-                     ChConfig.Def_CalcAttrFunc_MagicWeapon3:"仙族法宝属性", 
-                     ChConfig.Def_CalcAttrFunc_MagicWeapon4:"王者法宝属性", 
-                     ChConfig.Def_CalcAttrFunc_EquipOutOfPrint:"绝版属性随等级变化",
-                     ChConfig.Def_CalcAttrFunc_EquipAllStars:"装备全身星级属性",
                      ChConfig.Def_CalcAttrFunc_Success:"成就",
                      ChConfig.Def_CalcAttrFunc_VIP:"VIP",
                      ChConfig.Def_CalcAttrFunc_Stove:"炼丹炉",
@@ -93,8 +84,14 @@
                      ChConfig.Def_CalcAttrFunc_PetSkill:"宠物技能属性",
                      ChConfig.Def_CalcAttrFunc_StoveYao:"炼丹炉丹药",
                      ChConfig.Def_CalcAttrFunc_PetSign:"宠物签到",
-                     ChConfig.Def_CalcAttrFunc_MagicWeaponSoul:"法宝之魂",
                      ChConfig.Def_CalcAttrFunc_Dogz:"神兽",
+                     ChConfig.Def_CalcAttrFunc_Coat:"时装",
+                     ChConfig.Def_CalcAttrFunc_MagicWeapon1:"人族法宝属性",
+                     ChConfig.Def_CalcAttrFunc_MagicWeapon2:"魔族法宝属性", 
+                     ChConfig.Def_CalcAttrFunc_MagicWeapon3:"仙族法宝属性", 
+                     ChConfig.Def_CalcAttrFunc_MagicWeapon4:"王者法宝属性", 
+                     ChConfig.Def_CalcAttrFunc_HorseSkin:"坐骑觉醒", 
+                     ChConfig.Def_CalcAttrFunc_PetSkin:"灵宠觉醒", 
                      }
     
     GameWorld.DebugAnswer(curPlayer, "PrintFightPower 模块类型(可选)")
@@ -107,8 +104,10 @@
         GameWorld.DebugAnswer(curPlayer, "--- %s战力(%s): %s" % (mfpTypeName[mfpType], mfpType, fightPower))
         for funcIndex in ChConfig.MFPTypeAttrFuncIndexDict[mfpType]:
             funcName = funcIndexName.get(funcIndex, "属性(%s)" % funcIndex)
-            attrInfo = PlayerControl.GetCalcAttrListValue(curPlayer, funcIndex)
+            attrInfo, insidePerAttrDict = PlayerControl.GetCalcAttrListValue(curPlayer, funcIndex)
             GameWorld.DebugAnswer(curPlayer, "%s:%s" % (funcName, attrInfo))
+            if insidePerAttrDict:
+                GameWorld.DebugAnswer(curPlayer, "%s内部加成:%s" % (funcName, insidePerAttrDict))
         return
     
     GameWorld.DebugAnswer(curPlayer, "===== 总战力: %s" % curPlayer.GetFightPower())

--
Gitblit v1.8.0