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

活动：创建英雄的统计添加推送逻辑

Browse Source
This commit is contained in:
qiaoxin
2021-06-09 17:27:04 +08:00
parent 9b945b6d8c
commit 4ed8f286f1
4 changed files with 463 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/servers/activity/handler/growthFundHandler.ts
+1 -2
View File
@@ -1,9 +1,8 @@
import { Application, BackendSession } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS } from '../../../consts';
import { getPlayerGrowthFundData, growthFundActivity } from '../../../services/growthFundService';
import { getPlayerGrowthFundData } from '../../../services/growthFundService';
import { GrowthFundItem } from '../../../domain/activityField/growthFundField';
import { addItems, createHeroes } from '../../../services/rewardService';
import { ActivityGrowthFundModel } from '../../../db/ActivityGrowthFund';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
game-server/app/services/rewardService.ts
+3 -2
View File
@@ -14,7 +14,7 @@ import { uniq, indexOf, findIndex } from 'underscore';
import { HeroModel, HeroType } from '../db/Hero';
import { Figure } from '../domain/dbGeneral';
import { Rank } from './rankService';
import { checkActivityTask, pushTaskUpdate } from './taskService';
import { checkActivityTask, pushActivityUpdate, pushTaskUpdate } from './taskService';
import { CreateHeroParam } from '../domain/roleField/hero';
export async function handleCost(roleId: string, sid: string, goods: Array<ItemInter>) {
@@ -333,7 +333,7 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
let resultHeroes: HeroType[] = [], resultItems: ItemInter[] = [];
if (newHeroInfo.length > 0) {
let { heroes, role, figureInfo, calHeroResults, calAllHeroResults, taskPushMessage } = await pubCreateHeroes(roleId, roleName, serverId, newHeroInfo, funcs);
let { heroes, role, figureInfo, calHeroResults, calAllHeroResults, taskPushMessage, activityTaskPushMessage } = await pubCreateHeroes(roleId, roleName, serverId, newHeroInfo, funcs);
let r = new Rank(REDIS_KEY.HERO_NUM_RANK, { serverId });
await r.setRankWithRoleInfo(roleId, role.heroNum, role.heroNumUpdatedAt, role);
@@ -348,6 +348,7 @@ export async function createHeroes(roleId: string, roleName: string, sid: string
}
pushTaskUpdate(roleId, sid, null, taskPushMessage);
pushActivityUpdate(roleId, sid, null, activityTaskPushMessage);
resultHeroes = heroes;
}
gm-server/app/service/users.ts
+116 -116
View File
@@ -43,20 +43,20 @@ export default class GMUsers extends Service {
* 根据类型等搜索玩家
*/
public async getuserlist(field: string = 'all', value: string = '') {
const {ctx} = this;
const { ctx } = this;
let arr = new Array(), flag = 0;
if(value == '') field = 'all';
if (value == '') field = 'all';
let valueArr = value.split(',');
for(let i of valueArr) {
if(field == 'uid') {
for (let i of valueArr) {
if (field == 'uid') {
let d = parseInt(i);
if(isNaN(d)) {
if (isNaN(d)) {
flag = 1; break;
} else {
arr.push(d);
}
} else if(field == 'username'||field == 'tel') {
} else if (field == 'username' || field == 'tel') {
arr.push(i);
} else if (field == 'all') {
break;
@@ -65,29 +65,29 @@ export default class GMUsers extends Service {
}
}
if(flag) {
if (flag) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
let users = await UserModel.findUserByField(field, valueArr);
if(users) {
if (users) {
let list = new Array();
for(let user of users) {
for (let user of users) {
let role = await RoleModel.findAllByUid(user.uid);
let sms = await smsModel.findByTel(user.tel);
list.push({...user, role, isFixed: sms?sms.isFixed: false, code: sms?sms.code:""});
list.push({ ...user, role, isFixed: sms ? sms.isFixed : false, code: sms ? sms.code : "" });
}
return ctx.service.utils.resResult(STATUS.SUCCESS, {list})
return ctx.service.utils.resResult(STATUS.SUCCESS, { list })
} else {
console.error('userlist not found');
return ctx.service.utils.resResult(STATUS.INTERNAL_ERR);
}
}
public async createRole(uid:number, serverId: number, roleName: string) {
public async createRole(uid: number, serverId: number, roleName: string) {
console.log('enter Auth createRole');
const ctx = this.ctx;
@@ -103,7 +103,7 @@ export default class GMUsers extends Service {
}
}
public async addAuth(uid:number, auth: number) {
public async addAuth(uid: number, auth: number) {
console.log('enter Auth addAuth');
const ctx = this.ctx;
@@ -130,7 +130,7 @@ export default class GMUsers extends Service {
console.log('enter Auth fix sms');
const ctx = this.ctx;
const checkTel = this.checkTelNo(tel);
if(checkTel.status == 1) {
if (checkTel.status == 1) {
return ctx.service.utils.resResult(STATUS.INTERNAL_ERR, checkTel.data);
}
const sms = await smsModel.fixSms(tel);
@@ -178,21 +178,21 @@ export default class GMUsers extends Service {
* 根据类型等搜索玩家
*/
public async getrolelist(field: string = 'all', value: string = '') {
const {ctx} = this;
const { ctx } = this;
let arr = new Array(), flag = 0;
let valueArr = value.split(',');
if(value == '') field = 'all';
for(let i of valueArr) {
if(field == 'uid') {
if (value == '') field = 'all';
for (let i of valueArr) {
if (field == 'uid') {
let d = parseInt(i);
if(isNaN(d)) {
if (isNaN(d)) {
flag = 1; break;
} else {
arr.push(d);
}
field = 'userInfo.uid';
} else if(field == 'roleName') {
} else if (field == 'roleName') {
arr.push(i);
} else if (field == 'tel') {
arr.push(i);
@@ -204,26 +204,26 @@ export default class GMUsers extends Service {
}
}
if(flag) {
if (flag) {
return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
let roles = await RoleModel.findRoleByField(field, valueArr);
if(roles) {
if (roles) {
let result = new Array();
for(let role of roles) {
let heroCount = await HeroModel.count({roleId: role.roleId}).lean();
let equipCount = await EquipModel.count({roleId: role.roleId}).lean();
let itemCount = await ItemModel.count({roleId: role.roleId}).lean();
for (let role of roles) {
let heroCount = await HeroModel.count({ roleId: role.roleId }).lean();
let equipCount = await EquipModel.count({ roleId: role.roleId }).lean();
let itemCount = await ItemModel.count({ roleId: role.roleId }).lean();
let defense = await PvpDefenseModel.findByRoleId(role.roleId);
let {roleId, roleName, serverId, lv, vLv, gold, coin} = role;
let {uid, tel} = role.userInfo;
let { roleId, roleName, serverId, lv, vLv, gold, coin } = role;
let { uid, tel } = role.userInfo;
result.push({
key: roleId, roleId, roleName, serverId, lv, vLv, uid, tel, heroCount, equipCount, itemCount, gold, coin,
hasDefense: defense?'是':'否', defCe: defense?defense.defCe:0
hasDefense: defense ? '是' : '否', defCe: defense ? defense.defCe : 0
});
}
return ctx.service.utils.resResult(STATUS.SUCCESS, { list: result });
@@ -234,27 +234,27 @@ export default class GMUsers extends Service {
}
public async createHero(uids: Array<string>, _hid: string, _hlv: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm createHero', uids, _hid, _hlv);
let hlv = parseInt(_hlv);
if( isNaN(hlv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
if (isNaN(hlv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
let hids = (_hid as string).split('&').map(cur => parseInt(cur));
for(let hid of hids) {
if(isNaN(hid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let hid of hids) {
if (isNaN(hid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
let heroInfos = new Array();
for(let roleId of uids) {
for (let roleId of uids) {
let role = await RoleModel.findByRoleId(roleId);
if(role) {
for(let hid of hids) {
if (role) {
for (let hid of hids) {
let hero = await HeroModel.findByHidAndRole(hid, roleId);
if(hero) continue;
if (hero) continue;
let dicHero = gameData.hero.get(hid);
if(!dicHero) continue;
if (!dicHero) continue;
const heroInfo = {
roleId, roleName: role.roleName, hid, serverId: role.serverId,
lv: hlv, exp: getHeroExpByLv(hlv - 1)||0
lv: hlv, exp: getHeroExpByLv(hlv - 1) || 0
}
heroInfos.push(heroInfo);
}
@@ -264,39 +264,39 @@ export default class GMUsers extends Service {
}
try {
for(let heroInfo of heroInfos) {
for (let heroInfo of heroInfos) {
await pubCreateHero(heroInfo.roleId, heroInfo.roleName, heroInfo.serverId, heroInfo);
}
return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
} catch(e) {
} catch (e) {
console.error(e.stack)
return ctx.service.utils.resResult(STATUS.GM_CREATE_ERROR, null, e.stack);
}
}
public async createEquip(uids: Array<string>, _eid: string, _ecount: string, _ehid: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm createEquip', uids, _eid, _ecount, _ehid);
let eids = (_eid as string).split('&').map(cur => parseInt(cur));
let ecount = parseInt(_ecount);
let ehid = parseInt(_ehid);
if( isNaN(ecount) || isNaN(ehid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for(let eid of eids) {
if(isNaN(eid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
if (isNaN(ecount) || isNaN(ehid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let eid of eids) {
if (isNaN(eid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
let flag = 0, msg = '创建失败';
for(let roleId of uids) {
for (let roleId of uids) {
let role = await RoleModel.findByRoleId(roleId);
if(role) {
for(let eid of eids) {
for(let i = 0; i <ecount; i++) {
if (role) {
for (let eid of eids) {
for (let i = 0; i < ecount; i++) {
let dicEquip = gameData.goods.get(eid);
if(!dicEquip) {
if (!dicEquip) {
flag = 1, msg = "未找到装备" + eid;
break;
}
await ctx.service.utils.addEquips(roleId, role.roleName, {id: eid, ...dicEquip, hid: ehid});
await ctx.service.utils.addEquips(roleId, role.roleName, { id: eid, ...dicEquip, hid: ehid });
}
}
} else {
@@ -312,29 +312,29 @@ export default class GMUsers extends Service {
}
public async createItem(uids: Array<string>, _itemid: string, _itemcount: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm createItem', uids, _itemid, _itemcount);
let itemids = (_itemid as string).split('&').map(cur => parseInt(cur));
for(let itemid of itemids) {
if(isNaN(itemid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let itemid of itemids) {
if (isNaN(itemid)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
}
let itemcount = parseInt(_itemcount);
if( isNaN(itemcount)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
if (isNaN(itemcount)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
let flag = 0, msg = '创建失败';
for(let itemid of itemids) {
for (let itemid of itemids) {
let dicGoods = gameData.goods.get(itemid);
let itidObj = ITID.get(dicGoods.itid);
if(!dicGoods) {
if (!dicGoods) {
flag = 1, msg = "未找到道具" + itemid;
} else if(!itidObj){
} else if (!itidObj) {
flag = 1, msg = "未找到道具" + itemid;
} else {
for(let roleId of uids) {
for (let roleId of uids) {
let role = await RoleModel.findByRoleId(roleId);
if(role) {
await ctx.service.utils.addBags(roleId, role.roleName, {id: itemid, itemName: dicGoods.name, count: itemcount, type: itidObj.type, hid: 0});
if (role) {
await ctx.service.utils.addBags(roleId, role.roleName, { id: itemid, itemName: dicGoods.name, count: itemcount, type: itidObj.type, hid: 0 });
} else {
flag = 1, msg = '未找到角色' + roleId;
}
@@ -350,11 +350,11 @@ export default class GMUsers extends Service {
}
public async addGold(uids: Array<string>, _count: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm addGold', uids, _count);
let count = parseInt(_count);
if(isNaN(count)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for(let roleId of uids) {
if (isNaN(count)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let roleId of uids) {
await RoleModel.addGoldFree(roleId, count);
}
@@ -362,22 +362,22 @@ export default class GMUsers extends Service {
}
public async addCoin(uids: Array<string>, _count: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm addCoin', uids, _count);
let count = parseInt(_count);
if(isNaN(count)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for(let roleId of uids) {
if (isNaN(count)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let roleId of uids) {
await RoleModel.addCoin(roleId, count);
}
return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
}
public async addSkins(uids: Array<string>, _id: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm addSkin', uids, _id);
let id = parseInt(_id);
if(isNaN(id)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for(let roleId of uids) {
if (isNaN(id)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let roleId of uids) {
await ctx.service.utils.addSkins(roleId, id);
}
@@ -385,54 +385,54 @@ export default class GMUsers extends Service {
}
public async levelUp(uids: Array<string>, _lv: string) {
const {ctx} = this;
const { ctx } = this;
console.log('gm levelUp', uids, _lv);
let lv = parseInt(_lv);
if(isNaN(lv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for(let roleId of uids) {
if (isNaN(lv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for (let roleId of uids) {
let exp = getExpByLv(lv - 1);
await RoleModel.levelup(roleId, lv, exp?exp.sum:0);
await RoleModel.levelup(roleId, lv, exp ? exp.sum : 0);
}
return ctx.service.utils.resResult(STATUS.SUCCESS, { uids });
}
public async getPvpDefense(roleId: string) {
const {ctx} = this;
const { ctx } = this;
let result = await PvpDefenseModel.findByRoleId(roleId);
return ctx.service.utils.resResult(STATUS.SUCCESS, {
hasDefense: !!result, defense: result
})
}
// public async getHeroList(roleId: string) {
// const {ctx} = this;
// let herolist = await HeroModel.findByRole(roleId);
// let defense = await PvpDefenseModel.findByRoleId(roleId);
// public async getHeroList(roleId: string) {
// const {ctx} = this;
// let herolist = await HeroModel.findByRole(roleId);
// let defense = await PvpDefenseModel.findByRoleId(roleId);
// let result = Array<Hero>();
// for(let hero of herolist) {
// if(defense) {
// let {heroes = []} = defense;
// let curHero = heroes.find(cur => cur.actorId == hero.hid);
// if(!curHero) {
// result.push(hero);
// }
// } else{
// result.push(hero);
// }
// }
// let result = Array<Hero>();
// for(let hero of herolist) {
// if(defense) {
// let {heroes = []} = defense;
// let curHero = heroes.find(cur => cur.actorId == hero.hid);
// if(!curHero) {
// result.push(hero);
// }
// } else{
// result.push(hero);
// }
// }
// return ctx.service.utils.resResult(STATUS.SUCCESS, {
// heroes: result
// })
// }
// return ctx.service.utils.resResult(STATUS.SUCCESS, {
// heroes: result
// })
// }
public async saveHeroToDefense(roleId: string, _roleName: string, hid: number) {
const {ctx} = this;
const { ctx } = this;
let hero = await HeroModel.findByHidAndRole(hid, roleId);
let role = await RoleModel.findByRoleId(roleId);
if(!hero || !role) {
if (!hero || !role) {
return ctx.service.utils.resResult(STATUS.GM_HERO_NOT_FOUND);
}
let { lv, ce, attr: heroAttrs } = hero;
@@ -452,7 +452,7 @@ export default class GMUsers extends Service {
};
let defense = await PvpDefenseModel.findByRoleId(roleId);
if(!defense) {
if (!defense) {
// defense = await PvpDefenseModel.createPvpDefense({roleId, roleName, heroes: [], defCe:ce});
} else {
defense = await PvpDefenseModel.addHeroToDefense(roleId, heroInfo, ce);
@@ -464,15 +464,15 @@ export default class GMUsers extends Service {
public async removeHeroFromDefense(roleId: string, hid: number) {
const {ctx} = this;
const { ctx } = this;
let defense = await PvpDefenseModel.findByRoleId(roleId);
if(!defense) {
if (!defense) {
return ctx.service.utils.resResult(STATUS.GM_PVP_DEFENSE_NOT_FOUND);
}
let {heroes} = defense;
let { heroes } = defense;
let curHero = heroes.find(cur => cur.actorId == hid);
if(!curHero) {
if (!curHero) {
return ctx.service.utils.resResult(STATUS.GM_PVP_DEFENSE_HERO_NOT_FOUND);
}
defense = await PvpDefenseModel.removeHeroFromDefense(roleId, hid, curHero.ce);
@@ -485,12 +485,12 @@ export default class GMUsers extends Service {
/**
* 根据类型等搜索玩家
*/
public async getHeroList(field: string, value: (string|number)) {
const {ctx} = this;
public async getHeroList(field: string, value: (string | number)) {
const { ctx } = this;
let heroes = await HeroModel.findByField(field, value);
if(heroes) {
if (heroes) {
return ctx.service.utils.resResult(STATUS.SUCCESS, { list: heroes });
} else {
@@ -532,7 +532,7 @@ export default class GMUsers extends Service {
let seqId = parseInt(seqIdStr);
console.log(seqId);
let equip = await EquipModel.findbySeqId(seqId);
if(equip.hid > 0) {
if (equip.hid > 0) {
let hero = await HeroModel.findByHidAndRole(equip.hid, roleId);
let index = hero.ePlace.findIndex(cur => cur.id == equip.ePlaceId);
if (index < 0) continue;
@@ -557,14 +557,14 @@ export default class GMUsers extends Service {
let id = parseInt(idStr);
let cur = map.get(roleId);
if(!cur) {
if (!cur) {
cur = new Array<number>();
map.set(roleId, cur);
}
cur.push(id);
}
for(let [roleId, ids] of map) {
for (let [roleId, ids] of map) {
await ItemModel.deletebyRoleAndIds(roleId, ids);
}
@@ -582,14 +582,14 @@ export default class GMUsers extends Service {
let id = parseInt(idStr);
let cur = map.get(roleId);
if(!cur) {
if (!cur) {
cur = new Array<number>();
map.set(roleId, cur);
}
cur.push(id);
}
for(let [roleId, ids] of map) {
for (let [roleId, ids] of map) {
await ItemModel.updateCountByRoleAndIds(roleId, ids, count);
}
@@ -602,22 +602,22 @@ export default class GMUsers extends Service {
console.log('gm setHeroLv', roleIdAndHids, _hlv);
const ctx = this.ctx;
let hlv = parseInt(_hlv);
if( isNaN(hlv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
if (isNaN(hlv)) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
for(let roleIdAndHid of roleIdAndHids) {
for (let roleIdAndHid of roleIdAndHids) {
let [roleId, hidStr] = roleIdAndHid.split('|');
if(isNaN(parseInt(hidStr))) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
if (isNaN(parseInt(hidStr))) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
let hid = parseInt(hidStr);
let hero = await HeroModel.findByHidAndRole(hid, roleId);
console.log(hid, roleId, !!hero);
if(!hero) continue;
await calPlayerCeAndSave(HERO_SYSTEM_TYPE.LVUP, roleId, hero, {lv: hlv});
if (!hero) continue;
await calPlayerCeAndSave(HERO_SYSTEM_TYPE.LVUP, roleId, hero, { lv: hlv });
}
return ctx.service.utils.resResult(STATUS.SUCCESS);
} catch(e) {
} catch (e) {
console.error(e.stack)
}
}
shared/pubUtils/itemUtils.ts
+6 -5
View File
@@ -231,8 +231,8 @@ function unlockSingleFigure(dbFigures: Figure[], id: number, unlockDirect = fals
}
export async function createHero(roleId: string, roleName: string, serverId: number, heroInfo: CreateHeroParam, funcs?: number[]) {
let { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage } = await createHeroes(roleId, roleName, serverId, [heroInfo], funcs)
return { hero: heroes[0], role, figureInfo, calHeroResult: calHeroResults[0], calAllHeroResult: calAllHeroResults[0], taskPushMessage }
let { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage, activityTaskPushMessage } = await createHeroes(roleId, roleName, serverId, [heroInfo], funcs)
return { hero: heroes[0], role, figureInfo, calHeroResult: calHeroResults[0], calAllHeroResult: calAllHeroResults[0], taskPushMessage, activityTaskPushMessage }
}
export async function createHeroes(roleId: string, roleName: string, serverId: number, heroInfos: CreateHeroParam[], funcs?: number[]) {
@@ -268,9 +268,10 @@ export async function createHeroes(roleId: string, roleName: string, serverId: n
let m4 = await checkTaskWithHeroes(roleId, TASK_TYPE.HERO_LV, heroes, funcs);
let taskPushMessage = m1.concat(m2, m3, m4);
//成长任务
await accomplishTask(serverId, roleId, TASK_TYPE.HERO_NUM, heroNum)
await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY, heroNum, { heroes })
return { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage }
let mm1 = await accomplishTask(serverId, roleId, TASK_TYPE.HERO_NUM, heroNum)
let mm2 = await accomplishTask(serverId, roleId, TASK_TYPE.HERO_QUALITY, heroNum, { heroes })
let activityTaskPushMessage = mm1.concat(mm2);
return { role, figureInfo, heroes, calHeroResults, calAllHeroResults, taskPushMessage, activityTaskPushMessage }
}
export function transPiece(hid: number) {