From b0b1a7f5d9e337b7ac286e3e0104f8f14155429c Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期六, 27 十月 2018 11:23:19 +0800
Subject: [PATCH] 3688 【后端】【1.2.0】天赋功能开发(登录通知点数)
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
index b600d6f..2c4c5dd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.py
@@ -150,7 +150,18 @@
state = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_FamilyParty)
if state != 1:
return
-
+ allQuestionIDList = IpyGameDataPY.GetConfigEx('AllQuestionID')
+ ipyMgr = IpyGameDataPY.IPY_Data()
+ if not allQuestionIDList:
+ allQuestionIDList = []
+ for i in xrange(ipyMgr.GetQuestionBankCount()):
+ ipyData = ipyMgr.GetQuestionBankByIndex(i)
+ questionID = ipyData.GetID()
+ allQuestionIDList.append(questionID)
+ IpyGameDataPY.SetConfigEx('AllQuestionID', allQuestionIDList)
+ if not allQuestionIDList:
+ GameWorld.ErrLog('仙盟宴会题库没有题目！')
+ return
familyManager = GameWorld.GetFamilyManager()
for i in range(0, familyManager.GetCount()):
family = familyManager.GetAt(i)
@@ -165,13 +176,13 @@
#随机题目
historyQuestionIDList = PyGameData.g_questionIDHistory.get(familyID, [])
- questionCnt = IpyGameDataPY.IPY_Data().GetQuestionBankCount()
for i in xrange(50):
- questionID = random.randint(1, questionCnt)
+ questionID = random.choice(allQuestionIDList)
# 随机到不重复的即可
if questionID not in historyQuestionIDList or i == 49:
- historyQuestionIDList.append(questionID)
- PyGameData.g_questionIDHistory[familyID] = historyQuestionIDList
+ if questionID not in historyQuestionIDList:
+ historyQuestionIDList.append(questionID)
+ PyGameData.g_questionIDHistory[familyID] = historyQuestionIDList
break
gameWorld.SetDict(FamilyPartyFB_QuestionID % familyID, questionID)
@@ -192,11 +203,15 @@
questionID = gameWorld.GetDictByKey(FamilyPartyFB_QuestionID % curFamilyid)
if not questionID:
return
+ ipyData = IpyGameDataPY.GetIpyGameData('QuestionBank', questionID)
+ if not ipyData:
+ GameWorld.ErrLog('仙盟宴会答题 该题不存在，异常 questionID=%s, 重新出题'%questionID)
+ gameWorld.SetDict(FamilyPartyFB_QuestionID % curFamilyid, 0)
+ return
- 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