From 9aec2993fb9c257870afaa7f8fb4e8020b2c2ca2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 18 十二月 2020 11:14:57 +0800
Subject: [PATCH] 1111 【主干】【BT】 curBuff.GetSkill()、curEquip.GetAddSkill(0) 获取错误防范；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 115 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 31 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index 7a75a4b..f6b51be 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -30,11 +30,12 @@
import random
-FamilyPartyFB_QuestionID = 'FamilyPartyFB_QuestionID%s' #当前题ID
-FamilyPartyFB_QuestionTick = 'FamilyPartyFB_QuestionTick%s' #当前题出题时间
-FamilyPartyFB_AnswerTick = 'FamilyPartyFB_AnswerTick%s' #答对时间
+FamilyPartyFB_HisQuestionID = 'FamParty_HisQuestionID%s' #当前题ID - 不重置, 参数 familyID
+FamilyPartyFB_QuestionID = 'FamParty_QuestionID%s' #当前题ID - 答对会重置, 参数 familyID
+FamilyPartyFB_QuestionTick = 'FamParty_QuestionTick%s' #当前题出题时间, 参数 familyID
+FamilyPartyFB_AnswerTick = 'FamParty_AnswerTick%s' #答对时间, 参数 familyID
-AnswerState = 2 #开始答题活动状态
+AnswerState = 1 #开始答题活动状态
## 玩家登录
# @param None
# @return None
@@ -54,7 +55,7 @@
def NotifyFamilyPartyQuestion(curPlayer):
#刚登录的或刚进仙盟的补发最近的题目
gameWorld = GameWorld.GetGameWorld()
- state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
+ state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyParty)
if state != AnswerState:
return
curFamilyid = curPlayer.GetFamilyID()
@@ -66,32 +67,36 @@
PlayerControl.NotifyCode(curPlayer, 'Party_Topic', [questionID])
return
-def FamilyPartyStateChange(state):
+def FamilyPartyStateChange(state, beforeState=0):
#活动状态变更
-
- if state == 1:
+ if state == beforeState:
+ return
+
+ if state == AnswerState:
PyGameData.g_questionIDHistory = {}
PyGameData.g_familyAnswerDict = {}
PyGameData.g_familyPartyTopInfo = []
PyGameData.g_partyheroAnswerDict = {}
+ PyGameData.g_familyAnswerPlayerIDDict = {}
gameWorld = GameWorld.GetGameWorld()
familyManager = GameWorld.GetFamilyManager()
for i in range(0, familyManager.GetCount()):
family = familyManager.GetAt(i)
familyID = family.GetID()
gameWorld.SetDict(FamilyPartyFB_QuestionID % familyID, 0)
+ gameWorld.SetDict(FamilyPartyFB_HisQuestionID % 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))
+ GameWorld.Log("仙盟宴会结算 g_familyAnswerDict=%s, g_familyPartyTopInfo=%s" % (PyGameData.g_familyAnswerDict, PyGameData.g_familyPartyTopInfo))
noneStr = 'null'
- topfamilyNameList = [noneStr,noneStr,noneStr]
+ topfamilyNameList = [noneStr, noneStr, noneStr]
if PyGameData.g_familyAnswerDict:
sortFamilyList = __GetFamilyAnswerRankList()
- GameWorld.DebugLog(" 宴会结束 sortFamilyList=%s"%sortFamilyList)
+ GameWorld.DebugLog(" 宴会结束 sortFamilyList=%s" % sortFamilyList)
redPackID = IpyGameDataPY.GetFuncCfg('PartyReward', 4)
for i, familyInfo in enumerate(sortFamilyList):
familyID, familyName = familyInfo[:2]
@@ -101,9 +106,9 @@
if not family:
continue
PlayerFamilyRedPacket.CreatNewFamilyRedPacket(family, family.GetLeaderID(), redPackID)
+
PlayerControl.WorldNotify(0, 'Party_TopThree', topfamilyNameList)
-
if PyGameData.g_familyPartyTopInfo:
topHeroID, topHeroName = PyGameData.g_familyPartyTopInfo[:2]
rewardInfo = IpyGameDataPY.GetFuncEvalCfg('PartyReward', 3)
@@ -114,14 +119,34 @@
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)
-
+
+ #修改为答完题直接给每题奖励
+# joinReward = IpyGameDataPY.GetFuncEvalCfg('PartyReward')
+# answerRWItemReward = IpyGameDataPY.GetFuncEvalCfg('PartyReward2', 1)
+# for playerID, ansRightCount in PyGameData.g_partyheroAnswerDict.items():
+# if answerRWItemReward and len(answerRWItemReward) == 2:
+# ansTotalCount = len(PyGameData.g_familyAnswerPlayerIDDict.get(playerID, []))
+# ansWrongCount = max(0, ansTotalCount - ansRightCount)
+# isAuctionItem = False
+# rightRewardEx, wrongRewardEx = [], []
+# rightItemID, wrongItemID = answerRWItemReward
+# if rightItemID and ansRightCount:
+# rightRewardEx = [(rightItemID, ansRightCount, isAuctionItem)]
+# if wrongItemID and ansWrongCount:
+# wrongRewardEx = [(wrongItemID, ansWrongCount, isAuctionItem)]
+# curJoinReward = joinReward + rightRewardEx + wrongRewardEx
+# else:
+# curJoinReward = joinReward
+# if joinReward:
+# PlayerCompensation.SendMailByKey('FamilyParty', [playerID], curJoinReward)
+
return
def __GetFamilyAnswerRankList():
@@ -148,7 +173,7 @@
def FamilyParty_Process(tick):
#开始出题
gameWorld = GameWorld.GetGameWorld()
- state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
+ state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyParty)
if state != AnswerState:
return
allQuestionIDList = IpyGameDataPY.GetConfigEx('AllQuestionID')
@@ -171,13 +196,22 @@
if lastQuestionID:
#还有题未答
maxSecond = IpyGameDataPY.GetFuncCfg('FairyCorrectAnswer')
- if tick - gameWorld.GetDictByKey(FamilyPartyFB_QuestionTick % familyID) > maxSecond*1000:
+ 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', [maxSecond, GameWorld.GbkToCode(answer)])
+
+ for index in xrange(family.GetCount()):
+ member = family.GetAt(index)
+ memPlayer = member.GetPlayer()
+ if memPlayer and memPlayer.GetMapID() == ChConfig.Def_FBMapID_FamilyParty:
+ rightPlayerID = 0
+ answerInfo = str([rightPlayerID])
+ memPlayer.MapServer_QueryPlayerResult(0, 0, "FamilyPartyAnswer", answerInfo, len(answerInfo))
+ break
else:
continue
answerTick = gameWorld.GetDictByKey(FamilyPartyFB_AnswerTick % familyID)
@@ -196,6 +230,7 @@
break
gameWorld.SetDict(FamilyPartyFB_QuestionID % familyID, questionID)
+ gameWorld.SetDict(FamilyPartyFB_HisQuestionID % familyID, questionID)
gameWorld.SetDict(FamilyPartyFB_QuestionTick % familyID, tick)
PlayerControl.FamilyNotify(familyID, 'Party_Topic', [questionID])
@@ -205,19 +240,31 @@
def OnTalkFamily(curPlayer, content, tick):
gameWorld = GameWorld.GetGameWorld()
- state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
+ state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyParty)
if state != AnswerState:
return
+ playerID = curPlayer.GetID()
curFamilyid = curPlayer.GetFamilyID()
if not curFamilyid:
return
+
+ ## 添加玩家参与答题的题目ID，只要在本地图答题期间仙盟发送聊天信息就算
+ ## 在每题中间有5秒缓冲，在此期间可能速度慢的玩家还在回答上一题，在缓冲期间题目ID为0，所以添加题目ID需用不重置的历史题目ID
+ if curPlayer.GetMapID() == ChConfig.Def_FBMapID_FamilyParty:
+ if playerID not in PyGameData.g_familyAnswerPlayerIDDict:
+ PyGameData.g_familyAnswerPlayerIDDict[playerID] = []
+ answerQuestionIDList = PyGameData.g_familyAnswerPlayerIDDict[playerID]
+ hisQuestionID = gameWorld.GetDictByKey(FamilyPartyFB_HisQuestionID % curFamilyid)
+ if hisQuestionID and hisQuestionID not in answerQuestionIDList:
+ answerQuestionIDList.append(hisQuestionID)
+
questionID = gameWorld.GetDictByKey(FamilyPartyFB_QuestionID % curFamilyid)
if not questionID:
return
ipyData = IpyGameDataPY.GetIpyGameData('QuestionBank', questionID)
if not ipyData:
- GameWorld.ErrLog('仙盟宴会答题 该题不存在，异常 questionID=%s, 重新出题'%questionID)
+ GameWorld.ErrLog('仙盟宴会答题 该题不存在，异常 questionID=%s, 重新出题' % questionID)
gameWorld.SetDict(FamilyPartyFB_QuestionID % curFamilyid, 0)
gameWorld.SetDict(FamilyPartyFB_QuestionTick % curFamilyid, 0)
return
@@ -233,22 +280,27 @@
PlayerControl.NotifyCode(curPlayer, 'FamilyNoIntoParty')
return
- playerID = curPlayer.GetID()
- GameWorld.DebugLog(" answer=%s ChContent=%s"%(answerList, ChContent), playerID)
-
+ GameWorld.DebugLog(" answer=%s ChContent=%s" % (answerList, ChContent), playerID)
if isRight:
- GameWorld.DebugLog(" 答对了! %s"%playerID)
+ GameWorld.DebugLog(" 答对了! %s" % playerID)
playerName = curPlayer.GetName()
- gameWorld.SetDict(FamilyPartyFB_QuestionID%curFamilyid, 0)
- gameWorld.SetDict(FamilyPartyFB_AnswerTick%curFamilyid, tick)
- PlayerControl.FamilyNotify(curFamilyid, 'Party_Answer', [playerName])
+ gameWorld.SetDict(FamilyPartyFB_QuestionID % curFamilyid, 0)
+ gameWorld.SetDict(FamilyPartyFB_AnswerTick % curFamilyid, tick)
+
if curFamilyid in PyGameData.g_familyAnswerDict:
- PyGameData.g_familyAnswerDict[curFamilyid][0] +=1
+ 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]
-
+
+ rightCountAward = IpyGameDataPY.GetFuncEvalCfg("PartyReward", 5)
+ if rightCountAward and len(rightCountAward) == 2:
+ perRightCount, addFamilyActivity = rightCountAward
+ if PyGameData.g_familyAnswerDict[curFamilyid][0] % perRightCount == 0:
+ PlayerControl.FamilyNotify(curFamilyid, "Contribution1", [perRightCount, addFamilyActivity])
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_FamilyPartyAddFamilyActivity, [ChConfig.Def_FBMapID_FamilyParty, curFamilyid, addFamilyActivity])
+
PyGameData.g_partyheroAnswerDict[playerID] = PyGameData.g_partyheroAnswerDict.get(playerID, 0) + 1
if PyGameData.g_familyPartyTopInfo:
@@ -258,7 +310,8 @@
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)
+ #通知答题结果
+ answerInfo = str([playerID])
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "FamilyPartyAnswer", answerInfo, len(answerInfo))
return
--
Gitblit v1.8.0