From 1c455a9b490ad61c704fda8ccaa3a1149089bc65 Mon Sep 17 00:00:00 2001 From: liangtongchuan Date: Tue, 13 Oct 2020 00:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BC=8F=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=20=E5=A4=84=E7=90=86=E8=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=BA=20towerLv=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../battle/handler/towerBattleHandler.ts | 10 +++++-- game-server/app/services/battleService.ts | 6 ++-- game-server/app/services/rewardService.ts | 2 +- pushdocker.sh | 28 +++++++++---------- shared/db/Role.ts | 2 +- shared/db/TowerRecord.ts | 2 -- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/game-server/app/servers/battle/handler/towerBattleHandler.ts b/game-server/app/servers/battle/handler/towerBattleHandler.ts index 9bee846f6..d1b375b3c 100644 --- a/game-server/app/servers/battle/handler/towerBattleHandler.ts +++ b/game-server/app/servers/battle/handler/towerBattleHandler.ts @@ -1,7 +1,7 @@ -import { HANG_UP_CONSTS } from './../../../../../shared/consts/consts'; +// import { HANG_UP_CONSTS } from './../../../consts/consts'; import { HangUpRecordModel } from './../../../db/HangUpRecord'; import { RoleModel } from './../../../db/Role'; -import { TowerRecordModel } from './../../../../../shared/db/TowerRecord'; +import { TowerRecordModel } from './../../../db/TowerRecord'; import { Application, BackendSession } from 'pinus'; import { getTowerDataByLv } from '../../../util/gamedata'; import { decodeArrayStr, decodeIdCntArrayStr } from '../../../util/util'; @@ -23,8 +23,14 @@ export class TowerBattleHandler { async getStatus(msg: {}, session: BackendSession) { let roleId = session.get('roleId'); let { towerLv } = await RoleModel.findByRoleId(roleId); + if (!towerLv) { + towerLv = 1; + await RoleModel.towerLvUp(roleId); + } let towerRec = await TowerRecordModel.getRecordByLv(roleId, towerLv); + console.log(roleId, towerLv, towerRec); if (!towerRec) { + // await TowerRecordModel.createRecord({roleId, lv: towerLv, warStatus: []}); return { code: 201, data: '天梯记录异常' }; } const data = { diff --git a/game-server/app/services/battleService.ts b/game-server/app/services/battleService.ts index 8e3d935fc..f712a8507 100644 --- a/game-server/app/services/battleService.ts +++ b/game-server/app/services/battleService.ts @@ -1,8 +1,8 @@ -import { HangUpRecordModel } from './../../../shared/db/HangUpRecord'; +import { HangUpRecordModel } from './../db/HangUpRecord'; import { ChannelService } from 'pinus'; import { HANG_UP_CONSTS } from './../consts/consts'; -import { BattleRecordModel } from './../../../gm-server/app/db/BattleRecord'; -import { TowerRecordModel } from './../../../shared/db/TowerRecord'; +import { BattleRecordModel } from './../db/BattleRecord'; +import { TowerRecordModel } from './../db/TowerRecord'; import { RoleModel } from './../db/Role'; import { getTowerDataByLv } from "../util/gamedata" import { decodeArrayStr } from '../util/util'; diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts index 682cd50e5..af7e778e2 100644 --- a/game-server/app/services/rewardService.ts +++ b/game-server/app/services/rewardService.ts @@ -1,4 +1,4 @@ -import { BATTLE_REWARD_TYPE, GOOD_TYPE } from './../../../shared/consts/consts'; +import { BATTLE_REWARD_TYPE, GOOD_TYPE } from './../consts/consts'; import { EquipModel } from './../db/Equip'; import { CounterModel } from './../db/Counter'; import { decodeStr } from '../util/util'; diff --git a/pushdocker.sh b/pushdocker.sh index 368ec2754..9e84704ea 100755 --- a/pushdocker.sh +++ b/pushdocker.sh @@ -1,17 +1,17 @@ #!/bin/sh -#if [ $# != 1 ] ; then -# echo "需要1个参数" -# echo "pro: 同步代码到 pro 服务器上，作为正式服使用" -# echo "dev: 同步代码到 dev 服务器上，作为测试服供服务开发使用" -# exit 1; -#fi -# -#if [ ${1} == 'pro' ] ; then -# destUrl="root@zyz:/root/zyz/" -#elif [ ${1} == 'dev' ] ; then +if [ $# != 1 ] ; then + echo "需要1个参数" + echo "pro: 同步代码到 pro 服务器上，作为正式服使用" + echo "dev: 同步代码到 dev 服务器上，作为测试服供服务开发使用" + exit 1; +fi + +if [ ${1} == 'pro' ] ; then + destUrl="root@zyz:/root/zyz/" +elif [ ${1} == 'dev' ] ; then destUrl="root@zyztest:/root/zyz/" -#else -# echo "需要一个参数指明服务器" -# exit 1; -#fi +else + echo "需要一个参数指明服务器" + exit 1; +fi rsync -av --include '.babelrc' --include '.eslintrc.js' --exclude '.*' --exclude './game-server/node_modules' --exclude './game-server/node_modules' --exclude 'node_modules' --exclude 'bower_components' --exclude 'dist' --progress --inplace --no-owner --no-group --rsh='ssh -p22' . ${destUrl} diff --git a/shared/db/Role.ts b/shared/db/Role.ts index de0eed9f5..e057ba743 100644 --- a/shared/db/Role.ts +++ b/shared/db/Role.ts @@ -133,7 +133,7 @@ export default class Role extends BaseModel { public static async setEventStatus(roleId: string, eventStatus: number, lean = true) { - const role = await RoleModel.findOneAndUpdate({ roleId }, { eventStatus }).lean(lean); + await RoleModel.findOneAndUpdate({ roleId }, { eventStatus }).lean(lean); } public static async towerLvUp(roleId: string, lean = true) { diff --git a/shared/db/TowerRecord.ts b/shared/db/TowerRecord.ts index ad5fd60fb..1347eaf14 100644 --- a/shared/db/TowerRecord.ts +++ b/shared/db/TowerRecord.ts @@ -1,7 +1,5 @@ -import { RoleModel } from './Role'; import BaseModel from './BaseModel'; import { index, getModelForClass, prop } from '@typegoose/typegoose'; -import { stringify } from 'querystring'; class WarStatus { @prop({ required: true })