From 2ebf4a52405b0b628b61c82c106c2e63414b02ae Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 24 一月 2019 18:06:00 +0800
Subject: [PATCH] 5931 【后端】【1.5.100】诛仙装备开发(装备位解锁条件读诛仙塔表)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
index 9cd2e17..bf9d933 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ZhuXianTower.py
@@ -49,7 +49,7 @@
FBDict_BossTotalHP = 'FBDict_BossTotalHP' #BOSS血量
FBDict_LastHurtTick = 'FBDict_LastHurtTick' #上次伤害时间
FBDict_HasGiveAward = 'FBDict_HasGiveAward' # 是否有给奖励
-FBDict_HasAddCnt = 'FBDict_HasAddCnt' # 是否有扣次数
+FBDict_HasPass = 'FBDict_HasPass' # 是否有通关
# 副本通用配置
(
@@ -133,8 +133,10 @@
##玩家切换地图
def DoPlayerChangeMapLogic(curPlayer):
- curStar = GameWorld.GetGameFB().GetGameFBDictByKey(FBDict_FBStar)
- if curStar != Def_MaxStar:
+ gameFB = GameWorld.GetGameFB()
+ fbStep = gameFB.GetFBStep()
+ curStar = gameFB.GetGameFBDictByKey(FBDict_FBStar)
+ if curStar != Def_MaxStar and fbStep == FB_State_FreeTime:
FBCommon.UpdateFBEnterTick(curPlayer)
return
@@ -198,7 +200,8 @@
if fbStep == FB_State_FreeTime:
#退出时,若s级则补发奖励
curStar = gameFB.GetGameFBDictByKey(FBDict_FBStar)
- if curStar == Def_MaxStar:
+ hasPass = gameFB.GetGameFBDictByKey(FBDict_HasPass)
+ if hasPass and curStar == Def_MaxStar:
__GiveFBPassPrize(curPlayer)
GameWorldProcess.CloseFB(tick)
return
@@ -331,6 +334,7 @@
gameFB.SetGameFBDict(FBDict_HasGiveAward, 0)
gameFB.SetGameFBDict(FBDict_StartTick, 0)
gameFB.SetGameFBDict(FBDict_FBStar, 0)
+ gameFB.SetGameFBDict(FBDict_HasPass, 0)
prepareTick = __GetZhuXianCfg()[Def_PrepareTime] * 1000
FBCommon.Sync_Player_TimeTick(IPY_GameWorld.tttAddUpTime, prepareTick)
@@ -468,25 +472,19 @@
if gameFB.GetGameFBDictByKey(FBDict_HasGiveAward):
GameWorld.Log('本层奖励已给,不能重复给!!', curPlayer.GetID())
return
+ hasPass = gameFB.GetGameFBDictByKey(FBDict_HasPass)
+ if not hasPass:
+ return
# 发邮件或放入背包
- needSpace = len(prizeItemList)
- emptySpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
- isSendMail = int(needSpace > emptySpace) # 是否发送邮件
- if isSendMail:
- PlayerControl.SendMailByKey('KillGodTowerReward', [curPlayer.GetPlayerID()], prizeItemList)
- GameWorld.DebugLog("背包空间不够,发送邮件: mailItemList=%s" % str(prizeItemList), curPlayer.GetPlayerID())
- else:
- for itemID, itemCnt, isBind in prizeItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem],
- event=["ZhuXianTower", False, {}])
- #本次副本里第一次给奖励时扣次数(非首次S也扣次数)
- if (not isFirstPass and curStar == Def_MaxStar) or not gameFB.GetGameFBDictByKey(FBDict_HasAddCnt):
+ ItemControler.GivePlayerItemOrMail(curPlayer, prizeItemList, 'KillGodTowerReward', ["ZhuXianTower", False, {}])
+
+ #首次S级不扣次数,非S级给奖励扣次数,非首次S扣次数
+ if not isFirstPass:
FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_ZhuXianTower, 1)
- gameFB.SetGameFBDict(FBDict_HasAddCnt, 1)
+
gameFB.SetGameFBDict(FBDict_HasGiveAward, 1)
-
return
@@ -520,6 +518,7 @@
overDict[FBCommon.Over_isPass] = int(isPass)
GameWorld.DebugLog("__SendZhuXianTowerOverInfo overDict=%s" % (str(overDict)), curPlayer.GetPlayerID())
FBCommon.Notify_FB_Over(curPlayer, overDict)
+ GameWorld.GetGameFB().SetGameFBDict(FBDict_HasPass, int(isPass))
return
--
Gitblit v1.8.0