From a15e3af5eb36a3c4eb6016e824faca23d6d6a9dc Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 14 一月 2019 11:06:06 +0800
Subject: [PATCH] 5768 【后端】【1.5】新增8-14天活动功能(通知修改)
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 97c9ab6..7a75a4b 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:
@@ -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()
@@ -227,11 +227,11 @@
ChContent = GameWorld.CodeToGBK(ChContent)
ChContent = ChContent.strip()
isRight = ChContent in answerList
-# if curPlayer.GetMapID() != ChConfig.Def_FBMapID_FamilyParty:
-# if isRight:
-# PlayerControl.FamilyNotify(curFamilyid, 'FamilyPleaseIntoParty')
-# PlayerControl.NotifyCode(curPlayer, 'FamilyNoIntoParty')
-# return
+ if curPlayer.GetMapID() != ChConfig.Def_FBMapID_FamilyParty:
+ if isRight:
+ PlayerControl.FamilyNotify(curFamilyid, 'FamilyPleaseIntoParty')
+ PlayerControl.NotifyCode(curPlayer, 'FamilyNoIntoParty')
+ return
playerID = curPlayer.GetID()
GameWorld.DebugLog(" answer=%s ChContent=%s"%(answerList, ChContent), playerID)
--
Gitblit v1.8.0