From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.py |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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..f92a2e0 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
 
@@ -465,3 +468,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