From 383717a8ea488971e4f665da9499bb030ba11a69 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 10 六月 2019 19:49:58 +0800
Subject: [PATCH] 7196 【后端】【2.0】冰晶矿脉找回规则
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py | 2 +-
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index ae4b74e..52b00b2 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -1745,8 +1745,8 @@
delIndex = -1
expireTime = 0
for itemID in needItemIDList:
- hasEnough, itemIndexList = ItemCommon.GetItem_FromPack_ByID(itemID, itemPack, 1)
- if not hasEnough:
+ hasEnough, itemIndexList = ItemCommon.GetItem_FromPack_ByID(itemID, itemPack, 10)
+ if not itemIndexList:
#GameWorld.DebugLog("重置加点 item(%s) isn't enough" % (needItemID))
continue
@@ -1759,7 +1759,7 @@
if remainingTime <= 0:
#过期
continue
- if remainingTime < expireTime:
+ if not expireTime or remainingTime < expireTime:
expireTime = remainingTime
delIndex = itemIndex
else:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
index 81dca15..2c96581 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
@@ -152,7 +152,7 @@
elif dailyQuestData.GetRelatedType() == 1:#每日活动
dailyID = dailyQuestData.GetRelatedID()
curDayTimes, dayTimesLimit = PlayerActivity.GetDailyActionFinishCnt(curPlayer, dailyID)
- if dailyID == ShareDefine.DailyActionID_Dice:#我要太极只分是否参加过，没参加过才能找回，次数算1次
+ if dailyID in [ShareDefine.DailyActionID_Dice, ShareDefine.DailyActionID_IceLode]:#我要太极只分是否参加过，没参加过才能找回，次数算1次
dayTimesLimit = 1
if curDayTimes:
curDayTimes = dayTimesLimit
--
Gitblit v1.8.0