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

handleCost方法去掉channelService传参

Browse Source
This commit is contained in:
luying
2020-12-09 14:30:15 +08:00
parent 168e0a8d28
commit dca5ae3d5f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/role/handler/heroHandler.ts
+1 -1
View File
@@ -20,7 +20,7 @@ export class HeroHandler {
let {id, count} = msg; let {id, count} = msg;
let result = await handleCost(this.channelService, roleId, sid, [{id, count}] ); let result = await handleCost(roleId, sid, [{id, count}] );
if(!result) { if(!result) {
return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH); return resResult(STATUS.BATTLE_CONSUMES_NOT_ENOUGH);
} }
game-server/app/services/rewardService.ts
+4 -5
View File
@@ -3,12 +3,11 @@ import { EquipModel } from './../db/Equip';
import { CounterModel } from './../db/Counter'; import { CounterModel } from './../db/Counter';
import { decodeStr, resResult } from '../pubUtils/util'; import { decodeStr, resResult } from '../pubUtils/util';
import { getGoodById } from '../pubUtils/gamedata'; import { getGoodById } from '../pubUtils/gamedata';
import Role, { RoleModel } from '../db/Role'; import { RoleModel } from '../db/Role';
import { setAp } from './actionPointService'; import { setAp } from './actionPointService';
import { ItemModel } from '../db/Item'; import { ItemModel } from '../db/Item';
import { ChannelService } from 'pinus';
import { isRegExp } from 'util';
import { STATUS } from '../consts/statusCode'; import { STATUS } from '../consts/statusCode';
import { pinus } from 'pinus';
export async function handleFixedReward(roleId: string, roleName: string, rewardStr: string, multi: number) { export async function handleFixedReward(roleId: string, roleName: string, rewardStr: string, multi: number) {
let reward = decodeStr('fixReward', rewardStr); let reward = decodeStr('fixReward', rewardStr);
@@ -124,7 +123,7 @@ async function rewardCurrency (roleId: string, dicGood: any, data: {id:number,cn
return goods; 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<number>() ; let role, costGold = 0, costCoin = 0, items = new Array<{id: number, count: number}>(), ids = new Array<number>() ;
for(let {id, count} of goods) { for(let {id, count} of goods) {
@@ -173,7 +172,7 @@ export async function handleCost(channelService: ChannelService, roleId: string,
} }
let uids = [{uid: roleId, sid}]; 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 return true
} }
shared/pubUtils/gamedata.ts
+2 -2
View File
@@ -129,8 +129,8 @@ function parseHeroSkill() {
data.forEach(elem => { data.forEach(elem => {
if (elem && elem.skillid) { if (elem && elem.skillid) {
const seidLvUpArr = new Array<number>(); const seidLvUpArr = new Array<number>();
let skillArr = (elem.seid as string).split('&'); let skillArr = (elem.starSeid as string).split('&');
let lvUpArr = (elem.selv_up as string).split('&'); let lvUpArr = (elem.starSkill as string).split('&');
for(let i = 0;i < skillArr.length;i++){ for(let i = 0;i < skillArr.length;i++){
if(skillArr[i]==="") continue; if(skillArr[i]==="") continue;