From 57d60ef7648868c76189d3a127dc3e5f0800f6f3 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 27 六月 2019 14:27:31 +0800
Subject: [PATCH] 7589 【2.0.100】【后端】资源找回优化
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 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 bb85dec..ef916c3 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWing.py
@@ -23,6 +23,7 @@
import ItemCommon
import GameFuncComm
import PlayerSuccess
+import ItemControler
import ChEquip
import random
@@ -83,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
@@ -107,7 +108,7 @@
wingClassLV = ItemCommon.GetItemClassLV(curWing)
for index in materialMessageList:
curItem = itemPack.GetAt(index)
- if not ItemCommon.CheckItemCanUse(curItem):
+ if not ItemCommon.CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):
GameWorld.DebugLog("这个格子没有合法材料,index=%s" % index)
continue
curItemID = curItem.GetItemTypeID()
@@ -277,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())
@@ -313,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