From e19b08127ac798154fab5f8f11f782e54aaa025b Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期日, 05 五月 2019 14:16:36 +0800
Subject: [PATCH] 6457 缥缈仙域事件设置结束暂不做限制，防止异常导致无法结束
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyDomain.py | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyDomain.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyDomain.py
index 74a3504..2bcdc4d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyDomain.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyDomain.py
@@ -250,8 +250,12 @@
eventID = ipyData.GetID()
appearCntInfo = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FairyDomainEventAppearCnt % eventID)
hourAppearCntPri, dayAppearCntPri = appearCntInfo % 1000, appearCntInfo / 1000
- if hourAppearCntPri >= ipyData.GetHourCntPriLimit() or dayAppearCntPri >= ipyData.GetDayCntPriLimit():
- #超过今日或本小时个人可出现次数上限
+ hourCntPriLimit, dayCntPriLimit = ipyData.GetHourCntPriLimit(), ipyData.GetDayCntPriLimit()
+ if hourCntPriLimit and hourAppearCntPri >= hourCntPriLimit:
+ #超过本小时个人可出现次数上限
+ continue
+ if dayCntPriLimit and dayAppearCntPri >= dayCntPriLimit:
+ #超过今日个人可出现次数上限
continue
if eventID in PyGameData.g_fairyDomainLimit:
#超过全服可出现次数
@@ -317,9 +321,10 @@
GameLogic_CrossGrassland.DoResetCrossGrassland(curPlayer, ipyData.GetEventType(), fdeventID)
elif state == FDEventState_Visited:
- if curState != FDEventState_Visiting:
- GameWorld.Log('缥缈仙域事件状态设置错误，fdeventID=%s, state=%s, curState=%s' % (fdeventID, state, curState))
- return
+ #设置结束，暂不做限制，防止异常导致无法结束
+# if curState != FDEventState_Visiting:
+# GameWorld.Log('缥缈仙域事件状态设置错误，fdeventID=%s, state=%s, curState=%s' % (fdeventID, state, curState))
+# return
EventShell.EventRespons_FairyDomain(curPlayer)
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FairyDomainEventState % fdeventID, state)
NotifyVisitFairyDomainInfo(curPlayer, [fdeventID], 0)
--
Gitblit v1.8.0