From 4e71c9a0ca7b507e2a3bfcfe2d8f158e06126f21 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 六月 2019 10:32:38 +0800
Subject: [PATCH] 7461 【后端】熊猫之力活跃度技能修改
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 97c9ab6..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()
@@ -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)
@@ -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