From 84a092ef093c912e9b99850cc00bd2cd55aa1e4a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 02 十一月 2018 18:37:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 3d37919..97c9ab6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -170,13 +170,14 @@
         lastQuestionID = gameWorld.GetDictByKey(FamilyPartyFB_QuestionID % familyID)
         if lastQuestionID:
             #还有题未答
-            if tick - gameWorld.GetDictByKey(FamilyPartyFB_QuestionTick % familyID) > IpyGameDataPY.GetFuncCfg('FairyCorrectAnswer')*1000:
+            maxSecond = IpyGameDataPY.GetFuncCfg('FairyCorrectAnswer')
+            if tick - gameWorld.GetDictByKey(FamilyPartyFB_QuestionTick % familyID) > maxSecond*1000:
                 ipyData = IpyGameDataPY.GetIpyGameData('QuestionBank', lastQuestionID)
                 if ipyData:
                     answer = ipyData.GetAnswer()
                     answer = answer.replace('[', '')
                     answer = answer.replace(']', '')
-                    PlayerControl.FamilyNotify(familyID, 'Party_Correct', [GameWorld.GbkToCode(answer)])
+                    PlayerControl.FamilyNotify(familyID, 'Party_Correct', [maxSecond, GameWorld.GbkToCode(answer)])
             else:
                 continue
         answerTick = gameWorld.GetDictByKey(FamilyPartyFB_AnswerTick % familyID)

--
Gitblit v1.8.0