fix 修复奇遇本答题逻辑

game-server/app/servers/battle/handler/eventBattleHandler.ts

@@ -2,8 +2,8 @@ import { Application, BackendSession } from 'pinus';
 import { getGamedata } from '../../../pubUtils/gamedata';
 import EventRecord, { EventRecordModel } from '../../../db/EventRecord';
 import { RoleModel } from '../../../db/Role';
-import { EVENT_STATUS, EVENT_RECORD_STATUS } from '../../../consts/consts';
+import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS } from '../../../consts/consts';
-import { checkEvent, getEventTime, refreshEvent, checkEventStatus, getEventSuccessStatus, checkQuizParam } from '../../../services/eventSercive';
+import { checkEvent, getEventTime, refreshEvent, checkEventStatus, getEventSuccessStatus, checkQuizParam, checkQuiz } from '../../../services/eventSercive';
 import { handleFixedReward } from '../../../services/rewardService';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult } from '../../../pubUtils/util';
@@ -39,9 +39,38 @@ export class EventBattleHandler {
         return resResult(STATUS.SUCCESS, { list: event });
     }
 
+    // 回答问题
+    async checkAnswer(msg: { eventId: number, eventCode: string, questionId: number, answer: number }, session: BackendSession) {
+        const {eventId, eventCode, questionId, answer} = msg;
+        let roleId = session.get('roleId');
+        // let roleName = session.get('roleName');
+        // let eventStatus = session.get('eventStatus');
+
+        let event = await EventRecordModel.getEventRecordByCode(roleId, eventCode);
+        if(!event) {
+            return resResult(STATUS.EVENT_RECORD_NOT_FOUND);
+        }
+        let { status, type, eventId: dataEventId, question } = event;
+
+        let flag = checkEventStatus(type, status);
+        if(!flag) {
+            return resResult(STATUS.EVENT_STATUS_ERROR);
+        }
+        if(dataEventId != eventId) {
+            return resResult(STATUS.EVENT_WRONG_ID);
+        }
+        let curQuestion = question.find(cur => cur.id == questionId);
+        if(!curQuestion) return resResult(STATUS.EVENT_QUESTION_NOT_FOUND);
+
+        let {isCorrect, answerNo} = checkQuiz(questionId, answer);
+        await EventRecordModel.saveEventAnswer(eventCode, questionId, isCorrect?EVENT_ANSWER_STATUS.CORRECT:EVENT_ANSWER_STATUS.WRONG);
+
+        return resResult(STATUS.SUCCESS, { eventCode, eventId, questionId, isCorrect, answerNo });
+    }
+
     // 获取关卡列表
-    async receiveEventReward(msg: { eventId: number, eventCode: string, answer: Array<{id: number, answer: number}> }, session: BackendSession) {
+    async receiveEventReward(msg: { eventId: number, eventCode: string }, session: BackendSession) {
-        const {eventId, eventCode, answer = []} = msg;
+        const {eventId, eventCode} = msg;
         let roleId = session.get('roleId');
         let roleName = session.get('roleName');
         let eventStatus = session.get('eventStatus');
@@ -56,11 +85,12 @@ export class EventBattleHandler {
         if(!flag) {
             return resResult(STATUS.EVENT_STATUS_ERROR);
         }
-        if(!checkQuizParam(answer, question)) {
-            return resResult(STATUS.WRONG_PARMS);
-        }
-        let isSuccess = getEventSuccessStatus(type, status, answer);
 
+        let checkResult = getEventSuccessStatus(type, status, question);
+        if(checkResult.status == -1) {
+            return resResult(STATUS.EVENT_QUESTION_NO_ANSWER);
+        }
+        let isSuccess = checkResult.isSuccess;
 
         if(dataEventId != eventId) {
             return resResult(STATUS.EVENT_WRONG_ID);

game-server/app/services/eventSercive.ts

@@ -3,7 +3,9 @@ import { getGamedata } from '../pubUtils/gamedata';
 import { EventRecordModel } from '../db/EventRecord';
 import { RoleModel } from '../db/Role';
 import { genCode, decodeStrSingle, decodeStr, getRandomWithWeight } from '../pubUtils/util';
-import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_TYPE, EVENT_RANDOM_TYPE_ONE_OPEN, EVENT_QUIZ_NUM } from '../consts/consts';
+import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_TYPE, EVENT_RANDOM_TYPE_ONE_OPEN, EVENT_QUIZ_NUM, EVENT_ANSWER_STATUS } from '../consts/consts';
+import { STATUS } from '../consts/statusCode';
+import { stat } from 'fs';
 
 
 export async function setBattleStatus(app: Application, session: FrontendOrBackendSession, roleId: string, battleId: number , isSuccess: boolean, battleCode: string) {
@@ -206,8 +208,8 @@ export function checkEventStatus(type: number, status: number) {
 }
 
 
-export function getEventSuccessStatus(type: number, status: number, answer: Array<{id: number, answer: number}>) {
+export function getEventSuccessStatus(type: number, status: number, question: Array<{id: number, status: number}>) {
-    let isSuccess: boolean; // 检查状态是否正确
+    let isSuccess: boolean, returnResult = 1; // 检查状态是否正确
     if(type == EVENT_TYPE.BATTLE) {
         if(status == EVENT_RECORD_STATUS.BATTLE_SUCCESS) {
             isSuccess = true;
@@ -217,17 +219,26 @@ export function getEventSuccessStatus(type: number, status: number, answer: Arra
     } else if(type == EVENT_TYPE.BOX) {     
         isSuccess = true;
     } else if (type == EVENT_TYPE.QUIZ) {
-        isSuccess = checkQuiz(answer)
+        isSuccess = true;
+        for(let { status = EVENT_ANSWER_STATUS.WAITING } of question) {
+            console.log(status);
+            if(status == EVENT_ANSWER_STATUS.WRONG) {
+                isSuccess = false;
+            } else if(status == EVENT_ANSWER_STATUS.WAITING) {
+                isSuccess = false;
+                returnResult = -1;
+            }
+        }
     }
-    return isSuccess
+    return { isSuccess, status: returnResult }
 }
 
-export function checkQuizParam(param: Array<{id: number, answer: number }>, database?:  Array<{id: number}>) {
+export function checkQuizParam(param: Array<number>, database?:  Array<{id: number}>) {
 
     if(database) {
         let flag = true;
         for(let {id} of database) {
-            let index = param.findIndex(cur => cur.id == id);
+            let index = param.indexOf(id);
             if(index == -1) flag = false; break;
         }
         return flag
@@ -251,14 +262,12 @@ function randomQuestion(num: number) {
     return result;
 }
 
-function checkQuiz(arr: Array<{id: number, answer: number }>) {
+export function checkQuiz(id: number, answer: number) {
-    let flag = true;
     let questions = getGamedata('Questions');
-    for(let {id, answer} of arr) {
+    let result = questions[id - 1];
-        let result = questions[id - 1];
+
-        if(!result || result.correct != answer) {
+    return {
-            flag = false;
+        isCorrect: !!result && result.correct == answer,
-        }
+        answerNo: result?result.correct: 0
     }
-    return flag
 }

game-server/app/services/warRewardService.ts

@@ -35,16 +35,22 @@ export class WarReward {
         if(this.isSuccess) { // 成功了才给固定奖励
             let {fixReward = ''} = this.warInfo;
             let reward = decodeStr('fixReward', fixReward);
-            for(let obj of reward) this.rewards.push({type: BATTLE_REWARD_TYPE.FIX_REWARD, ...obj, count: obj.count * num});
+            for(let i = 0; i < num; i++) {
+                for(let obj of reward) {
+                    this.rewards.push({type: BATTLE_REWARD_TYPE.FIX_REWARD, times: i +1, ...obj, count: obj.count });
+                }
+            }
         }
     }
     private handleConditionReward(num: number) {
         if(this.isSuccess) {
             let {conditionReward = ''} = this.warInfo;
             let reward = decodeStr('conditionReward', conditionReward);
-            for(let obj of reward) {
+            for(let i = 0; i < num; i++) {
-                if(this.condition.get(obj.condition)) {
+                for(let obj of reward) {
-                    this.rewards.push({type: BATTLE_REWARD_TYPE.CONDITION_REWARD, ...obj, count: obj.count * num});
+                    if(this.condition.get(obj.condition)) {
+                        this.rewards.push({type: BATTLE_REWARD_TYPE.CONDITION_REWARD, times: i +1, ...obj, count: obj.count});
+                    }
                 }
             }
         }
@@ -73,7 +79,7 @@ export class WarReward {
                     }
                     if(flag) {
                         getNum ++; getSum++;
-                        this.rewards.push({type: BATTLE_REWARD_TYPE.RANDOM_REWARD, ...obj});
+                        this.rewards.push({type: BATTLE_REWARD_TYPE.RANDOM_REWARD, times: i +1, ...obj});
                     }
                 }
                 await BattleDropModel.updateByGid(this.roleId, this.battleId, gid, {

shared/consts/consts.ts

@@ -64,6 +64,12 @@ export const EVENT_TYPE = {
   BATTLE: 3 // 战斗
 };
 
+export const EVENT_ANSWER_STATUS = {
+  WAITING: 0,
+  CORRECT: 1,
+  WRONG: 2
+};
+
 export const EVENT_START_BATTLE = 101;
 export const EXPEDITION_INCREASE_POINT = 2; // 远征每成功一次累计的点数
 

shared/consts/statusCode.ts

@@ -32,6 +32,8 @@ export const STATUS = {
     EVENT_STATUS_ERROR: { code: 20302, simStr: '状态错误' },
     EVENT_WRONG_ID: { code: 20303, simStr: '事件id错误' },
     EVENT_INFO_NOT_FOUND: { code: 20304, simStr: '未找到该事件' },
+    EVENT_QUESTION_NOT_FOUND: { code: 20305, simStr: '该事件没有该问题' },
+    EVENT_QUESTION_NO_ANSWER: { code: 20306, simStr: '没有回答完全部问题' },
     // 远征 20400 - 20499
     EXPEDITION_MATCH_NO_PLAYER: { code: 20401, simStr: '无法匹配对手' },
     EXPEDITION_MISS_WAR_RECORD: { code: 20402, simStr: '未找到该远征记录' },
@@ -73,5 +75,6 @@ export const STATUS = {
     GM_DUPLICATE_GM_ACCOUNT: { code: 60006, simStr: '该账号已使用' },
     GM_DUPLICATE_API: { code: 60007, simStr: '该接口已存在' },
     GM_DUPLICATE_GROUP: { code: 60008, simStr: '该用户组已存在' },
-    GM_CREATE_ERROR: { code: 60009, simStr: '创建失败' }
+    GM_CREATE_ERROR: { code: 60009, simStr: '创建失败' },
+    GM_ROLE_NOT_FOUND: { code: 60010, simStr: '未找到该玩家' }
 }

shared/db/EventRecord.ts

@@ -8,6 +8,8 @@ class Question {
   question: string;
   @prop({ required: false, type: String })
   answer: [string];
+  @prop({ required: true })
+  status: number;
 }
 /**
   * 战斗记录接口
@@ -60,6 +62,12 @@ export default class EventRecord extends BaseModel {
         return {history: result, turn};
     }
 
+    public static async saveEventAnswer(eventCode: string, questionId: number, status: number , lean=true ) {
+      let data = await EventRecordModel.findOneAndUpdate(
+        {eventCode, 'question.id': questionId}, { $set: {'question.$.status': status} }, {upsert: true, new: true}).lean(lean);
+      return data;
+    }
+
     public static async saveEventRecord(eventCode: string, params: {roleId: string, refTime: number, eventId: number, roleName:string, turn?: number, type: number, quality: number, battleId?: number, status: number, position: {x:number, y:number}, question: Array<any> } , lean=true ) {
       let doc = new EventRecordModel();
       let update = Object.assign(doc.toJSON(), params, {eventCode});

shared/resource/jsons/dic_zyz_gk_main.json

@@ -4,9 +4,9 @@
         "dispatchJsonId": 101,
         "bg_img_id": 101,
         "script_id": 101,
-        "fixReward": "&",
+        "fixReward": "1&2",
-        "conditionReward": "&",
+        "conditionReward": "2&1&1|1&1&0",
-        "RandomReward": "&",
+        "randomReward": "3&1&5",
         "warType": 1,
         "gk_name": "序章&王越童渊比试",
         "kingExp": 100,