From 6366979426fccd97c0cb0bd384ada3a8b9843a24 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 25 十月 2018 14:37:22 +0800
Subject: [PATCH] 2198 【主干】仙盟盟主5天没上线,盟主没有主动传位

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 04bf6c9..cab5caa 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -26,16 +26,12 @@
 import ChConfig
 import PlayerFamilyRedPacket
 import PlayerTalk
+import PyGameData
 
 import random
 
 FamilyPartyFB_QuestionID = 'FamilyPartyFB_QuestionID%s' #当前题ID
 FamilyPartyFB_AnswerTick = 'FamilyPartyFB_AnswerTick%s' #答对时间
-
-
-g_questionIDHistory = {} #出过的题记录 {familyid:[出过的题id,..]}
-g_familyAnswerDict = {} #仙盟答题数量 {familyid:答题数量,..}
-g_heroAnswerDict = {} #个人答题数量 {playerid:答题数量,..}
 
 
 ## 玩家登录
@@ -44,6 +40,15 @@
 def OnPlayerLogin(curPlayer):
     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):
     #刚登录的或刚进仙盟的补发最近的题目
@@ -62,14 +67,12 @@
 
 def FamilyPartyStateChange(state):
     #活动状态变更
-    global g_questionIDHistory
-    global g_familyAnswerDict
-    global g_heroAnswerDict
-    
+
     if state == 1:
-        g_questionIDHistory = {}
-        g_familyAnswerDict = {}
-        g_heroAnswerDict = {}
+        PyGameData.g_questionIDHistory = {}
+        PyGameData.g_familyAnswerDict = {}
+        PyGameData.g_familyPartyTopInfo = []
+        PyGameData.g_partyheroAnswerDict = {}
         gameWorld = GameWorld.GetGameWorld()
         familyManager = GameWorld.GetFamilyManager()
         for i in range(0, familyManager.GetCount()):
@@ -81,18 +84,16 @@
     
     if state == 0:
         #活动结算 前3名仙盟、答题王
-        GameWorld.Log(" 仙盟宴会结算 g_familyAnswerDict=%s, g_heroAnswerDict=%s"%(g_familyAnswerDict, g_heroAnswerDict))
+        GameWorld.Log(" 仙盟宴会结算 g_familyAnswerDict=%s, g_familyPartyTopInfo=%s"%(PyGameData.g_familyAnswerDict, PyGameData.g_familyPartyTopInfo))
         
         noneStr = 'null'
         topfamilyNameList = [noneStr,noneStr,noneStr]
-        if g_familyAnswerDict:
-            sortFamilyList = g_familyAnswerDict.items()
-            sortFamilyList.sort(cmp=CmpFunc)
-            familyIDList = [familyInfo[0] for familyInfo in sortFamilyList][:3]
-            GameWorld.DebugLog("    宴会结束 familyIDList=%s"%familyIDList)
+        if PyGameData.g_familyAnswerDict:
+            sortFamilyList = __GetFamilyAnswerRankList()
+            GameWorld.DebugLog("    宴会结束 sortFamilyList=%s"%sortFamilyList)
             redPackID = IpyGameDataPY.GetFuncCfg('PartyReward', 4)
-            for i, familyID in enumerate(familyIDList):
-                familyName = PlayerFamily.GetFamilyName_ByID(familyID)
+            for i, familyInfo in enumerate(sortFamilyList):
+                familyID, familyName = familyInfo[:2]
                 topfamilyNameList[i] = familyName
                 #发红包
                 family = GameWorld.GetFamilyManager().FindFamily(familyID)
@@ -101,31 +102,36 @@
                 PlayerFamilyRedPacket.CreatNewFamilyRedPacket(family, family.GetLeaderID(), redPackID)
         PlayerControl.WorldNotify(0, 'Party_TopThree', topfamilyNameList)
         
-        topHeroName = noneStr
-        if g_heroAnswerDict:
+
+        if PyGameData.g_familyPartyTopInfo:
+            topHeroID, topHeroName = PyGameData.g_familyPartyTopInfo[:2]
             rewardInfo = IpyGameDataPY.GetFuncEvalCfg('PartyReward', 3)
-            sortHeroList = g_heroAnswerDict.items()
-            sortHeroList.sort(cmp=CmpFunc)
-            sortHeroidList = [heroInfo[0] for heroInfo in sortHeroList]
-            GameWorld.DebugLog("    宴会结束 sortHeroidList=%s"%sortHeroidList)
-            playerManager = GameWorld.GetPlayerManager()
-            for playerID in sortHeroidList:
-                curPlayer = playerManager.FindPlayerByID(playerID)
-                if not curPlayer:
-                    continue
-#                if curPlayer.GetMapID() != ChConfig.Def_FBMapID_FamilyParty:
-#                    #不在副本
-#                    continue
-                topHeroName = curPlayer.GetName()
-                #给奖励
-                mailKey, day, itemList = rewardInfo
-                content = ShareDefine.Def_MailFormat % (mailKey, '')
-                GameWorld.DebugLog('发送仙盟宴会答题王邮件   itemList=%s' % (itemList))
-                PlayerCompensation.SendPersonalItemMailEx('', content, day, [playerID], itemList)
-                break
-        if topHeroName != noneStr:
+            #给奖励
+            mailKey, day, itemList = rewardInfo
+            content = ShareDefine.Def_MailFormat % (mailKey, '')
+            GameWorld.DebugLog('发送仙盟宴会答题王邮件   itemList=%s' % (itemList))
+            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():
+    if not PyGameData.g_familyAnswerDict:
+        return []
+    sortFamilyList = PyGameData.g_familyAnswerDict.items()
+    sortFamilyList.sort(cmp=CmpFunc)
+    rankList = [] #[[familyID, familyName, 答题数量]]
+    for familyID, info in sortFamilyList[:3]:
+        rankList.append([familyID, info[2], info[0]])
+    return rankList
 
 ## 排序函数
 #  @param elem1 元素1
@@ -139,7 +145,6 @@
     return result
 
 def FamilyParty_Process(tick):
-    global g_questionIDHistory
     #开始出题
     gameWorld = GameWorld.GetGameWorld()
     state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
@@ -159,14 +164,14 @@
             continue
         
         #随机题目
-        historyQuestionIDList = g_questionIDHistory.get(familyID, [])
+        historyQuestionIDList = PyGameData.g_questionIDHistory.get(familyID, [])
         questionCnt = IpyGameDataPY.IPY_Data().GetQuestionBankCount()
         for i in xrange(50):
             questionID = random.randint(1, questionCnt)
             # 随机到不重复的即可
             if questionID not in historyQuestionIDList or i == 49:
                 historyQuestionIDList.append(questionID)
-                g_questionIDHistory[familyID] = historyQuestionIDList
+                PyGameData.g_questionIDHistory[familyID] = historyQuestionIDList
                 break
         
         gameWorld.SetDict(FamilyPartyFB_QuestionID % familyID, questionID)
@@ -175,9 +180,7 @@
 
 ## 仙盟频道聊天
 def OnTalkFamily(curPlayer, content, tick):
-    global g_familyAnswerDict
-    global g_heroAnswerDict
-    
+
     gameWorld = GameWorld.GetGameWorld()
     state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
     if state != 1:
@@ -193,28 +196,40 @@
     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:
-        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)
     
     if isRight:
         GameWorld.DebugLog("    答对了! %s"%playerID)
+        playerName = curPlayer.GetName()
         gameWorld.SetDict(FamilyPartyFB_QuestionID%curFamilyid, 0)
         gameWorld.SetDict(FamilyPartyFB_AnswerTick%curFamilyid, tick)
-        PlayerControl.FamilyNotify(curFamilyid, 'Party_Answer', [curPlayer.GetName()])
+        PlayerControl.FamilyNotify(curFamilyid, 'Party_Answer', [playerName])
+        if curFamilyid in PyGameData.g_familyAnswerDict:
+            PyGameData.g_familyAnswerDict[curFamilyid][0] +=1
+            PyGameData.g_familyAnswerDict[curFamilyid][1] = tick
+        else:
+            familyName = PlayerFamily.GetFamilyName_ByID(curFamilyid)
+            PyGameData.g_familyAnswerDict[curFamilyid] = [1, tick, familyName]
         
-        g_familyAnswerDict[curFamilyid] = [g_familyAnswerDict.get(curFamilyid, [0])[0] + 1, tick]
-        g_heroAnswerDict[playerID] = [g_heroAnswerDict.get(playerID, [0])[0] + 1, tick]
+        PyGameData.g_partyheroAnswerDict[playerID] = PyGameData.g_partyheroAnswerDict.get(playerID, 0) + 1
         
-        
+        if PyGameData.g_familyPartyTopInfo:
+            if PyGameData.g_partyheroAnswerDict[playerID] > PyGameData.g_partyheroAnswerDict[PyGameData.g_familyPartyTopInfo[0]]:
+                PyGameData.g_familyPartyTopInfo = [playerID, playerName]
+        else:
+            PyGameData.g_familyPartyTopInfo = [playerID, playerName]
+        msgList = [__GetFamilyAnswerRankList(), PyGameData.g_familyPartyTopInfo[1], PyGameData.g_partyheroAnswerDict[PyGameData.g_familyPartyTopInfo[0]]]
+        GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_FamilyPartyInfo, msgList)
         #通知玩家可获得贡献
         curPlayer.MapServer_QueryPlayerResult(0, 0, "FamilyPartyAnswer", '', 0)
         

--
Gitblit v1.8.0