From 921b9a471b986fb148b8260d80ca23b9b25d42b4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 一月 2023 17:08:11 +0800
Subject: [PATCH] 9762 【BT8】【后端】藏宝阁 冲突 master

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py |   86 ++----------------------------------------
 1 files changed, 5 insertions(+), 81 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 c231e02..2b220f3 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
@@ -17,7 +17,6 @@
 
 import ChConfig
 import GameWorld
-import ShareDefine
 import PlayerControl
 
 
@@ -28,86 +27,9 @@
 #  @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_Wash:"洗练",
-                   ShareDefine.Def_MFPType_LingQi:"灵器",
-                   ShareDefine.Def_MFPType_Pet:"灵宠",
-                   ShareDefine.Def_MFPType_Horse:"坐骑",
-                   ShareDefine.Def_MFPType_Prestige:"境界",
-                   ShareDefine.Def_MFPType_GodWeapon:"神兵",
-                   ShareDefine.Def_MFPType_Dienstgrad:"称号",
-                   ShareDefine.Def_MFPType_Rune:"符印",
-                   ShareDefine.Def_MFPType_GatherSoul:"聚魂",
-                   ShareDefine.Def_MFPType_StoveYao:"丹药",
-                   ShareDefine.Def_MFPType_MagicWeapon1:"人族",
-                   ShareDefine.Def_MFPType_MagicWeapon2:"魔族",
-                   ShareDefine.Def_MFPType_MagicWeapon3:"仙族",
-                   ShareDefine.Def_MFPType_MagicWeapon4:"王者",
-                   ShareDefine.Def_MFPType_PetSoul:"宠魂",
-                   ShareDefine.Def_MFPType_HorseSoul:"骑魂",
-                   ShareDefine.Def_MFPType_FaQi:"法器",
-                   ShareDefine.Def_MFPType_Dogz:"神兽",
-                   ShareDefine.Def_MFPType_Coat:"时装",
-                   ShareDefine.Def_MFPType_Love:"情缘",
-                   ShareDefine.Def_MFPType_Charm:"魅力",
-                   ShareDefine.Def_MFPType_LianTi:"炼体",
-                   ShareDefine.Def_MFPType_Other:"其他",
-                   }
+    mfpTypeName = ChConfig.MFPTypeName
     
-    funcIndexName = {
-                     ChConfig.Def_CalcAttrFunc_RoleBase:"角色基础",
-                     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:"境界",
-                     ChConfig.Def_CalcAttrFunc_GodWeapon:"神兵",
-                     ChConfig.Def_CalcAttrFunc_Dienstgrad:"称号",
-                     ChConfig.Def_CalcAttrFunc_Rune:"符印",
-                     ChConfig.Def_CalcAttrFunc_GatherSoul:"聚魂",
-                     ChConfig.Def_CalcAttrFunc_Success:"成就",
-                     ChConfig.Def_CalcAttrFunc_VIP:"VIP",
-                     ChConfig.Def_CalcAttrFunc_Stove:"炼丹炉",
-                     ChConfig.Def_CalcAttrFunc_FamilyTech:"心法",
-                     ChConfig.Def_CalcAttrFunc_EquipDecompose:"装备分解",
-                     ChConfig.Def_CalcAttrFunc_PetSoul:"宠物魂石",
-                     ChConfig.Def_CalcAttrFunc_HorseSoul:"坐骑魂石",
-                     ChConfig.Def_CalcAttrFunc_HorseSkill:"坐骑技能属性",
-                     ChConfig.Def_CalcAttrFunc_PetSkill:"宠物技能属性",
-                     ChConfig.Def_CalcAttrFunc_StoveYao:"炼丹炉丹药",
-                     ChConfig.Def_CalcAttrFunc_PetSign:"宠物签到",
-                     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:"灵宠觉醒", 
-                     ChConfig.Def_CalcAttrFunc_HorseTarin:"坐骑培养",
-                     ChConfig.Def_CalcAttrFunc_PetTarin:"灵宠培养",
-                     ChConfig.Def_CalcAttrFunc_GuardTarin:"守护培养",
-                     ChConfig.Def_CalcAttrFunc_WingTarin:"翅膀培养",
-                     ChConfig.Def_CalcAttrFunc_PeerlessWeaponTrain:"灭世培养",
-                     ChConfig.Def_CalcAttrFunc_PeerlessWeapon2Train:"噬魂培养",
-                     ChConfig.Def_CalcAttrFunc_FaQi:"法器",
-                     ChConfig.Def_CalcAttrFunc_LoveRing:"情戒基础",
-                     ChConfig.Def_CalcAttrFunc_LoveRingCouple:"情戒仙侣",
-                     ChConfig.Def_CalcAttrFunc_Charm:"魅力",
-                     ChConfig.Def_CalcAttrFunc_LianTi:"炼体",
-                     }
+    funcIndexName = ChConfig.FuncIndexName
     
     GameWorld.DebugAnswer(curPlayer, "PrintFightPower 模块类型(可选)")
     
@@ -119,10 +41,12 @@
         GameWorld.DebugAnswer(curPlayer, "--- %s战力(%s): %s" % (mfpTypeName[mfpType], mfpType, fightPower))
         for funcIndex in ChConfig.MFPTypeAttrFuncIndexDict[mfpType]:
             funcName = funcIndexName.get(funcIndex, "属性(%s)" % funcIndex)
-            attrInfo, insidePerAttrDict = PlayerControl.GetCalcAttrListValue(curPlayer, funcIndex)
+            attrInfo, insidePerAttrDict, customAttrDict = PlayerControl.GetCalcAttrListValue(curPlayer, funcIndex)
             GameWorld.DebugAnswer(curPlayer, "%s:%s" % (funcName, attrInfo))
             if insidePerAttrDict:
                 GameWorld.DebugAnswer(curPlayer, "%s内部加成:%s" % (funcName, insidePerAttrDict))
+            if customAttrDict:
+                GameWorld.DebugAnswer(curPlayer, "%s自定义属性:%s" % (funcName, customAttrDict))
         return
     
     GameWorld.DebugAnswer(curPlayer, "===== 总战力: %s" % PlayerControl.GetFightPower(curPlayer))

--
Gitblit v1.8.0