From 18a10a74bd18363b8a325044d0cec5e4838531a3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期日, 05 五月 2019 10:55:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.py | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.py
index fe35c08..9b81661 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.py
@@ -110,7 +110,7 @@
continue
eatItemID = eatItem.GetItemTypeID()
if eatItemID != ItemIDList[i]:
- GameWorld.Log('时装分解 发的物品ID不对应index=%s eatItemID=%s,ItemIDList[i]=%s'%(index, eatItemID, ItemIDList[i]))
+ GameWorld.Log('时装分解 发的物品ID不对应index=%s eatItemID=%s,ItemIDList[i]=%s'%(index, eatItemID, ItemIDList[i]), playerID)
continue
itemData = GameWorld.GetGameData().GetItemByTypeID(eatItemID)
if not itemData:
@@ -127,7 +127,7 @@
addExp += itemCnt * curEff.GetEffectValue(1)
ItemCommon.DelItem(curPlayer, eatItem, itemCnt, True, ChConfig.ItemDel_CoatDecompose)
if not addExp:
- GameWorld.Log(' 时装分解, 没有可分解的ItemIDList=%s'%ItemIDList)
+ GameWorld.Log(' 时装分解, 没有可分解的ItemIDList=%s'%ItemIDList, playerID)
return
totalExp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ClothesChestEXP) + addExp
curChestLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ClothesChestLV)
@@ -170,6 +170,13 @@
continue
for attrID, attrValue in starAttrDict[str(skinLV)].items():
PlayerControl.CalcAttrDict_Type(int(attrID), attrValue, allAttrList)
+ #时装柜属性
+ curChestLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ClothesChestLV)
+ ipyData = IpyGameDataPY.GetIpyGameDataNotLog('CoatChestUp', curChestLV)
+ if ipyData:
+ for attrID, attrValue in ipyData.GetAddAttr().items():
+ PlayerControl.CalcAttrDict_Type(int(attrID), attrValue, allAttrList)
+
# 保存计算值
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_Coat, allAttrList)
return
@@ -183,7 +190,7 @@
# @param destIndex 目标索引
# @return
def SwitchCoat(curPlayer, srcBackpack, desBackPack, srcIndex, destIndex):
- clothesPlaceList = [ShareDefine.retWeaponSkin, ShareDefine.retClothesSkin, ShareDefine.retWeapon2Skin]
+ clothesPlaceList = [6,7,8]#[ShareDefine.retWeaponSkin, ShareDefine.retClothesSkin, ShareDefine.retWeapon2Skin]
if not ((desBackPack == IPY_GameWorld.rptEquip and srcBackpack == ShareDefine.rptTempSwap and destIndex in clothesPlaceList) \
or (srcBackpack == IPY_GameWorld.rptEquip and desBackPack == ShareDefine.rptTempSwap and srcIndex in clothesPlaceList)):
return False
--
Gitblit v1.8.0