From 866ce280c4c931a34cedd06d86b81019018d4160 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 03 一月 2020 20:33:56 +0800
Subject: [PATCH] 8364 【恺英】【后端】缥缈随机任务(S副本未处理)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py |   35 ++++-------------------------------
 1 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
index 2270926..eec57fe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
@@ -84,7 +84,7 @@
         GameWorld.DebugLog("没有精炼值")
         return
     WingProgressUP(curWing, totalPoint, materialItemDict, curPlayer)
-    CalcWingAttr(curPlayer)
+    ChEquip.RefreshPlayerLingQiEquipAttr(curPlayer)
     PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
     PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_WingRefine, 1)
     return
@@ -108,7 +108,7 @@
     wingClassLV = ItemCommon.GetItemClassLV(curWing)
     for index in materialMessageList:
         curItem = itemPack.GetAt(index)
-        if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
+        if not ItemCommon.CheckItemCanUse(curItem):
             GameWorld.DebugLog("这个格子没有合法材料,index=%s" % index)
             continue
         curItemID = curItem.GetItemTypeID()
@@ -257,7 +257,7 @@
     if not wingData:
         return
     wingClassLV = ItemCommon.GetItemClassLV(wingData)
-    return IpyGameDataPY.GetIpyGameData("WingRefineAttr", wingClassLV)
+    return IpyGameDataPY.GetIpyGameDataNotLog("WingRefineAttr", wingClassLV)
 
 def GetWingProgressPerValueByID(itemID, per):
     ## 获取翅膀精炼百分比对应的精炼值
@@ -278,29 +278,7 @@
 #  @param curPlayer 玩家
 #  @param allAttrList 属性列表
 #  @return None
-def CalcWingAttr(curPlayer):
-    allAttrList = [{} for _ in range(4)]
-    equipPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
-    curWing = equipPack.GetAt(ShareDefine.retWing)
-    
-    if not ItemCommon.CheckItemCanUse(curWing):
-        #GameWorld.DebugLog("没有穿戴翅膀!")
-        PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Wing, allAttrList)
-        return
-    
-    if not ItemCommon.CheckItemCanUseByExpireTime(curWing):
-        # 过期
-        PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Wing, allAttrList)
-        return False
-    
-    # 物品表固定效果属性
-    for effIndex in xrange(curWing.GetEffectCount()):
-        curEff = curWing.GetEffectByIndex(effIndex)
-        effID = curEff.GetEffectID()
-        if effID == 0:
-            continue
-        PlayerControl.CalcAttrDict_Type(effID, curEff.GetEffectValue(0), allAttrList)
-    #GameWorld.DebugLog("翅膀固定属性: %s" % allAttrList)
+def CalcWingAttrEx(curPlayer, curWing, allAttrList):
     
     # 精炼属性
     wingAttrIpyData = GetWingRefineAttrData(curWing.GetItemTypeID())
@@ -314,11 +292,6 @@
         for effID, value in fujiaValueDict.items():
             PlayerControl.CalcAttrDict_Type(effID, int(value * rate), allAttrList)
     #GameWorld.DebugLog("    精炼属性: %s" % allAttrList)
-            
-    # 传奇属性
-    ChEquip.CalcAttr_LegendAttr(curPlayer, curWing, allAttrList)
-    #GameWorld.DebugLog("    传奇属性: %s" % allAttrList)
-    PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Wing, allAttrList)
     return
 
  

--
Gitblit v1.8.0