后台:修复部分遗漏
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { TASK_TYPE, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../consts';
|
||||
import { ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../consts';
|
||||
import { ActivityModelType } from '../../db/Activity';
|
||||
import { ActivityBuyRecordsModelType } from '../../db/ActivityBuyRecords';
|
||||
import { ActivityGrowthFundModelType } from '../../db/ActivityGrowthFund';
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import moment = require('moment');
|
||||
import { ACTIVITY_RESOURCES_TYPE } from '../../consts';
|
||||
import { ActivityModelType } from '../../db/Activity';
|
||||
import { ActivityShopModelType } from '../../db/ActivityShop';
|
||||
import { ActivityBase } from './activityField';
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
import { SELF_SERVICE_SHOP_CELL_TYPE, ACTIVITY_RESOURCES_TYPE, ACTIVITY_TYPE } from '../../consts';
|
||||
import { ActivityModelType } from '../../db/Activity';
|
||||
import { ActivitySelfServiceShopModelType } from '../../db/ActivitySelfServiceShop';
|
||||
import { deltaDays } from '../../pubUtils/util';
|
||||
import { ActivityBase } from './activityField';
|
||||
|
||||
// 自助商店数据坑位数据
|
||||
|
||||
@@ -81,6 +81,7 @@ import { dicGacha, loadGacha } from "./dictionary/DicGacha";
|
||||
import { dicGachaContent, dicGachaContentHero, loadGachaContent } from "./dictionary/DicGachaContent";
|
||||
import { dicGiftPackage, loadGiftPackage } from "./dictionary/DicGiftPackage";
|
||||
import { dicRecruit, loadRecruit } from './dictionary/DicRecruit';
|
||||
import { loadRMB } from './dictionary/DicRMB';
|
||||
|
||||
export const gameData = {
|
||||
blurprtCompose: dicBlueprtCompose,
|
||||
@@ -756,34 +757,37 @@ function loadDatas() {
|
||||
loadGachaContent();
|
||||
loadGiftPackage();
|
||||
loadRecruit();
|
||||
loadRMB();
|
||||
}
|
||||
|
||||
// 重载dicParam
|
||||
export function reloadDicParam() {
|
||||
let file = readTsFile('dicParam');
|
||||
|
||||
let lines = file.split('\n');
|
||||
let outer = '';
|
||||
lines.forEach(line => {
|
||||
if(line.replace(/ /g, '')) {
|
||||
if(line.indexOf('export') != -1) {
|
||||
outer = line.split(' ')[2];
|
||||
// console.log(outer)
|
||||
}
|
||||
if(line.indexOf('export') == -1 && line.indexOf('}') == -1) {
|
||||
let s = line.split(', //')[0].split(':');
|
||||
let key = s[0].replace(/ /g, '');
|
||||
let value = s[1].replace(/ /g, '');
|
||||
let isString = value.match(/(?<=')[^']*/);
|
||||
if(isString) {
|
||||
param[outer][key] = isString[0];
|
||||
} else {
|
||||
param[outer][key] = parseFloat(value);
|
||||
if(file) {
|
||||
let lines = file.split('\n');
|
||||
let outer = '';
|
||||
lines.forEach(line => {
|
||||
if(line.replace(/ /g, '')) {
|
||||
if(line.indexOf('export') != -1) {
|
||||
outer = line.split(' ')[2];
|
||||
// console.log(outer)
|
||||
}
|
||||
if(line.indexOf('export') == -1 && line.indexOf('}') == -1) {
|
||||
let s = line.split(', //')[0].split(':');
|
||||
let key = s[0].replace(/ /g, '');
|
||||
let value = s[1].replace(/ /g, '');
|
||||
let isString = value.match(/(?<=')[^']*/);
|
||||
if(isString) {
|
||||
param[outer][key] = isString[0];
|
||||
} else {
|
||||
param[outer][key] = parseFloat(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
parseDicParam();
|
||||
});
|
||||
parseDicParam();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// 后台调用重载资源
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
import { readJsonFile, parseGoodStr } from '../util'
|
||||
import { FILENAME } from '../../consts'
|
||||
type KeysEnum<T> = { [P in keyof Required<T>]: true };
|
||||
import { RewardInter } from '../interface';
|
||||
const _ = require('lodash');
|
||||
|
||||
export interface DicArmyBossRank {
|
||||
readonly id: number;
|
||||
readonly rankMin: number;
|
||||
readonly rankMax: number;
|
||||
readonly reward: Array<RewardInter>;
|
||||
}
|
||||
|
||||
const DicArmyBossRankKeys: KeysEnum<DicArmyBossRank> = {
|
||||
id: true,
|
||||
rankMin: true,
|
||||
rankMax: true,
|
||||
reward: true,
|
||||
};
|
||||
|
||||
const str = readJsonFile(FILENAME.DIC_ARMY_BOSS_RANK_REWARD);
|
||||
let arr = JSON.parse(str);
|
||||
|
||||
export const dicArmyBossRank = new Array<DicArmyBossRank>();
|
||||
arr.forEach(o => {
|
||||
o.reward = parseGoodStr(o.reward);
|
||||
dicArmyBossRank.push(_.pick(o, Object.keys(DicArmyBossRankKeys)));
|
||||
});
|
||||
arr = undefined;
|
||||
@@ -405,8 +405,12 @@ export function readWarJsonFileList() {
|
||||
}
|
||||
|
||||
export function readTsFile(fileName: string) {
|
||||
let file = fs.readFileSync(path.resolve(__dirname, `../pubUtils/${fileName}.ts`)).toString('utf8').replace(/^\uFEFF/, '');
|
||||
return file;
|
||||
try {
|
||||
let file = fs.readFileSync(path.resolve(__dirname, `../pubUtils/${fileName}.ts`)).toString('utf8').replace(/^\uFEFF/, '');
|
||||
return file;
|
||||
} catch(e) {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
export function readFileAndParse(fileName: string) {
|
||||
|
||||
Reference in New Issue
Block a user