From cce3ffb8fc917a82db16b7c82afc7d82485c55bd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 28 五月 2019 19:53:10 +0800
Subject: [PATCH] 6986 【2.0】【后端】宝箱支持开出可上架拍卖行的拍品
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py
index 8462085..db97169 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SkyTower.py
@@ -63,7 +63,7 @@
def GetTowerIpyData(floor):
return IpyGameDataPY.GetIpyGameData('SkyTower', floor)
-def OnFBPlayerLogin(curPlayer):
+def OnFBPlayerOnLogin(curPlayer):
SyncSkyTowerInfo(curPlayer)
return
@@ -73,7 +73,7 @@
def SyncSkyTowerInfo(curPlayer):
ttInfo = ChPyNetSendPack.tagMCSkyTowerInfo()
ttInfo.Clear()
- ttInfo.floorID = __GetSkyTowerCurFloor(curPlayer)
+ ttInfo.Floor = __GetSkyTowerCurFloor(curPlayer)
NetPackCommon.SendFakePack(curPlayer, ttInfo)
return
@@ -144,6 +144,21 @@
# @param tick
# @return None
def DoEnterFB(curPlayer, tick):
+ gameFB = GameWorld.GetGameFB()
+ fbStep = gameFB.GetFBStep()
+
+ if fbStep == FB_State_FightPrepare:
+ notify_tick = __GetTrialCfg()[Def_PrepareTime] * 1000 - (tick - GameWorld.GetGameFB().GetFBStepTick())
+ curPlayer.Sync_TimeTick(IPY_GameWorld.tttWaitStart, 0, max(notify_tick, 0), True)
+
+ elif fbStep == FB_State_Fighting:
+ notify_tick = __GetTrialCfg()[Def_FightTime] * 1000 - (tick - GameWorld.GetGameFB().GetFBStepTick())
+ curPlayer.Sync_TimeTick(IPY_GameWorld.tttTowerTake, 0, max(notify_tick, 0), True)
+ elif fbStep > FB_State_Fighting:
+ PlayerControl.PlayerLeaveFB(curPlayer)
+ return
+
+
# 不做处理，有副本行为客户端发包选择挑战关卡
#EventReport.WriteEvent_FB(curPlayer, ChConfig.Def_FBMapID_SkyTower, 0, ChConfig.CME_Log_Start)
return
@@ -325,8 +340,6 @@
SyncSkyTowerInfo(curPlayer) # 同步最新关卡信息
__SetFBToFreeTime(tick)
- #每日任务
- PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_Tower)
return
--
Gitblit v1.8.0