From b765ceca4dc1bbdb4e3ff595d5acc0fd04d15401 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 30 一月 2019 20:09:34 +0800
Subject: [PATCH] 6154 【后端】【1.5.200】击晕属性优化
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py
index 21f344f..a4f10f9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py
@@ -121,6 +121,7 @@
if totalMoney:
addDataDict = {"recycleItemList":recycleItemList}
PlayerControl.GiveMoney(curPlayer, ShareDefine.TYPE_Price_Danjing, totalMoney, ChConfig.Def_GiveMoney_UseItem, addDataDict)
+ curPlayer.Sync_MakeItemAnswer(ShareDefine.Def_mitRecycleAttrFruit, 1)
return
@@ -262,7 +263,9 @@
if hasUseCnt <= 0:
return DefaultReturn
PlayerControl.NomalDictSetProperty(curPlayer, eatCntKey, eatCnt)
-
+ if funcIndex == ShareDefine.Def_AttrFruitFunc_Stove:
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_UseStoveBylv, hasUseCnt, [item.GetLV()])
+
ItemCommon.DelItem(curPlayer, item, hasUseCnt, True, ChConfig.ItemDel_AttrFruit)
return addValue, hasUseCnt
@@ -294,7 +297,16 @@
limitType = Def_LimitType_Cnt #默认按个数
-
+
+ # 增加附加战力，仅按个数时有效
+ fightPowerExfigKey = ChConfig.Def_PlayerKey_FruitFightPowerEx % (funcIndex)
+ fightPowerEx = curPlayer.GetDictByKey(fightPowerExfigKey)
+ fruitIpyData = GetAttrFruitIpyData(fruitItemID)
+ addFightPowerEx = 0 if not fruitIpyData else fruitIpyData.GetFightPowerEx()
+ fightPowerEx = fightPowerEx + addFightPowerEx * addValue
+ curPlayer.SetDict(fightPowerExfigKey, fightPowerEx)
+ GameWorld.DebugLog(" Add funcIndex=%s,addFightPowerEx=%s,addValue=%s,fightPowerEx=%s" % (funcIndex, addFightPowerEx, addValue, fightPowerEx))
+
for i in range(itemData.GetEffectCount()):
curEffect = itemData.GetEffectByIndex(i)
effectID = curEffect.GetEffectID()
@@ -366,8 +378,9 @@
#GameWorld.DebugLog(" effectID=%s,addValue=%s" % (effectID, addValue))
PlayerControl.CalcAttrDict_Type(effectID, addValue, allAttrList)
- #GameWorld.DebugLog(" 有果实属性 allAttrList=%s" % str(allAttrList))
- return
+ fightPowerEx = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_FruitFightPowerEx % (funcIndex))
+ #GameWorld.DebugLog(" 有果实属性funcIndex=%s,fightPowerEx=%s,allAttrList=%s" % (funcIndex, fightPowerEx, allAttrList))
+ return fightPowerEx
## 统计百分比属性对功能内层的属性增加
@@ -465,3 +478,18 @@
return eatCntDict
+def IsFruitEatFull(curPlayer, itemID):
+ #使用次数是否已满
+ ipyData = GetAttrFruitIpyData(itemID)
+ if not ipyData:
+ return
+
+ maxEatCnt = ipyData.GetMaxUseCnt()
+ eatCntKey = ChConfig.Def_PDict_AttrFruitEatCnt % itemID
+ limitType = Def_LimitType_Cnt
+ if limitType == Def_LimitType_Attr:
+ eatCntKey = ChConfig.Def_PDict_AttrFruitAddValue % itemID
+ eatCnt = curPlayer.NomalDictGetProperty(eatCntKey) # 已吃次数/属性值
+ if eatCnt >= maxEatCnt:
+ return True
+ return
\ No newline at end of file
--
Gitblit v1.8.0