From d83f6c94031070ebc6b7ccd33addc669ac94775a Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 19 十月 2018 11:58:21 +0800
Subject: [PATCH] 2180 【主干】【1.1.0】【1.0.18】单人进入渡劫副本没有刷怪

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 095ede0..cab5caa 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -41,6 +41,15 @@
     NotifyFamilyPartyQuestion(curPlayer)
     return
 
+def OnPlayerChangeMap(curPlayer, tick):
+    if curPlayer.GetMapID() != ChConfig.Def_FBMapID_FamilyParty:
+        return
+    playerID = curPlayer.GetID()
+    if playerID not in PyGameData.g_partyheroAnswerDict:
+        PyGameData.g_partyheroAnswerDict[playerID] = 0
+    return
+
+
 def NotifyFamilyPartyQuestion(curPlayer):
     #刚登录的或刚进仙盟的补发最近的题目
     gameWorld = GameWorld.GetGameWorld()
@@ -104,6 +113,14 @@
             PlayerCompensation.SendPersonalItemMailEx('', content, day, [topHeroID], itemList)
                 
             PlayerControl.WorldNotify(0, 'Party_TopPlayer', [topHeroName])
+        
+        #给参与奖励
+        joinPlayerIDList = PyGameData.g_partyheroAnswerDict.keys()
+        if joinPlayerIDList:
+            joinReward = IpyGameDataPY.GetFuncEvalCfg('PartyReward')
+            if joinReward:
+                PlayerCompensation.SendMailByKey('FamilyParty', joinPlayerIDList, joinReward)
+            
     return
 
 def __GetFamilyAnswerRankList():
@@ -179,7 +196,7 @@
     ipyData = IpyGameDataPY.IPY_Data().GetQuestionBankByIndex(questionID-1)
     answerList = eval(ipyData.GetAnswer())
     ChContent = PlayerTalk.ChangeVoiceChat(content)
-    ChContent = ChContent.decode(GameWorld.GetCharacterEncoding()).encode(ShareDefine.Def_Game_Character_Encoding)
+    ChContent = GameWorld.CodeToGBK(ChContent)
     ChContent = ChContent.strip()
     isRight = ChContent in answerList
 #    if curPlayer.GetMapID() != ChConfig.Def_FBMapID_FamilyParty:

--
Gitblit v1.8.0