xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

寻宝：奖励

Browse Source
This commit is contained in:
luying
2022-07-27 18:08:26 +08:00
parent 1cb41f2733
commit e1dc6307d2
11 changed files with 285 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
shared/pubUtils/data.ts
View File

@@ -11,7 +11,7 @@ import { dicQuestion, loadQuestion } from "./dictionary/DicQuestion";
import { dicSe, loadSe } from "./dictionary/DicSe";
import { dicTower, loadTower } from "./dictionary/DicTower";
import { dicTowerTask, loadTowerTask } from "./dictionary/DicTowerTask";
import { dicWar, dicWarPvp, dicDailyWarByType, loadWar, dicHeroIdByWar } from "./dictionary/DicWar";
import { dicWar, dicWarPvp, dicDailyWarByType, loadWar, dicHeroIdByWar, dicComBattleReward } from "./dictionary/DicWar";
import { dicWarJson, loadWarJson } from "./dictionary/DicWarJson";
import { AUCTION_TIME } from "../consts";
import { dicFashions, dicFashionsByHeroId, loadFashions } from "./dictionary/DicFashions";
@@ -273,7 +273,9 @@ export const gameData = {
ladderConsume: new Array<{id: number, count: number, times: number}>(),
ladderMatch: dicLadderMatch,
ladderDifficultRatio: dicLadderDifficultRatio,
ladderRankReward: dicLadderRankReward
ladderRankReward: dicLadderRankReward,
comBattleRewardTime: new Array<{from: string, to: string}>(),
comBattleReward: dicComBattleReward,
};
// 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据
@@ -382,8 +384,8 @@ export function getWarByBlueprtId(blueprtId: number) {
}
export function getRewardByBlueprtId(blueprtId: number) {
let { fixReward, teammateReward } = getWarByBlueprtId(blueprtId);
return { fixReward, teammateReward };
let { war_id } = getWarByBlueprtId(blueprtId);
return gameData.comBattleReward.get(war_id);
}
function parseComBtlLvRange() {
@@ -1038,6 +1040,7 @@ function parseDicParam() {
getCeRatio();
loadAuctionTime();
decodeLadderBuyCost();
parseComBattleRewardTime();
}
/**
@@ -1090,6 +1093,17 @@ function treatTaskGroup() {
}
}
function parseComBattleRewardTime() {
let str = param.TREASURE.TIME_REWARD;
if (!str) return
let result: { from: string, to: string }[] = [];
let decodeArr = decodeArrayListStr(str);
for (let [from, to] of decodeArr) {
result.push({ from, to });
}
gameData.comBattleRewardTime = result;
}
// 加载json
function loadDatas() {
loadHero();

69
shared/pubUtils/dictionary/DicWar.ts
View File

@@ -1,5 +1,5 @@
// 关卡表
import {decodeArrayListStr, parseNumberList, readFileAndParse} from '../util'
import {decodeArrayListStr, parseGoodStr, parseNumberList, readFileAndParse} from '../util'
import { TRAIN_REWARD_TYPE, WAR_RELATE_TABLES, WAR_TYPE } from '../../consts';
import { isString } from 'underscore'
import { RewardInter } from '../interface';
@@ -33,10 +33,6 @@ export interface DicWar {
readonly dailyType: number;
// 寻宝匹配json
readonly dispatchJsonId: number;
// 寻宝奖励
readonly jackpotReward: Array<{id: number, weight: number}>;
// 寻宝队友奖励
readonly teammateReward: Array<{id: number, count: number}>;
// 镇念塔禁用角色
readonly fobiddenCharactor: Array<{type: number, id: number}>;
// 推荐战力
@@ -59,15 +55,32 @@ export interface DicWar {
readonly secondAttrLevel: number;
}
export interface DicComBattleReward {
// 关卡固定奖励
readonly captainReward: Array<{id: number, count: number}>;
// 队友奖励
readonly teammateReward: Array<{id: number, count: number}>;
// 队长限时段增加奖励
readonly captainTimeReward: Array<{id: number, count: number}>;
// 队友限时段增加奖励
readonly teammateTimeReward: Array<{id: number, count: number}>;
// 队长军团加成奖励
readonly captainTimeGuildReward: Map<number, {id: number, count: number}[]>;
// 队友军团加成奖励
readonly teammateTimeGuildReward: Map<number, {id: number, count: number}[]>;
}
export const dicWar = new Map<number, DicWar>();
export const dicWarPvp = new Array<DicWar>();
export const dicDailyWarByType = new Map<number, DicWar[]>();
export const dicHeroIdByWar = new Map<number, number>();
export const dicComBattleReward = new Map<number, DicComBattleReward>(); // warId => DicComBattleReward
export function loadWar() {
dicWar.clear();
dicDailyWarByType.clear();
dicWarPvp.splice(0, dicWarPvp.length);
dicHeroIdByWar.clear();
dicComBattleReward.clear();
for(let filename of WAR_RELATE_TABLES) {
let arr = readFileAndParse(filename);
@@ -75,7 +88,6 @@ export function loadWar() {
o.fixReward = parseFixReward(o.fixReward);
o.conditionReward = parseConditionReward(o.conditionReward);
o.randomReward = parseRandomReward(o.RandomReward||o.randomReward);
o.jackpotReward = parseJackpotReward(o.jackpotReward);
o.teammateReward = parseFixReward(o.teammateReward);
o.fobiddenCharactor = parseForbiddenChara(o.fobiddenCharactor);
o.mapseid = parseNumberList(o.mapseid);
@@ -100,6 +112,16 @@ export function loadWar() {
} else if (o.warType == WAR_TYPE.GUILD_TRAIN) {
o.winReward = parseTrainReward(o.winReward);
o.failReward = parseTrainReward(o.failReward);
} else if (o.warType == WAR_TYPE.COM_BATTLE) {
let reward = {
captainReward: parseGoodStr(o.fixReward),
teammateReward: parseGoodStr(o.teammateReward),
captainTimeReward: parseGoodStr(o.time_captain_normalReward),
teammateTimeReward: parseGoodStr(o.time_normalReward),
captainTimeGuildReward: parseComBattleTimeReward(o.time_captain_guildReward),
teammateTimeGuildReward: parseComBattleTimeReward(o.time_captain_guildReward),
}
dicComBattleReward.set(o.war_id, reward);
}
dicWar.set(o.war_id, o);
if(!!o.heroId) dicHeroIdByWar.set(o.war_id, o.heroId);
@@ -147,18 +169,18 @@ function parseRandomReward(str: string = '') {
return result
}
function parseJackpotReward(str: string = '') {
let result = new Array<{id: number, weight: number}>();
if(!str) return result;
let decodeArr = decodeArrayListStr(str);
for(let [id, weight] of decodeArr) {
if(isNaN(parseInt(id)) || isNaN(parseInt(weight))) {
throw new Error('data table format wrong');
}
result.push({id: parseInt(id), weight: parseInt(weight)});
}
return result
}
// function parseJackpotReward(str: string = '') {
// let result = new Array<{id: number, weight: number}>();
// if(!str) return result;
// let decodeArr = decodeArrayListStr(str);
// for(let [id, weight] of decodeArr) {
// if(isNaN(parseInt(id)) || isNaN(parseInt(weight))) {
// throw new Error('data table format wrong');
// }
// result.push({id: parseInt(id), weight: parseInt(weight)});
// }
// return result
// }
function parseForbiddenChara(str: string = '') {
let result = new Array<{type: number, id: number}>();
@@ -196,4 +218,15 @@ function parseTrainReward(str: string) {
}
}
return result
}
function parseComBattleTimeReward(str: string) {
let result = new Map<number, {id: number, count: number}[]>();
if(!str) return result;
let decodeArr = decodeArrayListStr(str);
for(let i = 0; i < decodeArr.length; i++) {
let [id, count] = decodeArr[i]
result.set(i + 1, [{ id: parseInt(id), count: parseInt(count) }]);
}
return result;
}

4
shared/pubUtils/util.ts
View File

@@ -642,7 +642,7 @@ export function getReasonByWarType(warType: number) {
return ITEM_CHANGE_REASON.EXPEDITION_BATTLE_END;
case WAR_TYPE.MYSTERY:
return ITEM_CHANGE_REASON.MYSTERY_BATTLE_END;
case WAR_TYPE.WARLOARDS:
case WAR_TYPE.COM_BATTLE:
return ITEM_CHANGE_REASON.WARLOARDS_BATTLE_END;
case WAR_TYPE.TOWER:
return ITEM_CHANGE_REASON.TOWER_BATTLE_END;
@@ -685,7 +685,7 @@ export function getWarTypeName(warType: number) {
case WAR_TYPE.DAILY: return '每日';
case WAR_TYPE.EXPEDITION: return '远征';
case WAR_TYPE.MYSTERY: return '秘境';
case WAR_TYPE.WARLOARDS: return '群雄';
case WAR_TYPE.COM_BATTLE: return '寻宝';
case WAR_TYPE.TOWER: return '镇念塔';
case WAR_TYPE.PVP: return '竞技';
case WAR_TYPE.GUILD_ACTIVITY: return '军团活动';