From f8dab27621ee5061a48b3a0142c6860b360cf0c9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 16 十月 2019 17:17:27 +0800
Subject: [PATCH] 8262 【主干】【后端】仙盟宴会及传功优化（增加宴会结束倒计时显示）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
index d602892..27b0dbf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.py
@@ -131,7 +131,8 @@
gameWorld = GameWorld.GetGameWorld()
partyActionState = gameWorld.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyParty)
if partyActionState:
- __DoEnterJoinFamilyParty(curPlayer)
+ remainSeconds = PlayerActivity.GetDailyActionRemainSeconds(ShareDefine.DailyActionID_FamilyParty)
+ __DoEnterJoinFamilyParty(curPlayer, remainSeconds)
lineID = GameWorld.GetGameWorld().GetLineID()
if lineID not in g_familyMapPlayerIDDict:
@@ -148,13 +149,16 @@
return
-def __DoEnterJoinFamilyParty(curPlayer):
+def __DoEnterJoinFamilyParty(curPlayer, remainSeconds):
## 玩家正式开始参与仙盟宴会，因为多个仙盟活动可能共用该地图，玩家可能活动开始时已经在该地图
+ GameWorld.DebugLog("玩家参加仙盟宴会!remainSeconds=%s" % remainSeconds, curPlayer.GetPlayerID())
+ if remainSeconds:
+ curPlayer.Sync_TimeTick(IPY_GameWorld.tttTowerTake, 0, remainSeconds * 1000, True)
+
if curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyPartyJoinSign):
return
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyPartyJoinSign, 1)
- GameWorld.DebugLog("玩家参加仙盟宴会!", curPlayer.GetPlayerID())
#FBCommon.AddEnterFBCount(curPlayer, ChConfig.Def_FBMapID_FamilyParty)
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_FamilyParty)
PlayerFamily.AddFamilyActivity(curPlayer, ShareDefine.FamilyActive_Party)
@@ -234,12 +238,13 @@
GameWorld.DebugLog('仙盟宴会活动状态变更 state=%s' % state)
if state == 1:
+ remainSeconds = PlayerActivity.GetDailyActionRemainSeconds(ShareDefine.DailyActionID_FamilyParty)
playerManager = GameWorld.GetPlayerManager()
for i in xrange(playerManager.GetPlayerCount()):
curPlayer = playerManager.GetPlayerByIndex(i)
if not curPlayer or curPlayer.IsEmpty():
continue
- __DoEnterJoinFamilyParty(curPlayer)
+ __DoEnterJoinFamilyParty(curPlayer, remainSeconds)
else:
PyGameData.g_familyPartyInfo = []
--
Gitblit v1.8.0