From 2a1039feedbd432ddadb8bc7d01bf1a173b77142 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 31 一月 2019 14:09:50 +0800
Subject: [PATCH] 6087 【后端】【1.5.200】春节红包雨活动（增加配置未用完的次数过天可否累加）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py | 42 ++++++++++++------------------------------
1 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 92d2794..d0b6f3d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -38,6 +38,7 @@
import PlayerMagicWeapon
import time
import json
+import FormulaControl
#---------------------------------------------------------------------
##检查玩家是否可以换装
@@ -461,7 +462,7 @@
continue
# 翅膀属性在翅膀功能单独刷新
- if equipIndex == ShareDefine.retWing:
+ if equipIndex in ChConfig.EquipItemNoRefreshState or equipIndex == ShareDefine.retWing:
continue
curEquip = playerEquip.GetAt(equipIndex)
@@ -588,9 +589,13 @@
return
lv = curPlayer.GetLV()
+ OutOfPrintAttrFormatDict = IpyGameDataPY.GetFuncEvalCfg("OutOfPrintValue", 2, {})
for i, attrID in enumerate(OutOfPrintAttrIDList):
+ if str(attrID) not in OutOfPrintAttrFormatDict:
+ continue
+ attrFormat = OutOfPrintAttrFormatDict[str(attrID)]
maxOOPValue = OutOfPrintAttrValueList[i]
- value = eval(IpyGameDataPY.GetFuncCompileCfg("OutOfPrintValue", 1))
+ value = eval(FormulaControl.GetCompileFormula("OutOfPrintAttrFormat_%s" % attrID, attrFormat))
GameWorld.DebugLog("加绝版属性: %s +%s" % (attrID, value))
PlayerControl.CalcAttrDict_Type(attrID, value, allAttrListOutOfPrintEquip)
@@ -798,7 +803,7 @@
gameData = GameWorld.GetGameData()
effIndexList = [1, 2, 3, 4] # 第一个效果值是类型等级效果值，非属性效果值
-
+ gemLVList = []
for holeIndex in Operate_EquipStone.GetAllEquipPlaceHoleIndex():
curGemID = Operate_EquipStone.GetEquipIndexStoneIDAndIsBand(curPlayer, equipIndex, holeIndex)[0]
@@ -813,8 +818,10 @@
effectID, effectValue = curGemEffect.GetEffectID(), curGemEffect.GetEffectValue(0)
if effectID and effectValue:
PlayerControl.CalcAttrDict_Type(effectID, effectValue, allAttrList)
-
- return
+ gemEffect = curGem.GetEffectByIndex(0)
+ gemLV = gemEffect.GetEffectValue(1)
+ gemLVList.append(gemLV)
+ return gemLVList
#---------------------------------------------------------------------
## 装备添加Buff
@@ -1047,31 +1054,6 @@
suiteLVList.append(suiteLV)
return suiteLVList
-
-## 获取玩家装备预览信息
-def GetPlayerEquipView(curPlayer):
- if not curPlayer:
- return []
-
- playerID = curPlayer.GetPlayerID()
- playerEquipList = []
-
- playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
- #玩家当前可装备的装备类型
- for equipIndex in xrange(0, playerEquip.GetCount()):
-
- if equipIndex not in ShareDefine.RoleEquipType:
- continue
-
- curEquip = playerEquip.GetAt(equipIndex)
- if curEquip.IsEmpty():
- continue
-
- playerEquipList.append([curEquip.GetItemTypeID(), equipIndex, 0, 0])
- #curEquip.GetItemStarLV(), 0])
-
- #GameWorld.DebugLog("玩家装备信息：%s" % str(playerEquipList), playerID)
- return playerEquipList
#// A5 03 全身属性激活 #tagCMActiveAllEquipAttr
--
Gitblit v1.8.0