From c077942390adf47b144205e84e6a9217bc300093 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 30 八月 2018 10:51:45 +0800
Subject: [PATCH] fix:3063 【后端】仙盟宴会增加显示前三名实时排名以及实时答题王
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 102 +++++++++++++++++++++++++--------------------------
1 files changed, 50 insertions(+), 52 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 0c297ac..095ede0 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:答题数量,..}
## 玩家登录
@@ -62,14 +58,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 +75,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 +93,28 @@
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])
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 +128,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 +147,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 +163,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:
@@ -207,14 +193,26 @@
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