From 02a9f1326fd99fc60ee14c70bb55d714803607f0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 七月 2019 15:25:56 +0800
Subject: [PATCH] 4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 1fdf9fb..06275cc 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -34,7 +34,7 @@
FamilyPartyFB_QuestionTick = 'FamilyPartyFB_QuestionTick%s' #当前题出题时间
FamilyPartyFB_AnswerTick = 'FamilyPartyFB_AnswerTick%s' #答对时间
-
+AnswerState = 2 #开始答题活动状态
## 玩家登录
# @param None
# @return None
@@ -55,7 +55,7 @@
#刚登录的或刚进仙盟的补发最近的题目
gameWorld = GameWorld.GetGameWorld()
state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
- if state != 1:
+ if state != AnswerState:
return
curFamilyid = curPlayer.GetFamilyID()
if not curFamilyid:
@@ -81,8 +81,8 @@
familyID = family.GetID()
gameWorld.SetDict(FamilyPartyFB_QuestionID % familyID, 0)
gameWorld.SetDict(FamilyPartyFB_AnswerTick % familyID, 0)
-
-
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_FamilyPartyInfo, [])
+
if state == 0:
#活动结算 前3名仙盟、答题王
GameWorld.Log(" 仙盟宴会结算 g_familyAnswerDict=%s, g_familyPartyTopInfo=%s"%(PyGameData.g_familyAnswerDict, PyGameData.g_familyPartyTopInfo))
@@ -149,7 +149,7 @@
#开始出题
gameWorld = GameWorld.GetGameWorld()
state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
- if state != 1:
+ if state != AnswerState:
return
allQuestionIDList = IpyGameDataPY.GetConfigEx('AllQuestionID')
ipyMgr = IpyGameDataPY.IPY_Data()
@@ -206,7 +206,7 @@
gameWorld = GameWorld.GetGameWorld()
state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
- if state != 1:
+ if state != AnswerState:
return
curFamilyid = curPlayer.GetFamilyID()
@@ -241,7 +241,7 @@
playerName = curPlayer.GetName()
gameWorld.SetDict(FamilyPartyFB_QuestionID%curFamilyid, 0)
gameWorld.SetDict(FamilyPartyFB_AnswerTick%curFamilyid, tick)
- PlayerControl.FamilyNotify(curFamilyid, 'Party_Answer', [playerName])
+
if curFamilyid in PyGameData.g_familyAnswerDict:
PyGameData.g_familyAnswerDict[curFamilyid][0] +=1
PyGameData.g_familyAnswerDict[curFamilyid][1] = tick
--
Gitblit v1.8.0