diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 77dd6205f..b75e32317 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -20,7 +20,7 @@ export class HeroHandler { let {id, count} = msg; - let result = await handleCost(this.channelService, roleId, sid, [{id, count}] ); + let result = await handleCost(roleId, sid, [{id, count}] ); if(!result) { return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH); } diff --git a/game-server/app/services/rewardService.ts b/game-server/app/services/rewardService.ts index db12d3dcf..baa2108b7 100644 --- a/game-server/app/services/rewardService.ts +++ b/game-server/app/services/rewardService.ts @@ -3,12 +3,11 @@ import { EquipModel } from './../db/Equip'; import { CounterModel } from './../db/Counter'; import { decodeStr, resResult } from '../pubUtils/util'; import { getGoodById } from '../pubUtils/gamedata'; -import Role, { RoleModel } from '../db/Role'; +import { RoleModel } from '../db/Role'; import { setAp } from './actionPointService'; import { ItemModel } from '../db/Item'; -import { ChannelService } from 'pinus'; -import { isRegExp } from 'util'; import { STATUS } from '../consts/statusCode'; +import { pinus } from 'pinus'; export async function handleFixedReward(roleId: string, roleName: string, rewardStr: string, multi: number) { let reward = decodeStr('fixReward', rewardStr); @@ -124,7 +123,7 @@ async function rewardCurrency (roleId: string, dicGood: any, data: {id:number,cn return goods; } -export async function handleCost(channelService: ChannelService, roleId: string, sid: string, goods: Array<{id: number, count: number}>) { +export async function handleCost(roleId: string, sid: string, goods: Array<{id: number, count: number}>) { // 检查道具数量 let role, costGold = 0, costCoin = 0, items = new Array<{id: number, count: number}>(), ids = new Array() ; for(let {id, count} of goods) { @@ -173,7 +172,7 @@ export async function handleCost(channelService: ChannelService, roleId: string, } let uids = [{uid: roleId, sid}]; - channelService.pushMessageByUids('onItemUpdate', resResult(STATUS.SUCCESS, {goods: resultGoods, gold, coin} ), uids); + pinus.app.get('channelService').pushMessageByUids('onItemUpdate', resResult(STATUS.SUCCESS, {goods: resultGoods, gold, coin} ), uids); return true } \ No newline at end of file diff --git a/shared/pubUtils/gamedata.ts b/shared/pubUtils/gamedata.ts index 01ab5ab20..a642d1ecb 100644 --- a/shared/pubUtils/gamedata.ts +++ b/shared/pubUtils/gamedata.ts @@ -129,8 +129,8 @@ function parseHeroSkill() { data.forEach(elem => { if (elem && elem.skillid) { const seidLvUpArr = new Array(); - let skillArr = (elem.seid as string).split('&'); - let lvUpArr = (elem.selv_up as string).split('&'); + let skillArr = (elem.starSeid as string).split('&'); + let lvUpArr = (elem.starSkill as string).split('&'); for(let i = 0;i < skillArr.length;i++){ if(skillArr[i]==="") continue;