抽卡：添加抽卡接口

shared/pubUtils/data.ts

@@ -3,8 +3,8 @@ import { dicGoods, blueprt, dicJewel, figureCondition } from "./dictionary/DicGo
 import { dicBlueprtCompose } from "./dictionary/DicBlueprtCompose";
 import { dicBlueprtPossibility } from "./dictionary/DicBlueprtPossibility";
 import { dicDaily } from "./dictionary/DicDaily";
-import { dicEvent } from "./dictionary/DicEvent";
-import { dicExpedition } from "./dictionary/DicExpedition";
+import { dicEvent, dicEventList } from "./dictionary/DicEvent";
+import { dicExpedition, DicExpedition } from "./dictionary/DicExpedition";
 import { dicExpeditionPoint } from "./dictionary/DicExpeditionPoint";
 import { dicFuncSwitch } from "./dictionary/DicFuncSwitch";
 import { dicHeroSkill } from "./dictionary/DicHeroSkill";
@@ -66,8 +66,8 @@ import { dicCityActivity } from "./dictionary/DicCityActivity";
 import { dicChatAccuse } from "./dictionary/DicChatAccuse";
 import { dicCityActivityReward } from "./dictionary/DicCityActivityReward";
 import { dicRaceActivity, dicRaceTypes } from './dictionary/DicRaceActivity';
-import { GUILDACTIVITY } from "./dicParam";
-import { decodeIdCntArrayStr, parseGoodStr, decodeArrayListStr, getRandValueByMinMax } from "./util";
+import { GUILDACTIVITY, RECRUIT } from "./dicParam";
+import { decodeIdCntArrayStr, parseGoodStr, decodeArrayListStr, getRandValueByMinMax, getRandEelm } from "./util";
 import { RACE_EVENT_TYPE } from "../consts";
 import { dicShop, dicShopItem } from "./dictionary/DicShop";
 import { dicShopList } from "./dictionary/DicShopList";
@@ -77,13 +77,14 @@ import { dicTaskType, taskMap, dicMainTask, dicDailyTask, dicAchievement } from
 import { dicMainTaskStage } from "./dictionary/DicMainTaskStage";
 import { dicTaskBox } from './dictionary/DicTaskBox';
 import { dicGacha } from "./dictionary/DicGacha";
-import { dicGachaContent } from "./dictionary/DicGachaContent";
+import { dicGachaContent, dicGachaContentHero } from "./dictionary/DicGachaContent";
 
 export const gameData = {
     blurprtCompose: dicBlueprtCompose,
     blueprtPossibility: dicBlueprtPossibility,
     daily: dicDaily,
     event: dicEvent,
+    eventList: dicEventList,
     expedition: dicExpedition,
     expeditionPoint: dicExpeditionPoint,
     funcsSwitch: dicFuncSwitch,
@@ -186,6 +187,7 @@ export const gameData = {
     taskBox: dicTaskBox,
     gacha: dicGacha,
     gachaContent: dicGachaContent,
+    gachaContentHero: dicGachaContentHero
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -532,7 +534,7 @@ function decodeRaceActivityEncounter() {
     let eventNum = 0;
     for(let [key, value] of map) {
         if(value == RACE_EVENT_TYPE.EVENT) eventNum ++;
-        newMap.set(parseInt(key), parseInt(value));
+        newMap.set(parseInt(key), value);
     }
     return { events: newMap, eventNum };
 }
@@ -565,4 +567,19 @@ export function getRaceEventItems() {
         result.push({ id, count });
     }
     return result;
+}
+
+// 根据保底类型获得保底数量
+export function getDicGachaFloor(id: number) {
+    let map = decodeIdCntArrayStr(RECRUIT.RECRUIT_MUST, 1);
+    return map.get(id.toString())
+}
+
+
+export function getRandExpedition(cnt = 1) {
+    let arr: DicExpedition[] = [];
+    for(let [_id, dicExpedition] of gameData.expedition) {
+        arr.push(dicExpedition);
+    }
+    return getRandEelm(arr, cnt);
 }