✨ feat(活动): 小游戏

game-server/app/services/activity/activityService.ts

@@ -42,6 +42,7 @@ import { _getActivities, _getActivitiesByServerId, _getActivitiesByType, _getAct
 import { getGroupShopDataShow } from './groupShopService';
 import { getBindPhoneDataShow } from './bindPhoneService';
 import { getPlayerForgeDataShow } from './forgeService';
+import { getPlayerMiniGameDataShow } from './miniGameService';
 
 /**
    * 获取活动数据
@@ -238,6 +239,11 @@ export async function getActivity(serverId: number, roleId: string, uid: number,
                 activityData = await getPlayerForgeDataShow(activityId, serverId, roleId);
                 break
             }
+        case ACTIVITY_TYPE.MINI_GAME:
+            {
+                activityData = await getPlayerMiniGameDataShow(activityId, serverId, roleId);
+                break
+            }
         default: {
             console.log('未知活动类型.........', activityType)
             break;

game-server/app/services/activity/miniGameService.ts

@@ -0,0 +1,46 @@
+import { ActivityForgeModel } from "../../db/ActivityForge";
+import { ActivityMiniGameModel } from "../../db/ActivityMiniGame";
+import { ActivityMiniGameRecModel } from "../../db/ActivityMiniGameRec";
+import { MiniGameData } from "../../domain/activityField/miniGameField";
+import { getRoleCreateTime, getServerCreateTime } from "../redisService";
+import { getActivityById } from "./activityService";
+
+/**
+   * 玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerMiniGameData(activityId: number, serverId: number, roleId: string) {
+    let activityData = await getActivityById(activityId);
+    let createTime = await getRoleCreateTime(roleId);
+    let serverTime = await getServerCreateTime(serverId);
+    let playerData = new MiniGameData(activityData, createTime, serverTime);
+    let playerRecord = await ActivityMiniGameModel.findData(serverId, activityId, playerData.roundIndex, roleId);
+    let records = await ActivityMiniGameRecModel.findRecords(serverId, activityId, playerData.roundIndex, roleId);
+    playerData.setPlayerData(playerRecord);
+    playerData.setPlayerRecords(records);
+    return playerData;
+}
+
+/**
+   * 玩家活动数据
+   *
+   * @param {number} serverId 区Id
+   * @param {number} activityId 活动Id
+   * @param {string} roleId 角色Id
+   *
+   */
+export async function getPlayerMiniGameDataShow(activityId: number, serverId: number, roleId: string) {
+    let playerData = await getPlayerMiniGameData(activityId, serverId, roleId);
+    if(playerData && playerData.canShow && playerData.canShow()) {
+        return playerData.getShowResult();
+    }
+    return null
+}
+
+export function getMetialStr(material: { id: number, count: number }[]) {
+    return material.map(({id, count}) => `${id}&${count}`).join('|')
+}

game-server/app/services/checkParam.ts

@@ -120,6 +120,7 @@ export function checkRouteParam(route: string, msg: any) {
         case 'activity.groupShopHandler.getGroupShopPage':
         case 'activity.groupShopHandler.leaveGroupShopPage':
         case 'activity.forgeHandler.getForgeActivity':
+        case 'activity.miniGameHandler.getMiniGameActivity':
             {
                 if(!checkNaturalNumbers(msg.activityId)) return false;
                 break;
@@ -442,6 +443,35 @@ export function checkRouteParam(route: string, msg: any) {
                 if(!checkNaturalNumbers(activityId, id, count)) return false;
                 break;
             }
+        case 'activity.miniGameHandler.gameStart':
+            {
+                if(!checkNaturalNumbers(msg.activityId)) return false;
+                break;
+            }
+        case 'activity.miniGameHandler.gameEnd':
+            {
+                let { activityId, gameCode, score } = msg;
+                if(!checkNaturalNumbers(activityId, score)) return false;
+                if(!checkNaturalStrings(gameCode)) return false;
+                break;
+            }
+        case 'activity.miniGameHandler.buyCnt':
+            {
+                let { activityId, count } = msg;
+                if(!checkNaturalNumbers(activityId, count)) return false;
+                break;
+            }
+        case 'activity.miniGameHandler.receiveBox':
+            {
+                let { activityId, boxId } = msg;
+                if(!checkNaturalNumbers(activityId, boxId)) return false;
+                break;
+            }
+        case 'activity.miniGameHandler.getRanks':
+            {
+                if(!checkNaturalNumbers(msg.activityId)) return false;
+                break;
+            }
         case "battle.barrageHandler.getBarrageList":
             {
                 if(!checkNaturalStrings(msg.rid)) return false;

game-server/app/services/rankService.ts

@@ -20,6 +20,7 @@ import { GVGVestigeSumRankModel } from "../db/GVGVestigeSumRank";
 import { GVGLeagueModel, GVGLeagueType } from "../db/GVGLeague";
 import { GVGVestigeLeagueRankModel } from "../db/GVGVestigeLeagueRank";
 import { getDayKeyInfo } from "./gvg/gvgFightService";
+import { ActivityMiniGameModel } from "../db/ActivityMiniGame";
 
 
 /**
@@ -1207,6 +1208,16 @@ export async function setRankRedisFromDb(type: string, args?: { serverId?: numbe
                 }
             }
         }
+    } else if (type == REDIS_KEY.ACTIVITY_MINI_GAME) {
+        let ranks = await ActivityMiniGameModel.findRank();
+        for(let { _id: { activityId, roundIndex }, roleIds, arr } of ranks) {
+            let r = new Rank(type, { activityId, roundIndex });
+            let roles = await RoleModel.findByRoleIds(roleIds, ROLE_SELECT.RANK);
+            for(let { roleId, score, updatedAt } of arr) {
+                let role = roles.find(cur => cur.roleId == roleId);
+                if(role) await r.setRankWithRoleInfo(roleId, score, updatedAt.getTime(), role, false);
+            }
+        }
     }
 }
 

game-server/app/services/redisService.ts

@@ -51,12 +51,14 @@ export async function initAllRank() {
     await delKeys(REDIS_KEY.LADDER);
     await delKeys(REDIS_KEY.GVG_VESTIGE_MEMBER_ALL);
     await delKeys(REDIS_KEY.GVG_VESTIGE_LEAGUE);
+    await delKeys(REDIS_KEY.ACTIVITY_MINI_GAME);
     // 测试服特殊处理，由于重启较频繁且联军数据较少，数据先不删，正式服激战期间不会重启
     if(!isDevelopEnv()) await delKeys(REDIS_KEY.LEAGUE_INFO);
 
     await setRankRedisFromDb(REDIS_KEY.PVP_RANK, {});
     await setRankRedisFromDb(REDIS_KEY.GVG_VESTIGE_MEMBER_ALL, {});
     await setRankRedisFromDb(REDIS_KEY.GVG_VESTIGE_LEAGUE, {});
+    await setRankRedisFromDb(REDIS_KEY.ACTIVITY_MINI_GAME, {});
     
     for(let {id} of serverList) {
         await initRankByServerId(id);