From 8756503aa04c2efb48aa756f0c939473c57403c2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 10 十一月 2023 15:24:19 +0800
Subject: [PATCH] 5503 【BT0.1】【主干】多个倒计时礼包打开异常 9961 【BT0.1】【主干】倒计时礼包

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
index 478d4c9..76e7afd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py
@@ -936,16 +936,21 @@
 #  @return None or True
 #  @remarks 函数详细说明.
 def UseItemSelf_Item(curPlayer, curItem, tick):
-    if (tick - curPlayer.GetItemCDStartTime(curItem.GetCDType())) < curItem.GetCDTime():
-        #CD冷却时间未到
-        #PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_749572")
-        return
     
     if curItem.GetType() == ChConfig.Def_ItemType_CanUseByCDTime:
         curItemPastTime = int(time.time()) - curItem.GetUserAttr(ShareDefine.Def_IudetCreateTime)
         if curItemPastTime < curItem.GetCDTime():
+            PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_749572")
             GameWorld.DebugLog("未到使用时间,不可使用! itemID=%s,curItemPastTime=%s < CDTime(%s)" 
                                % (curItem.GetItemTypeID(), curItemPastTime, curItem.GetCDTime()))
+            return
+    else:
+        if (tick - curPlayer.GetItemCDStartTime(curItem.GetCDType())) < curItem.GetCDTime():
+            #CD冷却时间未到
+            PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_749572")
+            GameWorld.DebugLog("CD冷却时间未到,itemID=%s,CDType=%s,tick(%s)-cdStartTime(%s)=%s < %s" 
+                               % (curItem.GetItemTypeID(), curItem.GetCDType(), tick, curPlayer.GetItemCDStartTime(curItem.GetCDType()), 
+                                  tick - curPlayer.GetItemCDStartTime(curItem.GetCDType()), curItem.GetCDTime()))
             return
         
     #检查使用等级
@@ -1788,7 +1793,8 @@
     
     #------------使用物品成功, 执行相关操作
     curPlayer.Sync_UseItem(curItemTypeID, itemIndex)
-    curPlayer.SetItemCD(curItemCDType, tick)
+    if curItemCDType:
+        curPlayer.SetItemCD(curItemCDType, tick)
     return
 
 #---------------------------------------------------------------------

--
Gitblit v1.8.0