弹出礼包：金将类型逻辑

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

@@ -12,6 +12,8 @@ import { HeroType } from '../../db/Hero';
 import { pinus } from 'pinus';
 import { getRandEelm, getRandSingleEelm } from '../../pubUtils/util';
 import { getAllOnlineRoles } from '../redisService';
+import { GachaResult } from '../../domain/activityField/gachaField';
+import { gameData } from '../../pubUtils/data';
 
 /**
    * 玩家活动数据
@@ -42,8 +44,11 @@ export async function getPopUpShopDataShow(activityId: number, serverId: number,
     return null
 }
 
-export async function checkPopUpConditionInCreateHero(serverId: number, roleId: string, heroes: HeroType[]) {
-    let conditions = heroes.map(hero => ({ conditionType: POP_UP_SHOP_CONDITION_TYPE.GET_HERO_BY_QUALITY, param: { quality: hero.quality } }));
+export async function checkPopUpConditionInCreateHero(serverId: number, roleId: string, result: GachaResult[]) {
+    let conditions = result.map(gachaResult => { 
+        let dicHero = gameData.hero.get(gachaResult?.hid);
+        return { conditionType: POP_UP_SHOP_CONDITION_TYPE.GET_HERO_BY_QUALITY, param: { quality: dicHero?.quality } };
+    });
     return await checkPopUpConditions(serverId, roleId, conditions);
 }