From e877b0190dfe2d52bf16fc2aa74bc2f32ecf5ec6 Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Tue, 15 Dec 2020 16:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=20consts=20=E6=95=B4=E7=90=86?= =?UTF-8?q?=E5=88=B0=E5=87=A0=E4=B8=AA=E6=96=87=E4=BB=B6=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/handler/comBattleHandler.ts | 2 +- .../battle/handler/dailyBattleHandler.ts | 2 +- .../battle/handler/dungeonBattleHandler.ts | 2 +- .../battle/handler/eventBattleHandler.ts | 2 +- .../battle/handler/expeditionBattleHandler.ts | 2 +- .../battle/handler/normalBattleHandler.ts | 2 +- .../battle/handler/towerBattleHandler.ts | 2 +- .../servers/connector/handler/entryHandler.ts | 2 +- .../app/servers/role/handler/heroHandler.ts | 3 +- .../app/servers/role/handler/roleHandler.ts | 2 +- .../app/services/actionPointService.ts | 2 +- game-server/app/services/battleService.ts | 2 +- game-server/app/services/comBattleService.ts | 2 +- game-server/app/services/dungeonService.ts | 2 +- game-server/app/services/eventSercive.ts | 4 +- game-server/app/services/expeditionService.ts | 4 +- game-server/app/services/funcSwitchService.ts | 2 +- .../app/services/normalBattleService.ts | 2 +- game-server/app/services/playerCeService.ts | 5 +- game-server/app/services/redisService.ts | 4 +- game-server/app/services/rewardService.ts | 2 +- game-server/app/services/warRewardService.ts | 2 +- gm-server/app/controller/login.ts | 2 +- gm-server/app/controller/upload.ts | 2 +- gm-server/app/controller/users.ts | 2 +- gm-server/app/middleware/tokenParser.ts | 2 +- gm-server/app/service/GmUser.ts | 2 +- gm-server/app/service/users.ts | 4 +- gm-server/tsconfig.json | 2 +- .../consts/{ => constModules}/abilityConst.ts | 2 +- shared/consts/constModules/battleConst.ts | 150 ++++++++++++++++++ shared/consts/constModules/calcuConst.ts | 20 +++ shared/consts/constModules/heroConst.ts | 21 +++ shared/consts/constModules/itemConst.ts | 91 +++++++++++ shared/consts/constModules/sysConst.ts | 46 ++++++ shared/consts/consts.ts | 8 +- shared/consts/index.ts | 7 + shared/db/Api.ts | 2 +- shared/db/DailyRecord.ts | 2 +- shared/db/ExpeditionWarRecord.ts | 2 +- shared/db/GMGroup.ts | 2 +- shared/db/GMUser.ts | 2 +- shared/db/Game.ts | 2 +- shared/db/HangUpRecord.ts | 2 +- shared/db/HangUpSpdUpRec.ts | 2 +- shared/db/Hero.ts | 2 +- shared/db/Role.ts | 2 +- shared/db/User.ts | 2 +- shared/pubUtils/actor.ts | 4 +- shared/pubUtils/dictionary/DicGoods.ts | 2 +- shared/pubUtils/dictionary/DicHero.ts | 2 +- shared/pubUtils/dictionary/DicHeroStar.ts | 2 +- shared/pubUtils/dictionary/DicHeroWake.ts | 2 +- shared/pubUtils/dictionary/DicWarJson.ts | 2 +- shared/pubUtils/gamedata.ts | 4 +- web-server/app/controller/game.ts | 2 +- web-server/app/middleware/parmsDecode.ts | 2 +- web-server/app/middleware/tokenParser.ts | 2 +- web-server/app/service/Auth.ts | 6 +- web-server/app/service/TurboCore.ts | 2 +- web-server/tsconfig.json | 2 +- 61 files changed, 402 insertions(+), 69 deletions(-) rename shared/consts/{ => constModules}/abilityConst.ts (98%) create mode 100644 shared/consts/constModules/battleConst.ts create mode 100644 shared/consts/constModules/calcuConst.ts create mode 100644 shared/consts/constModules/heroConst.ts create mode 100644 shared/consts/constModules/itemConst.ts create mode 100644 shared/consts/constModules/sysConst.ts create mode 100644 shared/consts/index.ts diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts index 1151a653c..c82db9f36 100644 --- a/game-server/app/servers/battle/handler/comBattleHandler.ts +++ b/game-server/app/servers/battle/handler/comBattleHandler.ts @@ -4,7 +4,7 @@ * @Last Modified by: 梁桐川 * @Last Modified time: 2020-12-03 21:36:00 */ -import { IT_TYPE, GOLD_COST_RATIO, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, GOOD_QUALITY, CONSUME_TYPE } from './../../../consts/consts'; +import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, GOOD_QUALITY, CONSUME_TYPE } from './../../../consts'; import { getGoodById, getBossHpByBlueprtId, getComBtlSetByQuality, getBlueprtComposeByQuality, getBluePrtByQuality, getWarById, getWarIdByBlueprtId } from '../../../pubUtils/gamedata'; import { ComBattleTeamModel, BossHp } from '../../../db/ComBattleTeam'; import Role, { RoleModel } from '../../../db/Role'; diff --git a/game-server/app/servers/battle/handler/dailyBattleHandler.ts b/game-server/app/servers/battle/handler/dailyBattleHandler.ts index 7824d0364..74c47c6a8 100644 --- a/game-server/app/servers/battle/handler/dailyBattleHandler.ts +++ b/game-server/app/servers/battle/handler/dailyBattleHandler.ts @@ -1,7 +1,7 @@ import { Application, BackendSession } from 'pinus'; import { DailyRecordModel } from '../../../db/DailyRecord'; import { getGamedata } from '../../../pubUtils/gamedata'; -import { GOLD_COST_RATIO } from '../../../consts/consts'; +import { GOLD_COST_RATIO } from '../../../consts'; import { STATUS } from '../../../consts/statusCode'; import { resResult, calculateNum } from '../../../pubUtils/util'; import { RoleModel } from '../../../db/Role'; diff --git a/game-server/app/servers/battle/handler/dungeonBattleHandler.ts b/game-server/app/servers/battle/handler/dungeonBattleHandler.ts index 3b34b89d2..e17bdd841 100644 --- a/game-server/app/servers/battle/handler/dungeonBattleHandler.ts +++ b/game-server/app/servers/battle/handler/dungeonBattleHandler.ts @@ -1,5 +1,5 @@ import { Application, BackendSession } from 'pinus'; -import { GOLD_COST_RATIO, DUNGEON_CONST } from '../../../consts/consts'; +import { GOLD_COST_RATIO, DUNGEON_CONST } from '../../../consts'; import { STATUS } from '../../../consts/statusCode'; import { resResult, calculateNum, shouldRefresh } from '../../../pubUtils/util'; import { RoleModel } from '../../../db/Role'; diff --git a/game-server/app/servers/battle/handler/eventBattleHandler.ts b/game-server/app/servers/battle/handler/eventBattleHandler.ts index 5dfbcc3cc..715c5a50b 100644 --- a/game-server/app/servers/battle/handler/eventBattleHandler.ts +++ b/game-server/app/servers/battle/handler/eventBattleHandler.ts @@ -2,7 +2,7 @@ import { Application, BackendSession } from 'pinus'; import { getGamedata } from '../../../pubUtils/gamedata'; import { EventRecordModel } from '../../../db/EventRecord'; import { RoleModel } from '../../../db/Role'; -import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS } from '../../../consts/consts'; +import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_ANSWER_STATUS } from '../../../consts'; import { checkEvent, checkEventStatus, getEventSuccessStatus, getEvent, checkQuiz } from '../../../services/eventSercive'; import { handleFixedReward } from '../../../services/rewardService'; import { STATUS } from '../../../consts/statusCode'; diff --git a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts index 46eefafb4..5eaaf6a88 100644 --- a/game-server/app/servers/battle/handler/expeditionBattleHandler.ts +++ b/game-server/app/servers/battle/handler/expeditionBattleHandler.ts @@ -7,7 +7,7 @@ import { ExpeditionPointModel } from '../../../db/ExpeditionPoint'; import { RoleModel } from '../../../db/Role'; import { calculateSumCE, genCode } from '../../../pubUtils/util'; import { getPointRewardStatus, getResetRemainCnt, findOrCreateEnemies } from '../../../services/expeditionService'; -import { EXPEDITION_CONST, EXPEDITION_WAR_RECORD_STATUS } from '../../../consts/consts'; +import { EXPEDITION_CONST, EXPEDITION_WAR_RECORD_STATUS } from '../../../consts'; import { WarReward } from '../../../services/warRewardService'; import { handleFixedReward } from '../../../services/rewardService'; import { getAp, setAp } from '../../../services/actionPointService'; diff --git a/game-server/app/servers/battle/handler/normalBattleHandler.ts b/game-server/app/servers/battle/handler/normalBattleHandler.ts index 7f9f13e70..b789a3bae 100644 --- a/game-server/app/servers/battle/handler/normalBattleHandler.ts +++ b/game-server/app/servers/battle/handler/normalBattleHandler.ts @@ -3,7 +3,7 @@ import { BattleRecordModel } from '../../../db/BattleRecord'; import { BattleSweepRecordModel } from '../../../db/BattleSweepRecord'; import { getWarById, } from '../../../pubUtils/gamedata'; import { genCode } from '../../../pubUtils/util'; -import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE } from '../../../consts/consts'; +import { WAR_TYPE, EVENT_STATUS, FUNC_OPT_TYPE } from '../../../consts'; import { checkDaily, checkDailyAndIncrease } from '../../../services/dailyBattleService'; import { checkTowerWar, towerBattleEnd } from '../../../services/battleService'; import { WarReward } from '../../../services/warRewardService'; diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index 5a9c995fc..a500b92f9 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -1,5 +1,5 @@ import { STATUS } from './../../../consts/statusCode'; -import { HANG_UP_CONSTS, GOLD_COST_RATIO, TOWER_TASK_CONST, REDIS_KEY } from './../../../consts/consts'; +import { HANG_UP_CONSTS, GOLD_COST_RATIO, TOWER_TASK_CONST, REDIS_KEY } from './../../../consts'; import { TowerTaskRecModel } from './../../../db/TowerTaskRec'; import { HangUpSpdUpRecModel } from './../../../db/HangUpSpdUpRec'; import { HangUpRecordModel } from './../../../db/HangUpRecord'; diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts index 93c7c3d05..2be08705f 100644 --- a/game-server/app/servers/connector/handler/entryHandler.ts +++ b/game-server/app/servers/connector/handler/entryHandler.ts @@ -8,7 +8,7 @@ import {FrontendSession} from 'pinus'; import { HeroModel } from './../../../db/Hero'; import { resResult } from '../../../pubUtils/util'; import { startEvent } from '../../../services/eventSercive'; -import { EVENT_START_LV, FUNC_OPT_TYPE } from '../../../consts/consts'; +import { EVENT_START_LV, FUNC_OPT_TYPE } from '../../../consts'; import { getAp } from '../../../services/actionPointService'; import Actor from '../../../pubUtils/actor'; import { ItemModel } from '../../../db/Item'; diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index b13a5138b..4b12c104a 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -4,8 +4,7 @@ import { calPlayerCeAndSave, getAllAttrStage } from '../../../services/playerCeS import { resResult } from '../../../pubUtils/util'; import { STATUS } from '../../../consts/statusCode'; import {HeroModel} from '../../../db/Hero'; -import {CURRENCY_BY_TYPE, CURRENCY_TYPE, CONSUME_TYPE, HERO_GROW_MAX, HERO_SYSTEM_TYPE, ITID} from '../../../consts/consts'; -import { ABI_STAGE } from '../../../consts/abilityConst'; +import {CURRENCY_BY_TYPE, CURRENCY_TYPE, CONSUME_TYPE, HERO_GROW_MAX, HERO_SYSTEM_TYPE, ITID, ABI_STAGE} from '../../../consts'; import { RoleModel } from '../../../db/Role'; import { ItemModel } from '../../../db/Item'; import { gameData, getHeroExpByLv, getHeroStarByQuality, getHeroWakeByQuality, getHeroLvByExp, getMaxGradeByjobClass, getJobByGradeAndClass, getFriendShipById } from '../../../pubUtils/data'; diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts index 63ee4bd99..48ab60350 100644 --- a/game-server/app/servers/role/handler/roleHandler.ts +++ b/game-server/app/servers/role/handler/roleHandler.ts @@ -5,7 +5,7 @@ import { HeroModel } from '../../../db/Hero'; import { EquipModel } from '../../../db/Equip'; import { calculateCE, resResult } from '../../../pubUtils/util'; import {Application, BackendSession, createTcpMailBox} from 'pinus'; -import { COUNTER } from '../../../consts/consts'; +import { COUNTER } from '../../../consts'; export default function(app: Application) { return new RoleHandler(app); diff --git a/game-server/app/services/actionPointService.ts b/game-server/app/services/actionPointService.ts index 885119051..dbf45dc88 100644 --- a/game-server/app/services/actionPointService.ts +++ b/game-server/app/services/actionPointService.ts @@ -3,7 +3,7 @@ */ import { ActionPointModel } from '../db/ActionPoint'; -import { ACTION_POIN } from '../consts/consts'; +import { ACTION_POIN } from '../consts'; export async function getAp(now: number, roleId: string) { let dataAp = await ActionPointModel.getAp(roleId); diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts index 571aff69a..eaf55e2a7 100644 --- a/game-server/app/services/battleService.ts +++ b/game-server/app/services/battleService.ts @@ -1,7 +1,7 @@ import { HeroModel } from './../db/Hero'; import { HangUpRecordModel } from './../db/HangUpRecord'; import { ChannelService } from 'pinus'; -import { HANG_UP_CONSTS, TOWER_TASK_CONST, REDIS_KEY } from './../consts/consts'; +import { HANG_UP_CONSTS, TOWER_TASK_CONST, REDIS_KEY } from './../consts'; import { BattleRecordModel } from './../db/BattleRecord'; import { TowerRecordModel } from './../db/TowerRecord'; import { RoleModel } from './../db/Role'; diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts index cf24ae967..33d716143 100644 --- a/game-server/app/services/comBattleService.ts +++ b/game-server/app/services/comBattleService.ts @@ -1,6 +1,6 @@ import { FriendPointModel } from './../db/FriendPoint'; import { STATUS } from './../consts/statusCode'; -import { COM_BATTLE_ROBOT_ID_NAME, COM_TEAM_STATUS, CURRENCY_BY_TYPE, CURRENCY_TYPE, FRIEND_DROP_TYPE, COM_BTL_CONST, FRIEND_DROP_MAX } from './../consts/consts'; +import { COM_BATTLE_ROBOT_ID_NAME, COM_TEAM_STATUS, CURRENCY_BY_TYPE, CURRENCY_TYPE, FRIEND_DROP_TYPE, COM_BTL_CONST, FRIEND_DROP_MAX } from './../consts'; import { RoleStatus, ComBattleTeamModel } from './../db/ComBattleTeam'; import { getBluePrtByQuality, getComBtlSetByQuality, getRewardByBlueprtId, getWarById, getWarIdByBlueprtId } from "../pubUtils/gamedata"; import { getRandEelm, getRandValue, resResult, ratioReward } from "../pubUtils/util"; diff --git a/game-server/app/services/dungeonService.ts b/game-server/app/services/dungeonService.ts index 9f5e0e651..f0af2d9c1 100644 --- a/game-server/app/services/dungeonService.ts +++ b/game-server/app/services/dungeonService.ts @@ -5,7 +5,7 @@ import { resResult, shouldRefresh } from '../pubUtils/util'; import { STATUS } from '../consts/statusCode'; import { RoleModel } from '../db/Role'; -import { DUNGEON_CONST } from '../consts/consts'; +import { DUNGEON_CONST } from '../consts'; // 检查秘境本次数checkBattle使用 export async function checkDungeonNum(roleId: string, inc: number) { diff --git a/game-server/app/services/eventSercive.ts b/game-server/app/services/eventSercive.ts index 1b5beacb1..ab8f7063f 100644 --- a/game-server/app/services/eventSercive.ts +++ b/game-server/app/services/eventSercive.ts @@ -3,8 +3,8 @@ import { getGamedata } from '../pubUtils/gamedata'; import EventRecord, { EventRecordModel } from '../db/EventRecord'; import { RoleModel } from '../db/Role'; import { genCode, decodeStrSingle, decodeStr, getRandomWithWeight, resResult, setLocalHours } from '../pubUtils/util'; -import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_TYPE, EVENT_RANDOM_TYPE_ONE_OPEN, EVENT_QUIZ_NUM, EVENT_ANSWER_STATUS, FUNCS_ID } from '../consts/consts'; -import { EVENT_REFRESH_NUM } from '../consts/consts'; +import { EVENT_STATUS, EVENT_RECORD_STATUS, EVENT_TYPE, EVENT_RANDOM_TYPE_ONE_OPEN, EVENT_QUIZ_NUM, EVENT_ANSWER_STATUS, FUNCS_ID } from '../consts'; +import { EVENT_REFRESH_NUM } from '../consts'; import { STATUS } from '../consts/statusCode'; /** diff --git a/game-server/app/services/expeditionService.ts b/game-server/app/services/expeditionService.ts index 52c7c89fe..489715789 100644 --- a/game-server/app/services/expeditionService.ts +++ b/game-server/app/services/expeditionService.ts @@ -5,8 +5,8 @@ import { PvpDefenseModel } from '../db/PvpDefense'; import { getWarJsons, getGamedata, getExpeditionById } from '../pubUtils/gamedata'; import { decodeStr, resResult, setLocalHours, shouldRefresh } from '../pubUtils/util'; -import { EXPEDITION_CONST } from '../consts/consts'; -import { getAtrrNameById} from '../consts/abilityConst'; +import { EXPEDITION_CONST } from '../consts'; +import { getAtrrNameById} from '../consts'; import Actor from '../pubUtils/actor'; import { ExpeditionWarRecordModel } from '../db/ExpeditionWarRecord'; diff --git a/game-server/app/services/funcSwitchService.ts b/game-server/app/services/funcSwitchService.ts index 210733a78..c6640b486 100644 --- a/game-server/app/services/funcSwitchService.ts +++ b/game-server/app/services/funcSwitchService.ts @@ -1,7 +1,7 @@ import { Application, BackendSession, FrontendSession } from "pinus"; import { getGamedata } from "../pubUtils/gamedata"; import Role, { RoleModel } from "../db/Role"; -import { FUNC_OPT_TYPE } from "../consts/consts"; +import { FUNC_OPT_TYPE } from "../consts"; // 开启功能 export async function switchOnFunc(roleId: string, type: number, param: number, app: Application, session: (BackendSession|FrontendSession)) { diff --git a/game-server/app/services/normalBattleService.ts b/game-server/app/services/normalBattleService.ts index e451b6962..1cc516788 100644 --- a/game-server/app/services/normalBattleService.ts +++ b/game-server/app/services/normalBattleService.ts @@ -4,7 +4,7 @@ import Role, { RoleModel } from '../db/Role' import { getLvByExp, getExpByLv } from '../pubUtils/gamedata'; import { redisUserInfoUpdate } from './redisService'; import { switchOnFunc } from './funcSwitchService'; -import { FUNC_OPT_TYPE } from '../consts/consts'; +import { FUNC_OPT_TYPE } from '../consts'; import { Application, BackendSession } from 'pinus'; export async function roleLevelup(roleId: string, kingExp: number, app: Application, session: BackendSession) { diff --git a/game-server/app/services/playerCeService.ts b/game-server/app/services/playerCeService.ts index 2bef88a19..1e54288e0 100644 --- a/game-server/app/services/playerCeService.ts +++ b/game-server/app/services/playerCeService.ts @@ -2,7 +2,7 @@ * 体力系统 */ -import { HERO_SYSTEM_TYPE } from '../consts/consts'; +import { HERO_SYSTEM_TYPE } from '../consts'; import { pinus } from 'pinus'; import { STATUS } from '../consts/statusCode'; @@ -11,8 +11,7 @@ import Hero from '../db/Hero'; import { RoleModel } from '../db/Role'; import { CeAttrData, CeAttr } from '../db/BaseModel'; import { getFashionsById, getJobInfoById, getJobByGradeAndClass, getHeroInfoById, getHeroStar, getHeroWake, getFiendShipLevel, getFriendShipById, getHeroSkillById, getSeidById } from '../pubUtils/gamedata'; -import { getAttrNameByJobStage, getAttrCeRatio, getAtrrNameById, ABI_TYPE_TO_STAGE, ABI_STAGE, SEID_TYPE, HERO_ATTR} from '../consts/abilityConst'; - +import { getAttrNameByJobStage, getAttrCeRatio, getAtrrNameById, ABI_TYPE_TO_STAGE, ABI_STAGE, SEID_TYPE, HERO_ATTR} from '../consts'; const HERO_CE_RATIO = 100; const _ = require('underscore'); //战力计算TODO diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts index 4061ccbf0..7fb301ae6 100644 --- a/game-server/app/services/redisService.ts +++ b/game-server/app/services/redisService.ts @@ -1,7 +1,7 @@ -import { GOOD_QUALITY } from './../consts/consts'; +import { GOOD_QUALITY } from './../consts'; import { RoleModel } from "../db/Role"; import * as Redis from 'redis'; -import {REDIS_KEY} from '../consts/consts' +import {REDIS_KEY} from '../consts' import { GameModel } from "../db/Game"; import { promisifyAll } from 'bluebird'; diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts index 4daa20092..b9216307a 100644 --- a/game-server/app/services/rewardService.ts +++ b/game-server/app/services/rewardService.ts @@ -1,4 +1,4 @@ -import { GOOD_TYPE, ITID, CURRENCY, CURRENCY_TYPE, COUNTER } from './../consts/consts'; +import { GOOD_TYPE, ITID, CURRENCY, CURRENCY_TYPE, COUNTER } from './../consts'; import { EquipModel } from './../db/Equip'; import { CounterModel } from './../db/Counter'; import { decodeStr, resResult } from '../pubUtils/util'; diff --git a/game-server/app/services/warRewardService.ts b/game-server/app/services/warRewardService.ts index 310658cf6..246784e17 100644 --- a/game-server/app/services/warRewardService.ts +++ b/game-server/app/services/warRewardService.ts @@ -6,7 +6,7 @@ import { BattleDropModel } from '../db/BattleDrop'; import { getWarById, getBluePrtByQuality, getGamedata } from '../pubUtils/gamedata'; import { decodeStr, getRefTime, getRandomWithWeight, getRandomByLen } from '../pubUtils/util'; -import { BATTLE_REWARD_TYPE, BLUEPRT_CONST } from '../consts/consts'; +import { BATTLE_REWARD_TYPE, BLUEPRT_CONST } from '../consts'; import { handleReward } from './rewardService'; import { BattleBlueprtDropModel } from '../db/BattleBlueprtDrop' import { RoleModel } from '../db/Role'; diff --git a/gm-server/app/controller/login.ts b/gm-server/app/controller/login.ts index 456e649c2..f796a55d1 100644 --- a/gm-server/app/controller/login.ts +++ b/gm-server/app/controller/login.ts @@ -1,5 +1,5 @@ import { Controller } from 'egg'; -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; export default class LoginController extends Controller { diff --git a/gm-server/app/controller/upload.ts b/gm-server/app/controller/upload.ts index add601bbc..44ea804d8 100644 --- a/gm-server/app/controller/upload.ts +++ b/gm-server/app/controller/upload.ts @@ -1,6 +1,6 @@ import { Controller } from 'egg'; import { Stream } from 'stream'; -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; const fs = require('fs'); const unzip = require("unzip-stream"); const temp = require('temp'); diff --git a/gm-server/app/controller/users.ts b/gm-server/app/controller/users.ts index 7b4951f58..c406e0b27 100644 --- a/gm-server/app/controller/users.ts +++ b/gm-server/app/controller/users.ts @@ -1,5 +1,5 @@ import { Controller } from 'egg'; -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; export default class UserController extends Controller { diff --git a/gm-server/app/middleware/tokenParser.ts b/gm-server/app/middleware/tokenParser.ts index 98bdd6af5..4f5bf1d55 100644 --- a/gm-server/app/middleware/tokenParser.ts +++ b/gm-server/app/middleware/tokenParser.ts @@ -3,7 +3,7 @@ import { GMUserGroupModel } from '@db/GMUserGroup' import { GMGroupModel } from '@db/GMGroup' import { GMRecordModel } from '@db/GMRecord' import { ApiModel } from '@db/Api'; -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; module.exports = () => { return async function tokenParser(ctx, next) { diff --git a/gm-server/app/service/GmUser.ts b/gm-server/app/service/GmUser.ts index da69cfbdf..f638a871b 100644 --- a/gm-server/app/service/GmUser.ts +++ b/gm-server/app/service/GmUser.ts @@ -3,7 +3,7 @@ import { GMGroupModel } from '@db/GMGroup'; import { GMUserGroupModel } from '@db/GMUserGroup'; import { ApiModel } from '@db/Api'; import { Service } from 'egg'; -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; /** * Test Service diff --git a/gm-server/app/service/users.ts b/gm-server/app/service/users.ts index 221ccdd61..4de506a8d 100644 --- a/gm-server/app/service/users.ts +++ b/gm-server/app/service/users.ts @@ -21,8 +21,8 @@ import { PvpDefenseModel } from '@db/PvpDefense'; import { Service } from 'egg'; import Counter from '@db/Counter'; -import { STATUS } from '@consts/statusCode'; -import { ITID, COUNTER } from '@consts/consts'; +import { STATUS } from '@consts'; +import { ITID, COUNTER } from '@consts'; import Actor from '@pubUtils/actor'; import { ItemModel } from '@db/Item'; diff --git a/gm-server/tsconfig.json b/gm-server/tsconfig.json index b146d0afe..4e0feaed2 100644 --- a/gm-server/tsconfig.json +++ b/gm-server/tsconfig.json @@ -24,7 +24,7 @@ "baseUrl": ".", "paths": { "@db/*": ["app/db/*"], - "@consts/*": ["app/consts/*"], + "@consts": ["app/consts"], "@pubUtils/*": ["app/pubUtils/*"] }, }, diff --git a/shared/consts/abilityConst.ts b/shared/consts/constModules/abilityConst.ts similarity index 98% rename from shared/consts/abilityConst.ts rename to shared/consts/constModules/abilityConst.ts index c68151702..68bef509a 100644 --- a/shared/consts/abilityConst.ts +++ b/shared/consts/constModules/abilityConst.ts @@ -5,7 +5,7 @@ */ -import { JOB_TYPE } from "./consts"; +import { JOB_TYPE } from ".."; export enum ABI_TYPE{ /**生命 */ diff --git a/shared/consts/constModules/battleConst.ts b/shared/consts/constModules/battleConst.ts new file mode 100644 index 000000000..48e8b2af1 --- /dev/null +++ b/shared/consts/constModules/battleConst.ts @@ -0,0 +1,150 @@ +export const ACTION_POIN = { + MAX: 100000, + PER: 6 * 60 * 1000 +}; + +export const BATTLE_REWARD_TYPE = { + FIX_REWARD: 1, + CONDITION_REWARD: 2, + RANDOM_REWARD: 3 +}; + +export const WAR_TYPE = { + NORMAL: 1, // 主线本 + VESTIGE: 2, // 遗迹本 + EVENT: 3, // 事件本 + DAILY: 4, // 每日 + EXPEDITION: 5, // 远征 + MYSTERY: 6, // 秘境 + WARLOARDS: 7, // 群雄 + TOWER: 8, // 天梯 + PVP: 9, // PVP + GUILD_TIMER: 10, // 军团定时副本 + GUILD_WEEKLY: 11, // 军团周副本 + MAIN_ELITE: 12, // 主线精英 + MYSTERY_ELITE: 13 // 秘境精英 +}; + +// 藏宝图掉落参数 +export const BLUEPRT_CONST = { + REFRESH_TIME: 5, // 每天几点刷新 + DAILY_CNT: 5, // 每天最多掉落多少张 + PER_AP: 15 // 每多少体力掉落1张藏宝图 +}; + +// 事件，是否开启保存随机记录方式 +export const EVENT_RANDOM_TYPE_ONE_OPEN = false; +// 奇遇事件每次刷新几个 +export const EVENT_REFRESH_NUM = 3; +// 奇遇事件开启等级 +export const EVENT_START_LV = 1; + +// 存于用户Role表，事件开启状态 +export const EVENT_STATUS = { + WAITING: 0, // 未开启 + STARTING: 1, // 初步触发，等到挑战完成 + OPEN: 2 // 开启 +}; + +// 奇遇事件状态 +export const EVENT_RECORD_STATUS = { + WAITING: 0, // 初始状态 + BATTLE_SUCCESS: 1, // 挑战成功，待领取成功奖励 + BATTLE_FAIL: 2, // 挑战失败，可领取失败奖励 + SUCCESS_RECEIVED: 3, // 领取成功奖励 + FAIL_RECEIVED: 4 // 领取了失败奖励 +}; + +// 奇遇事件类型 +export const EVENT_TYPE = { + BOX: 1, // 宝箱 + QUIZ: 2, // 答题 + BATTLE: 3 // 战斗 +}; + +export const EVENT_ANSWER_STATUS = { + WAITING: 0, + CORRECT: 1, + WRONG: 2 +}; + +export const EXPEDITION_WAR_RECORD_STATUS = { + HIDE: -1, + WAITING: 0, + SUCCESS: 1, + FAIL: 2 +}; + +export const EVENT_START_BATTLE = 101; + +export const HANG_UP_CONSTS = { + ENABLE_LV: 2, // 第几层开始可以挂机 + UNIT_TIME: 10 * 60 * 1000, // 每几分钟能有一次收益 + MAX_TIME: 24 * 60 * 60 * 1000, // 最多可储存24小时收益 + MAX_SPD_UP_CNT: 2, // 每天可以收取多少次 + REFRESH_TIME: 5, // 每天的几点刷新 + SPD_UP_REC_TIME: 6 * 60 * 60 * 1000 // 加速直接获得6小时收益 +} + +export const TOWER_TASK_CONST = { + REFRESH_TIME: 5, // 每天几点刷新 + RAND_CNT: 8, // 每次刷新多少个任务 + MAX_TASK_REF_CNT: 8, // 完成的派遣任务数最多多少个 + MAX_HEROES_NUM: 3, // 每个任务最大派遣武将数 + COST_GOLD: 50 // 每次刷新花费的元宝 +} + +export const DAILY_CONST = { + REFRESH_TIME: 5 // 每天加点刷新 +} + +export const DUNGEON_CONST = { + REFRESH_TIME: 5, // 每天加点刷新 + MAX_CNT: 10, // 最大挑战次数 + MAX_BUY_CNT: 10 // 最大购买次数 +} + +export const EXPEDITION_CONST = { + REFRESH_TIME: 5, // 重置次数刷新时间 + INCREASE_POINT: 1, // 远征每成功一次累计的点数 + RESET_CNT: 1 // 可以免费重置的次数 +} + +export const EVENT_QUIZ_NUM = 3; + + +// 寻宝（共斗）相关 +export const COM_TEAM_STATUS = { + DEFAULT: 0, + FIGHTING: 1, + WIN: 2, + LOOSE: 3 +} + +// 寻宝配置常量 +export const COM_BTL_CONST = { + ENABLE_LV: 1, // 功能开启等级 + ASSIST_DROP_RATE: 0.5, // 助战掉落占队长掉落的比例 + BLUEPRT_DROP_PER_AP: 10, // 藏宝图伪随机所需体力 + BTL_TIME_LMT: 10 * 60 * 1000, // 每局时长限制 + ROBOT_HURT_RAND_RATE: 0.05, // 每个机器人消耗 boss 血量百分比浮动范围 + FRDCNT_DROP: 10, // 每场情谊点掉落 + ROBOT_CE_RATIO: 0.2, // 机器人战力上下浮动百分比 + ASSIST_TIME: 60 * 1000, // 助战匹配机器人的等待时长 + CAP_TIME: 60 * 1000, // 队长匹配机器人的等待时长 + CAP_START_TIME: 60 * 1000, // 人齐后队长开始时长倒计时 + ROBOT_RND_LMT: 10, // 机器人输出伤害的回合数 + ROBOT_HURT_RATIO: 0.2, // 单个机器人输出总伤害占 boss 血量比重 + ROBOT_HURT_CH_RATIO: 0.1, // 机器人伤害上下浮动的比例 + ASSIST_REWARD_RATIO: 0.5, // 队员奖励比例 +} + +// 机器人名字随机 +export const COM_BATTLE_ROBOT_ID_NAME = [ + {robotRoleId: 'cd9h0iy8', robotRoleName: '徐埋农'}, + {robotRoleId: 'rtdgr4oz', robotRoleName: '简普瞳'}, + {robotRoleId: 'rv96unin', robotRoleName: '邛瑛'}, + {robotRoleId: 'b33u625l', robotRoleName: '嵇晁伊'}, + {robotRoleId: 'l6wopj9p', robotRoleName: '颜校'}, + {robotRoleId: '6wdqcumj', robotRoleName: '吉辉娇'} +]; diff --git a/shared/consts/constModules/calcuConst.ts b/shared/consts/constModules/calcuConst.ts new file mode 100644 index 000000000..e239a140a --- /dev/null +++ b/shared/consts/constModules/calcuConst.ts @@ -0,0 +1,20 @@ +export const GONGSHI = { + "TOWER_HANG_UP_SPEED_COST": "50", + "TOWER_TASK_REF_COST": "200", + "DAILY_REFRESH_NUM_COST": "50*num" +}; + +/** + * 计算元宝和次数相关的系数 + * 公式： A * num + B + */ +export const GOLD_COST_RATIO = { + "TOWER_HANG_SPDUP": { "A": 0, "B": 50 }, // 天梯挂机加速花费 + "TOWER_TASK_REF": { "A": 0, "B": 50 }, // 天梯派遣刷新花费 + "DAILY_REF_NUM": { "A": 50, "B": 0 }, // 每日购买次数花费 + "DUNGRON_BUY_NUM": { "A": 0, "B": 50 } // 秘境购买次数花费 +} + +export const EXPRESSION = { + "CE": "1*hp+2*atk+2*matk+2*def+2*mdef+2*agi+2*luk+0*hit+0*cri+0*flee+0*antCri+0*damageIncrease+0*damageDecrease+0*defIngnore+0*bloodSuck" +} diff --git a/shared/consts/constModules/heroConst.ts b/shared/consts/constModules/heroConst.ts new file mode 100644 index 000000000..ee8bdbd83 --- /dev/null +++ b/shared/consts/constModules/heroConst.ts @@ -0,0 +1,21 @@ +//武将养成系统分类 +export const HERO_SYSTEM_TYPE = { + STAR: 1, + TRAIN: 5, + STAGEUP:6, + SKIN:7, + FAVOUR:8, + CONNECT:9 +}; + +// 武将上限 +export const HERO_GROW_MAX = { + STAR: 6, + COLORSTAR: 6, + QUALITY: 3 +} + +export const JOB_TYPE = { + PHYSIC: 1, + MAGIC: 2 +} \ No newline at end of file diff --git a/shared/consts/constModules/itemConst.ts b/shared/consts/constModules/itemConst.ts new file mode 100644 index 000000000..5b0080d23 --- /dev/null +++ b/shared/consts/constModules/itemConst.ts @@ -0,0 +1,91 @@ +export const IT_TYPE = { + BLUEPRT: 28 +} + +export const GOOD_QUALITY = [1, 2, 3, 4, 5]; + +// 大类型，区分存到哪张表里 +export const GOOD_TYPE = { + EQUIP: 1, + CONSUMES: 2, + SCRIPT: 3 +}; + +// 存到消耗品表内显示的类型 +export const CONSUME_TYPE = { + CONSUME: 1, // 消耗品 + SOUL: 2, // 将魂 + BLUEPRT: 3, // 藏宝图 + POINT: 4, // 远征币等 + EXP: 5, // 经验书 + FAVOUR: 6 // 好感度道具 +}; + +const itid_array = [ + { id: 1, name: '剑', goodType: GOOD_TYPE.EQUIP }, + { id: 2, name: '枪', goodType: GOOD_TYPE.EQUIP }, + { id: 3, name: '刀', goodType: GOOD_TYPE.EQUIP }, + { id: 4, name: '弓', goodType: GOOD_TYPE.EQUIP }, + { id: 5, name: '拳', goodType: GOOD_TYPE.EQUIP }, + { id: 6, name: '扇', goodType: GOOD_TYPE.EQUIP }, + { id: 7, name: '宝剑', goodType: GOOD_TYPE.EQUIP }, + { id: 8, name: '权杖', goodType: GOOD_TYPE.EQUIP }, + { id: 9, name: '头盔', goodType: GOOD_TYPE.EQUIP }, + { id: 10, name: '帽子', goodType: GOOD_TYPE.EQUIP }, + { id: 11, name: '头巾', goodType: GOOD_TYPE.EQUIP }, + { id: 12, name: '铠甲（衣）', goodType: GOOD_TYPE.EQUIP }, + { id: 13, name: '战袍（衣）', goodType: GOOD_TYPE.EQUIP }, + { id: 14, name: '法衣（衣）', goodType: GOOD_TYPE.EQUIP }, + { id: 15, name: '铠甲（裤）', goodType: GOOD_TYPE.EQUIP }, + { id: 16, name: '战袍（裤）', goodType: GOOD_TYPE.EQUIP }, + { id: 17, name: '法衣（裤）', goodType: GOOD_TYPE.EQUIP }, + { id: 18, name: '重靴', goodType: GOOD_TYPE.EQUIP }, + { id: 19, name: '战靴', goodType: GOOD_TYPE.EQUIP }, + { id: 20, name: '布鞋', goodType: GOOD_TYPE.EQUIP }, + { id: 21, name: '饰品', goodType: GOOD_TYPE.EQUIP }, + { id: 22, name: '消耗类物品（图纸类）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.CONSUME }, + { id: 35, name: '消耗类物品（经验书）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.EXP }, + { id: 36, name: '消耗类物品（好感道具）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.FAVOUR }, + { id: 23, name: '消耗类物品（材料类）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.CONSUME }, + { id: 24, name: '消耗类物品（宝箱类）', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.CONSUME }, + { id: 26, name: '武将碎片', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.SOUL }, + { id: 27, name: '货币', goodType: GOOD_TYPE.CONSUMES, isCurrency: true }, + { id: 28, name: '藏宝图', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.BLUEPRT }, + { id: 29, name: '礼器', goodType: GOOD_TYPE.EQUIP }, + { id: 30, name: '宝甲', goodType: GOOD_TYPE.EQUIP }, + { id: 31, name: '名驹', goodType: GOOD_TYPE.EQUIP }, + { id: 32, name: '典籍', goodType: GOOD_TYPE.EQUIP }, + { id: 33, name: '神兵', goodType: GOOD_TYPE.EQUIP }, + { id: 34, name: '代币', goodType: GOOD_TYPE.CONSUMES, type: CONSUME_TYPE.POINT } +]; + +export const ITID = new Map(); +for(let obj of itid_array) { + ITID.set(obj.id, obj); +} + +export const CURRENCY_TYPE = { + GOLD: "gold", + COIN: "coin", + ACTION_POINT: "ap", + TREASURE_POINT: "treasurePoint", + EXPEDITION_POINT: "expeditionPoint", + DUNGEON_POINT: "dungeonPoint", + FRIEND_POINT: "friendPoint" +} + +const currencyArr = [ + { "gid": 31001, "name": "铜钱", "type": CURRENCY_TYPE.COIN }, + { "gid": 31002, "name": "元宝", "type": CURRENCY_TYPE.GOLD }, + { "gid": 31003, "name": "体力", "type": CURRENCY_TYPE.ACTION_POINT }, + { "gid": 40001, "name": "远征币", "type": CURRENCY_TYPE.EXPEDITION_POINT }, + { "gid": 40002, "name": "寻宝币", "type": CURRENCY_TYPE.TREASURE_POINT }, + { "gid": 40003, "name": "情谊点", "type": CURRENCY_TYPE.FRIEND_POINT }, + { "gid": 40004, "name": "秘境币", "type": CURRENCY_TYPE.DUNGEON_POINT }, +]; +export const CURRENCY = new Map(); +export const CURRENCY_BY_TYPE = new Map(); +for(let obj of currencyArr) { + CURRENCY.set(obj.gid, obj); + CURRENCY_BY_TYPE.set(obj.type, obj.gid); +} diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts new file mode 100644 index 000000000..bba09d0ce --- /dev/null +++ b/shared/consts/constModules/sysConst.ts @@ -0,0 +1,46 @@ +export const TURBO_CORE_URL = 'https://coresrv.tgamebox.cn'; +export const APP_ID = 'AXaXmIHPs9eONvzrBesD8aSKQNXYdALF'; +export const TURBO_PARM_SECRET = 'ipqw05du6ob4x130w89t31yrqd6xs005zzltcmg2zpqnvrjp1s'; + +export const ENCRYPT_IV = 'f7182j5f04e377ux'; +export const ENCRYPT_KEY = 'fiqaxijabbantusmprc234fj'; + +export const AUTH_SMS_CNT_PER_DAY = 8; + +export const COUNTER = { + UID: {name:'uid',def:1}, + GMUID: {name:'gmuid',def:1}, + API: {name:'api',def:1}, + GM_GROUP: {name:'gmgroup',def:1}, + HID: {name:'hid',def:10000}, + EID: {name:'eid',def:1}, + ROLE: {name:'role',def:1} +}; + +export const DEFAULT_HEROES = [12, 14, 11, 9, 15]; + +export const FIX_SMS_CODE_TELS = ['18855953630', '13911134885', '15167549151', '15618654010', '15167549151', '18342915387']; + +export const REDIS_KEY = { + USER_INFO: "userInfo", // 玩家缓存信息 + TOWER_RANK: "towerRank", // 天梯排行榜 + COM_TEAM_SEARCH_PRE: 'comTeamSerQ', // 匹配中的玩家，按品质分 +} + +export const FUNC_OPT_TYPE = { + LEVEL_UP: 1, + BATTLE_END: 2 +} + +export const FUNCS_ID = { + EVENT: 1 +} + +export const FRIEND_DROP_TYPE = { + COM_BATTLE: 1 +} + +// 每日情谊点上限 +export const FRIEND_DROP_MAX = { + COM_BTL: 150 +} \ No newline at end of file diff --git a/shared/consts/consts.ts b/shared/consts/consts.ts index 174dc6ca7..bfeb82b53 100644 --- a/shared/consts/consts.ts +++ b/shared/consts/consts.ts @@ -51,7 +51,7 @@ export const GOOD_TYPE = { }; // 存到消耗品表内显示的类型 -export const CONSUME_TYPE = { +export const CONSUME_TYPE = { CONSUME: 1, // 消耗品 SOUL: 2, // 将魂 BLUEPRT: 3, // 藏宝图 @@ -133,7 +133,7 @@ export const WAR_TYPE = { NORMAL: 1, // 主线本 VESTIGE: 2, // 遗迹本 EVENT: 3, // 事件本 - DAILY: 4, // 每日 + DAILY: 4, // 每日 EXPEDITION: 5, // 远征 MYSTERY: 6, // 秘境 WARLOARDS: 7, // 群雄 @@ -142,7 +142,7 @@ export const WAR_TYPE = { GUILD_TIMER: 10, // 军团定时副本 GUILD_WEEKLY: 11, // 军团周副本 MAIN_ELITE: 12, // 主线精英 - MYSTERY_ELITE: 13 // 秘境精英 + MYSTERY_ELITE: 13 // 秘境精英 }; // 藏宝图掉落参数 @@ -201,7 +201,7 @@ export const HANG_UP_CONSTS = { ENABLE_LV: 2, // 第几层开始可以挂机 UNIT_TIME: 10 * 60 * 1000, // 每几分钟能有一次收益 MAX_TIME: 24 * 60 * 60 * 1000, // 最多可储存24小时收益 - MAX_SPD_UP_CNT: 2, // 每天可以收取多少次 + MAX_SPD_UP_CNT: 2, // 每天可以收取多少次 REFRESH_TIME: 5, // 每天的几点刷新 SPD_UP_REC_TIME: 6 * 60 * 60 * 1000 // 加速直接获得6小时收益 } diff --git a/shared/consts/index.ts b/shared/consts/index.ts new file mode 100644 index 000000000..148dc5635 --- /dev/null +++ b/shared/consts/index.ts @@ -0,0 +1,7 @@ +export * from './constModules/abilityConst'; +export * from './constModules/battleConst'; +export * from './constModules/calcuConst'; +export * from './constModules/heroConst'; +export * from './constModules/itemConst'; +export * from './constModules/sysConst'; +export * from './statusCode'; \ No newline at end of file diff --git a/shared/db/Api.ts b/shared/db/Api.ts index b357e524f..4c6dfa96b 100644 --- a/shared/db/Api.ts +++ b/shared/db/Api.ts @@ -1,6 +1,6 @@ import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; -import { COUNTER } from './../consts/consts'; +import { COUNTER } from './../consts'; import { CounterModel } from './Counter'; /** diff --git a/shared/db/DailyRecord.ts b/shared/db/DailyRecord.ts index a3201b5c8..e5a953313 100644 --- a/shared/db/DailyRecord.ts +++ b/shared/db/DailyRecord.ts @@ -1,6 +1,6 @@ import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; -import { DAILY_CONST } from './../consts/consts'; +import { DAILY_CONST } from './../consts'; import { setLocalHours } from './../pubUtils/util'; diff --git a/shared/db/ExpeditionWarRecord.ts b/shared/db/ExpeditionWarRecord.ts index e89a9bbec..95e869ad8 100644 --- a/shared/db/ExpeditionWarRecord.ts +++ b/shared/db/ExpeditionWarRecord.ts @@ -1,6 +1,6 @@ import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; -import { EXPEDITION_WAR_RECORD_STATUS } from '../consts/consts'; +import { EXPEDITION_WAR_RECORD_STATUS } from '../consts'; class Enemies { @prop({ required: true }) diff --git a/shared/db/GMGroup.ts b/shared/db/GMGroup.ts index a44143645..b68f029ed 100644 --- a/shared/db/GMGroup.ts +++ b/shared/db/GMGroup.ts @@ -1,4 +1,4 @@ -import { COUNTER } from './../consts/consts'; +import { COUNTER } from './../consts'; import { CounterModel } from './Counter'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; diff --git a/shared/db/GMUser.ts b/shared/db/GMUser.ts index 066c4401d..93e66a15f 100644 --- a/shared/db/GMUser.ts +++ b/shared/db/GMUser.ts @@ -1,4 +1,4 @@ -import { COUNTER } from './../consts/consts'; +import { COUNTER } from './../consts'; import { CounterModel } from './Counter'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; diff --git a/shared/db/Game.ts b/shared/db/Game.ts index 6e39d0412..d0311ab12 100644 --- a/shared/db/Game.ts +++ b/shared/db/Game.ts @@ -1,4 +1,4 @@ -import { APP_ID } from './../consts/consts'; +import { APP_ID } from './../consts'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; diff --git a/shared/db/HangUpRecord.ts b/shared/db/HangUpRecord.ts index f168c2f98..9c7d2ea98 100644 --- a/shared/db/HangUpRecord.ts +++ b/shared/db/HangUpRecord.ts @@ -1,4 +1,4 @@ -import { HANG_UP_CONSTS } from './../consts/consts'; +import { HANG_UP_CONSTS } from './../consts'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; diff --git a/shared/db/HangUpSpdUpRec.ts b/shared/db/HangUpSpdUpRec.ts index f250fd0e5..997a284a4 100644 --- a/shared/db/HangUpSpdUpRec.ts +++ b/shared/db/HangUpSpdUpRec.ts @@ -1,4 +1,4 @@ -// import { HANG_UP_CONSTS } from './../consts/consts'; +// import { HANG_UP_CONSTS } from './../consts'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; diff --git a/shared/db/Hero.ts b/shared/db/Hero.ts index 0834803aa..85f092f3c 100644 --- a/shared/db/Hero.ts +++ b/shared/db/Hero.ts @@ -2,7 +2,7 @@ import BaseModel, { CeAttr } from './BaseModel'; import { index, getModelForClass, prop, Ref, mongoose } from '@typegoose/typegoose'; import Equip from './Equip'; import { CounterModel } from './Counter'; -import { COUNTER } from '../consts/consts'; +import { COUNTER } from '../consts'; /** * 英雄表 diff --git a/shared/db/Role.ts b/shared/db/Role.ts index 3b82b3447..00d174898 100644 --- a/shared/db/Role.ts +++ b/shared/db/Role.ts @@ -1,4 +1,4 @@ -import { HANG_UP_CONSTS } from './../consts/consts'; +import { HANG_UP_CONSTS } from './../consts'; import BaseModel, { CeAttr } from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; import User from './User'; diff --git a/shared/db/User.ts b/shared/db/User.ts index 1820d8df6..53c0c06bf 100644 --- a/shared/db/User.ts +++ b/shared/db/User.ts @@ -1,4 +1,4 @@ -import { COUNTER } from './../consts/consts'; +import { COUNTER } from './../consts'; import { CounterModel } from './Counter'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; diff --git a/shared/pubUtils/actor.ts b/shared/pubUtils/actor.ts index aeab89c25..e5e8f89c1 100644 --- a/shared/pubUtils/actor.ts +++ b/shared/pubUtils/actor.ts @@ -1,6 +1,6 @@ import { getHeroInfoById, getStarRatio, /*getHeroSkillById,*/ getSeidById, getOlySeidByType, getGoodById } from "./gamedata"; -import { getAtrrNameById, ABI_TYPE, SEID_TYPE } from "../consts/abilityConst"; -import { EXPRESSION } from '../consts/consts'; +import { getAtrrNameById, ABI_TYPE, SEID_TYPE } from "../consts"; +import { EXPRESSION } from '../consts'; export default class Actor { private hid: number = 0; diff --git a/shared/pubUtils/dictionary/DicGoods.ts b/shared/pubUtils/dictionary/DicGoods.ts index 5e2dd30a5..c141acec9 100644 --- a/shared/pubUtils/dictionary/DicGoods.ts +++ b/shared/pubUtils/dictionary/DicGoods.ts @@ -2,7 +2,7 @@ import {decodeArrayListStr, readJsonFile, parseReward} from '../util' import { FILENAME, IT_TYPE } from '../../consts/consts' import { RewardInter } from '../interface'; -import { ABI_TYPE } from '../../consts/abilityConst'; +import { ABI_TYPE } from '../../consts'; export interface DicGoods { // 物品id diff --git a/shared/pubUtils/dictionary/DicHero.ts b/shared/pubUtils/dictionary/DicHero.ts index 62f65f383..1bc9579be 100644 --- a/shared/pubUtils/dictionary/DicHero.ts +++ b/shared/pubUtils/dictionary/DicHero.ts @@ -1,6 +1,6 @@ // 武将表 -import { ABI_TYPE } from '../../consts/abilityConst' +import { ABI_TYPE } from '../../consts' import { readJsonFile } from '../util' import { FILENAME } from '../../consts/consts' diff --git a/shared/pubUtils/dictionary/DicHeroStar.ts b/shared/pubUtils/dictionary/DicHeroStar.ts index cb4d1dbaf..a08c56802 100644 --- a/shared/pubUtils/dictionary/DicHeroStar.ts +++ b/shared/pubUtils/dictionary/DicHeroStar.ts @@ -1,7 +1,7 @@ // 武将升星表 import { readJsonFile } from '../util' import { FILENAME } from '../../consts/consts' -import { ABI_STAGE } from '../../consts/abilityConst'; +import { ABI_STAGE } from '../../consts'; export interface DicHeroStar { diff --git a/shared/pubUtils/dictionary/DicHeroWake.ts b/shared/pubUtils/dictionary/DicHeroWake.ts index 22eab3c25..26628f2f3 100644 --- a/shared/pubUtils/dictionary/DicHeroWake.ts +++ b/shared/pubUtils/dictionary/DicHeroWake.ts @@ -1,7 +1,7 @@ // 武将觉醒表 import { readJsonFile, parseReward } from '../util' import { FILENAME } from '../../consts/consts' -import { ABI_STAGE } from '../../consts/abilityConst'; +import { ABI_STAGE } from '../../consts'; import { RewardInter } from '../interface'; export interface DicHeroWake { diff --git a/shared/pubUtils/dictionary/DicWarJson.ts b/shared/pubUtils/dictionary/DicWarJson.ts index d7fbc4bb2..f24a69d4c 100644 --- a/shared/pubUtils/dictionary/DicWarJson.ts +++ b/shared/pubUtils/dictionary/DicWarJson.ts @@ -1,6 +1,6 @@ // 关卡表 import {decodeArrayListStr, readWarJsonFileList} from '../util' -import { ABI_TYPE } from '../../consts/abilityConst'; +import { ABI_TYPE } from '../../consts'; import { Attributes } from '../interface'; diff --git a/shared/pubUtils/gamedata.ts b/shared/pubUtils/gamedata.ts index 73ae42658..995ab82f8 100644 --- a/shared/pubUtils/gamedata.ts +++ b/shared/pubUtils/gamedata.ts @@ -1,8 +1,8 @@ import fs = require('fs'); import path = require('path'); -import { ABI_TYPE, ABI_STAGE } from '../consts/abilityConst'; +import { ABI_TYPE, ABI_STAGE } from '../consts'; import { decodeIdCntArrayStr, getRandEelm } from './util'; -import { IT_TYPE } from '../consts/consts'; +import { IT_TYPE } from '../consts'; let gamedata = {}; const wars = ['dic_zyz_gk_main', 'dic_zyz_gk_mainElite', 'dic_zyz_gk_daily', 'dic_zyz_gk_event', 'dic_zyz_gk_tower', 'dic_zyz_gk_expedition', 'dic_zyz_gk_dungeon','dic_zyz_gk_dungeonElite', 'dic_zyz_gk_Treasure','dic_zyz_gk_branch']; // 关卡相关的表 diff --git a/web-server/app/controller/game.ts b/web-server/app/controller/game.ts index 4601742c5..489e187ef 100644 --- a/web-server/app/controller/game.ts +++ b/web-server/app/controller/game.ts @@ -1,4 +1,4 @@ -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; import { GameModel } from '@db/Game'; import { Controller } from 'egg'; diff --git a/web-server/app/middleware/parmsDecode.ts b/web-server/app/middleware/parmsDecode.ts index 0ce2328bd..3b8eaa215 100644 --- a/web-server/app/middleware/parmsDecode.ts +++ b/web-server/app/middleware/parmsDecode.ts @@ -1,4 +1,4 @@ -import { ENCRYPT_KEY, ENCRYPT_IV } from '@consts/consts'; +import { ENCRYPT_KEY, ENCRYPT_IV } from '@consts'; import { Context } from 'egg'; const crypto = require('crypto'); const isJSON = require('koa-is-json'); diff --git a/web-server/app/middleware/tokenParser.ts b/web-server/app/middleware/tokenParser.ts index 9c6ef13eb..054ffdb0c 100644 --- a/web-server/app/middleware/tokenParser.ts +++ b/web-server/app/middleware/tokenParser.ts @@ -1,4 +1,4 @@ -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; import { UserModel } from '@db/User'; module.exports = () => { diff --git a/web-server/app/service/Auth.ts b/web-server/app/service/Auth.ts index d08a139e7..c732c9abf 100644 --- a/web-server/app/service/Auth.ts +++ b/web-server/app/service/Auth.ts @@ -1,9 +1,9 @@ -import { FIX_SMS_CODE_TELS, COUNTER } from '@consts/consts'; -import { DEFAULT_HEROES } from '@consts/consts'; +import { FIX_SMS_CODE_TELS, COUNTER } from '@consts'; +import { DEFAULT_HEROES } from '@consts'; import { HeroModel } from '@db/Hero'; import { RoleModel } from '@db/Role'; import { UserModel } from '@db/User'; -import { STATUS } from '@consts/statusCode'; +import { STATUS } from '@consts'; import { smsModel } from '@db/Sms'; import { Service } from 'egg'; import Counter from '@db/Counter'; diff --git a/web-server/app/service/TurboCore.ts b/web-server/app/service/TurboCore.ts index ec71c949a..03d0926c0 100644 --- a/web-server/app/service/TurboCore.ts +++ b/web-server/app/service/TurboCore.ts @@ -1,4 +1,4 @@ -import { TURBO_CORE_URL, APP_ID, TURBO_PARM_SECRET } from '@consts/consts'; +import { TURBO_CORE_URL, APP_ID, TURBO_PARM_SECRET } from '@consts'; import { Service } from 'egg'; const crypto = require('crypto'); /** diff --git a/web-server/tsconfig.json b/web-server/tsconfig.json index bfc970cf0..32654dbbf 100644 --- a/web-server/tsconfig.json +++ b/web-server/tsconfig.json @@ -24,7 +24,7 @@ "baseUrl": ".", "paths": { "@db/*": ["app/db/*"], - "@consts/*": ["app/consts/*"] + "@consts": ["app/consts"] }, }, "exclude": [