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

Merge branch 'master' into feature/backend

Browse Source 
# Conflicts:
#	game-server/app/servers/connector/handler/entryHandler.ts
#	game-server/app/servers/role/handler/itemHandler.ts
#	shared/consts/constModules/sysConst.ts
#	shared/pubUtils/util.ts
#	web-server/app.ts
#	web-server/app/service/Auth.ts
This commit is contained in:
luying
2021-12-14 18:08:44 +08:00
parent fbd19a5c4c dd7cf449d6
commit d4722c4099
98 changed files with 10245 additions and 4858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/pubUtils/util.ts
+48 -1
View File
@@ -6,7 +6,7 @@ import { isNumber } from 'underscore';
const csprng = require('csprng');
import fs = require('fs');
import path = require('path');
import { HERO_CE_RATIO, ABI_STAGE, GACHA_TO_FLOOR, REFRESH_TIME, ROBOT_SYS_TYPE, } from '../consts';
import { HERO_CE_RATIO, ABI_STAGE, GACHA_TO_FLOOR, REFRESH_TIME, ROBOT_SYS_TYPE, ITEM_CHANGE_REASON, WAR_TYPE } from '../consts';
import { findIndex } from 'underscore';
import { getTimeFunM } from './timeUtil';
@@ -675,4 +675,51 @@ export function isTimestamp(time: number, len = 10) {
if(!isNumber(time)) return false;
if(time.toString().length != len) return false;
return true;
}
export function getReasonByWarType(warType: number) {
switch(warType) {
case WAR_TYPE.NORMAL:
return ITEM_CHANGE_REASON.NORMAL_BATTLE_END;
case WAR_TYPE.VESTIGE:
return ITEM_CHANGE_REASON.VESTIGE_BATTLE_END;
case WAR_TYPE.EVENT:
return ITEM_CHANGE_REASON.EVENT_BATTLE_END;
case WAR_TYPE.DAILY:
return ITEM_CHANGE_REASON.DAILY_BATTLE_END;
case WAR_TYPE.EXPEDITION:
return ITEM_CHANGE_REASON.EXPEDITION_BATTLE_END;
case WAR_TYPE.MYSTERY:
return ITEM_CHANGE_REASON.MYSTERY_BATTLE_END;
case WAR_TYPE.WARLOARDS:
return ITEM_CHANGE_REASON.WARLOARDS_BATTLE_END;
case WAR_TYPE.TOWER:
return ITEM_CHANGE_REASON.TOWER_BATTLE_END;
case WAR_TYPE.PVP:
return ITEM_CHANGE_REASON.PVP_BATTLE_END;
// case WAR_TYPE.GUILD_ACTIVITY:
// return ITEM_CHANGE_REASON.GUILD_ACTIVITY_BATTLE_END;
case WAR_TYPE.GUILD_TRAIN:
return ITEM_CHANGE_REASON.TRAIN_BATTLE_END;
case WAR_TYPE.MAIN_ELITE:
return ITEM_CHANGE_REASON.MAIN_ELITE_BATTLE_END;
// case WAR_TYPE.MYSTERY_ELITE:
// return ITEM_CHANGE_REASON.MYSTERY_ELITE_BATTLE_END;
case WAR_TYPE.BRANCH:
return ITEM_CHANGE_REASON.BRANCH_BATTLE_END;
case WAR_TYPE.ACT_TREASURE_HUNT:
return ITEM_CHANGE_REASON.ACT_TREASURE_HUNT_BATTLE_END;
case WAR_TYPE.ACT_SELF_SHOP:
return ITEM_CHANGE_REASON.ACT_SELF_SHOP_BATTLE_END;
case WAR_TYPE.ACT_DAILY_GK:
return ITEM_CHANGE_REASON.ACT_DAILY_GK_BATTLE_END;
case WAR_TYPE.ACT_NEW_HERO_GK:
return ITEM_CHANGE_REASON.ACT_NEW_HERO_GK_BATTLE_END;
case WAR_TYPE.TRY:
return ITEM_CHANGE_REASON.TRY_BATTLE_END;
case WAR_TYPE.BOSS:
return ITEM_CHANGE_REASON.BOSS_BATTLE_END;
default:
return ITEM_CHANGE_REASON.NORMAL_BATTLE_END;
}
}