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

修改字段

Browse Source
This commit is contained in:
luying
2020-09-30 18:44:29 +08:00
parent 160f32bf9e
commit b74ba7757d
17 changed files with 42 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
game-server/app/servers/battle/handler/battleUtils.ts
View File

@@ -129,7 +129,7 @@ export class WarReward {
let returnGoods = new Array();
for(let goods of this.rewards) {
let goodInfo = getGoodById(goods.gid);
if(goodInfo.good_type == GOOD_TYPE.EQUIP) { // 装备
if(goodInfo.goodType == GOOD_TYPE.EQUIP) { // 装备
let result = await this.rewardWeapons(goodInfo, {id: goods.gid, cnt: goods.count });
for(let obj of result) {
returnGoods.push({dropType: goods.type, ...obj})
@@ -154,7 +154,7 @@ export class WarReward {
eName: dicGood.name,
seqId,
quality: dicGood.lv,
type: dicGood.good_type
type: dicGood.goodType
}
const equip = await EquipModel.createEquip(equipInfo);
cnt -= 1;

28
game-server/app/servers/battle/handler/dailyBattleHandler.ts
View File

@@ -18,16 +18,16 @@ export class DailyBattleHandler {
const BattleRecord = await BattleRecordModel.getBattleList(roleId, WAR_TYPE.DAILY);
let dicDaily = getGamedata('dic_daily');
let dicDailyWar = getGamedata('dic_daily_war');
let dicDaily = getGamedata('dic_zyz_daily');
let dicDailyWar = getGamedata('dic_zyz_gk_daily');
let result = new Array();
for(let {type, name, sum} of dicDaily) {
for(let {dailyType: type, name, timesPerDay: sum} of dicDaily) {
let refreshResult = await DailyRecordModel.refreshRecord(roleId, type);
let {count} = refreshResult;
let wars = new Array();
for(let {war_id, daily_type, difficulty, cost, gk_name, previousGk } of dicDailyWar) {
if(daily_type == type) {
for(let {war_id, dailyType, cost, gk_name, previousGk } of dicDailyWar) {
if(dailyType == type) {
let status = 0, star = 0;
let curBattle = BattleRecord.find(cur => cur.battleId == war_id);
if(curBattle) {
@@ -46,7 +46,7 @@ export class DailyBattleHandler {
}
}
wars.push({
battleId: war_id, difficulty, cost, star, status, name: gk_name
battleId: war_id, cost, star, status, name: gk_name
});
}
}
@@ -65,13 +65,13 @@ export class DailyBattleHandler {
// 检查每日本次数checkBattle使用
export async function checkDaily(roleId: string, battleId: number, inc: number) {
let dicDaily = getGamedata('dic_daily');
let dicDailyWar = getGamedata('dic_daily_war');
let dicDaily = getGamedata('dic_zyz_daily');
let dicDailyWar = getGamedata('dic_zyz_gk_daily');
let dailyWar = dicDailyWar.find(cur => cur.war_id == battleId);
if(!dailyWar) return { status: -1, msg: '未找到该关卡' };
let type = dailyWar.daily_type;
let type = dailyWar.dailyType;
let curDaily = dicDaily.find(cur => cur.type == type);
let curDaily = dicDaily.find(cur => cur.dailyType == type);
if(!curDaily) return { status: -1, msg: '未找到该类型' };
let dailyRecord = await DailyRecordModel.refreshRecord(roleId, type);
let { count } = dailyRecord;
@@ -83,13 +83,13 @@ export async function checkDaily(roleId: string, battleId: number, inc: number)
// 检查每日本次数warEnd和warSweep使用
export async function checkDailyAndIncrease(roleId: string, battleId: number, inc: number, isRef: boolean) {
let dicDaily = getGamedata('dic_daily');
let dicDailyWar = getGamedata('dic_daily_war');
let dicDaily = getGamedata('dic_zyz_daily');
let dicDailyWar = getGamedata('dic_zyz_gk_daily');
let dailyWar = dicDailyWar.find(cur => cur.war_id == battleId);
if(!dailyWar) return { status: -1, msg: '未找到该关卡' };
let type = dailyWar.daily_type;
let type = dailyWar.dailyType;
let curDaily = dicDaily.find(cur => cur.type == type);
let curDaily = dicDaily.find(cur => cur.dailyType == type);
if(!curDaily) return { status: -1, msg: '未找到该类型' };
let dailyRecord;

10
game-server/app/servers/battle/handler/normalBattleHandler.ts
View File

@@ -42,7 +42,7 @@ export class NormalBattleHandler {
}
let dailyNum = {};
if(warInfo.war_type == WAR_TYPE.DAILY) {
if(warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDaily(roleId, battleId, 1);
if(checkResult.status == -1) {
return {code: 202, data: checkResult.msg}
@@ -55,7 +55,7 @@ export class NormalBattleHandler {
roleId, roleName, battleId,
status: 0,
warName: warInfo.gk_name,
warType: warInfo.war_type,
warType: warInfo.warType,
record: { heroes }
}
}, true);
@@ -123,7 +123,7 @@ export class NormalBattleHandler {
}
let dailyNum = {};
if(warInfo.war_type == WAR_TYPE.DAILY) {
if(warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDailyAndIncrease(roleId, battleId, 1, false);
if(checkResult.status == -1) {
return {code: 202, data: checkResult.msg}
@@ -203,7 +203,7 @@ export class NormalBattleHandler {
// 扫荡次数
let dailyNum = {};
if(warInfo.war_type == WAR_TYPE.DAILY) {
if(warInfo.warType == WAR_TYPE.DAILY) {
let checkResult = await checkDailyAndIncrease(roleId, battleId, count, true);
if(checkResult.status == -1) {
return {code: 202, data: checkResult.msg}
@@ -220,7 +220,7 @@ export class NormalBattleHandler {
$set: {
roleName,
warName: warInfo.gk_name,
warType: warInfo.war_type
warType: warInfo.warType
},
$inc: { count }
});

2
game-server/app/util/gamedata.ts
View File

@@ -29,7 +29,7 @@ export function getGamedata(key) {
}
export function getWarById(warid) {
const wars = ['dic_zyz_gk', 'dic_daily_war', 'dic_event_war']; // 关卡相关的表
const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event']; // 关卡相关的表
let result;
for(let filename of wars) {
let warInfo = gamedata[filename]||[];