Merge branch 'feature/hero' of gitlab.trgame.cn:zyztech/zyz_server
Conflicts: shared/consts/consts.ts shared/db/Role.ts web-server/app/service/Auth.ts
This commit is contained in:
luying
@@ -204,8 +204,8 @@ async function checkCond(roleId: string, heroes, type: number, param: number, cn
|
||||
switch (type) {
|
||||
case 1:
|
||||
for(let seqId of heroes) {
|
||||
const {star, fire} = await HeroModel.findBySeqIdAndRole(seqId, roleId);
|
||||
if (star + fire >= param) {
|
||||
const {star, colorStar} = await HeroModel.findBySeqIdAndRole(seqId, roleId);
|
||||
if (star + colorStar >= param) {
|
||||
heroCnt++;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@ import { PvpDefenseModel } from '../db/PvpDefense';
|
||||
|
||||
import { getWarJsons, getGamedata, getExpeditionById } from '../pubUtils/gamedata';
|
||||
import { decodeStr, resResult, setLocalHours, shouldRefresh } from '../pubUtils/util';
|
||||
import { WAR_JSON_ATTRIBUTE_TYPE, EXPEDITION_CONST } from '../consts/consts';
|
||||
import { EXPEDITION_CONST } from '../consts/consts';
|
||||
import { getAtrrNameById} from '../consts/abilityConst';
|
||||
import Actor from '../pubUtils/actor';
|
||||
import { ExpeditionWarRecordModel } from '../db/ExpeditionWarRecord';
|
||||
|
||||
@@ -143,7 +144,7 @@ export function decodeWarJsonAttribute(attribute: string) {
|
||||
let obj = {hp: 0, atk: 0, matk: 0, def: 0, mdef: 0, speed: 0, agi: 0, luk: 0, hit: 0, cri: 0, flee: 0, antCri: 0, damageIncrease: 0, damageDecrease: 0, defIngnore: 0, bloodSuck: 0}
|
||||
|
||||
for(let {id, value} of arr) {
|
||||
let field = WAR_JSON_ATTRIBUTE_TYPE[id];
|
||||
let field = getAtrrNameById(id);
|
||||
if(field) {
|
||||
obj[field] = value;
|
||||
}
|
||||
|
||||
219
game-server/app/services/playerCeService.ts
Normal file
219
game-server/app/services/playerCeService.ts
Normal file
@@ -0,0 +1,219 @@
|
||||
/**
|
||||
* 体力系统
|
||||
*/
|
||||
|
||||
import { HERO_SYSTEM_TYPE } from '../consts/consts';
|
||||
import { pinus } from 'pinus';
|
||||
import { STATUS } from '../consts/statusCode';
|
||||
|
||||
import { resResult } from '../pubUtils/util';
|
||||
import Hero from '../db/Hero';
|
||||
import { RoleModel } from '../db/Role';
|
||||
import { CeAttrData, CeAttr } from '../db/BaseModel';
|
||||
import { 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';
|
||||
const HERO_CE_RATIO = 100;
|
||||
//战力计算TODO
|
||||
export function calPlayerCe(hero: any, type: number, args: Array<number>) {
|
||||
let incCe = 0;
|
||||
let incArr = {};
|
||||
let reIncAttr = {}; // {"hp": {"base": number, "fixUp": number, "ratioUp": number}}
|
||||
|
||||
let addSeidList = new Array<number>();
|
||||
let removeSeidList = new Array<number>();
|
||||
|
||||
if (type == HERO_SYSTEM_TYPE.STAR) {
|
||||
reIncAttr = calHeroStarIncAttr(hero, args, addSeidList, removeSeidList); // args: 升的星盘
|
||||
} else if (type == HERO_SYSTEM_TYPE.TRAIN) {
|
||||
reIncAttr = calHeroTrainIncAttr(hero);
|
||||
}
|
||||
|
||||
addSeidEffect(reIncAttr, addSeidList, removeSeidList); // 处理加值
|
||||
if(!hero.ceAttr) hero.ceAttr = new CeAttr();
|
||||
for (let attrName in reIncAttr) {
|
||||
let originalAttrData: CeAttrData = hero.ceAttr[attrName]||new CeAttrData();
|
||||
let oldCe = originalAttrData.fixUp * HERO_CE_RATIO + originalAttrData.base *(HERO_CE_RATIO + originalAttrData.ratioUp)
|
||||
if(!hero.ceAttr[attrName]) hero.ceAttr[attrName] = new CeAttrData();
|
||||
for (let attrKey in reIncAttr[attrName]) {
|
||||
hero.ceAttr[attrName][attrKey] = parseInt(reIncAttr[attrName][attrKey]);
|
||||
}
|
||||
incArr[attrName] = reIncAttr[attrName].fixUp * HERO_CE_RATIO + reIncAttr[attrName].base *(HERO_CE_RATIO + reIncAttr[attrName].ratioUp) - oldCe; //计算属性
|
||||
incCe += incArr[attrName] * getAttrCeRatio(attrName);
|
||||
}
|
||||
hero.ce += incCe;
|
||||
return incCe;
|
||||
}
|
||||
|
||||
//修改并下发战力
|
||||
export async function calPlayerCeAndSave(sid: string, roleId: string, heros: Array<any>, type?: number, args?: Array<number>) {
|
||||
let incPlayerCe = 0;
|
||||
let pushHeros = [];
|
||||
|
||||
for (let hero of heros) {
|
||||
let incHeroCe = calPlayerCe(hero, type, args);
|
||||
incPlayerCe += incHeroCe;
|
||||
await hero.save();
|
||||
pushHeros.push({
|
||||
hid: hero.hid,
|
||||
ce: hero.ce,
|
||||
incHeroCe : incHeroCe,
|
||||
});
|
||||
}
|
||||
let role = await RoleModel.findByRoleId(roleId);
|
||||
role.ce += incPlayerCe;
|
||||
await RoleModel.updateRoleInfo(roleId, role);
|
||||
//下发战力
|
||||
let uids = [{ uid: roleId, sid }];
|
||||
pinus.app.get('channelService').pushMessageByUids('onPlayerCeUpdate', resResult(STATUS.SUCCESS, { ce: role.ce, heros: pushHeros, topFiveCe: 0 }), uids);
|
||||
return heros;
|
||||
}
|
||||
|
||||
export function calHeroStarIncAttr (hero: Hero, args: Array<number>, addSeidList: Array<number>, removeSeidList: Array<number>) {
|
||||
let {star, starStage, quality, colorStar, colorStarStage, ceAttr} = hero;
|
||||
let res = {};
|
||||
const dicHero = getHeroInfoById(hero.hid);
|
||||
|
||||
const isWake = colorStar > 0; // 是否觉醒，只要激活了觉醒，彩星就会 > 1
|
||||
if(isWake) {
|
||||
if(colorStarStage == ABI_STAGE.START) colorStar = colorStar -1;
|
||||
} else {
|
||||
if(starStage == ABI_STAGE.START) star = star -1;
|
||||
}
|
||||
const dicStar = isWake? getHeroWake(quality, colorStar): getHeroStar(quality, star); // 星级表
|
||||
|
||||
for(let stage of args) {
|
||||
|
||||
let targetAttrId = getFieldByStage(stage, hero.job); // 转换为17维的属性id
|
||||
let heroAttr = dicHero.baseAbilityArr[targetAttrId]; // 武将表hp等
|
||||
let heroUpAttr = dicHero.baseAbilityUpArr[targetAttrId]; // 武将表hp_up等
|
||||
|
||||
let starUp = dicStar.ceAttr.get(stage);
|
||||
let newBase = heroAttr + hero.lv * (heroUpAttr + starUp);
|
||||
let field = getAtrrNameById(targetAttrId);
|
||||
let ceAttrData: CeAttrData = ceAttr[field]||new CeAttrData(); // 存表中的属性下的base，fixup，ratioup
|
||||
let {ratioUp = 0, fixUp = 0} = ceAttrData;
|
||||
res[field] = { base: newBase, ratioUp, fixUp}; // base变动，增量为△base * ratio + 0
|
||||
}
|
||||
|
||||
// 解锁技能
|
||||
if(dicHero.skill){
|
||||
let {starSeidArr, colorStarSeidArr} = getHeroSkillById(dicHero.skill);
|
||||
if(isWake) {
|
||||
for(let {star, value} of starSeidArr){
|
||||
if(hero.star == star){
|
||||
addSeidList.push(value);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for(let {star, value} of colorStarSeidArr){
|
||||
if(hero.colorStar == star){
|
||||
addSeidList.push(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return res;//属性增量可以是多个
|
||||
}
|
||||
|
||||
export function getAllAttrStage () {
|
||||
let attrs = new Array<number>(); // 有升级的属性 1-hp 2-atk 3-def 4-mdef 5-agi 6-luk
|
||||
for(let stage = ABI_STAGE.START + 1; stage <= ABI_STAGE.END; stage++) {
|
||||
attrs.push(stage)
|
||||
};
|
||||
return attrs;
|
||||
}
|
||||
|
||||
export function calHeroTrainIncAttr(hero: any) {
|
||||
let res = {};
|
||||
let attrName: string = getAttrNameByJobStage(hero.jobStage);
|
||||
res[attrName] = {fixUp: hero.CeAttr[attrName].fixUp, base: hero.CeAttr[attrName].base, ratioUp: hero.CeAttr[attrName].ratioUp};
|
||||
let currentJob = getJobInfoById(hero.job);
|
||||
if (currentJob.grade > 1) {
|
||||
let jobGradeAndClass = getJobByGradeAndClass(currentJob.job_class, currentJob.grade - 1);
|
||||
let lastJob = getJobInfoById(jobGradeAndClass.jobid);
|
||||
res[attrName].fixUp += (currentJob[attrName] - lastJob[attrName]) * HERO_CE_RATIO;
|
||||
} else {
|
||||
res[attrName].fixUp += currentJob[attrName] * HERO_CE_RATIO;
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
export function calHeroJobStageUpIncAttr(hero: any) {
|
||||
let res = {};
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
export function calWaerHeroSkinIncAttr(hero: any) {
|
||||
let res = {};
|
||||
let friendShipLevel = getFiendShipLevel(hero.favourLv);
|
||||
hero.conections.forEach(element => {
|
||||
let reFriendShip = getFriendShipById(element.shipId, element.level);
|
||||
if (reFriendShip)
|
||||
getAtrrNameById(reFriendShip);
|
||||
});
|
||||
if (hero.favourLv > 1) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
// 根据存在升星表等的stage字段的id对应17维id
|
||||
function getFieldByStage(stage: number, jobid: number) {
|
||||
let targetAttrId = ABI_TYPE_TO_STAGE.get(stage);
|
||||
if(typeof targetAttrId === 'number') {
|
||||
return targetAttrId
|
||||
} else {
|
||||
const dicJob = getJobInfoById(jobid);
|
||||
return targetAttrId(dicJob.type);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// 添加技能增加的被动属性
|
||||
function addSeidEffect(reIncAttr: CeAttr, addSeidList: Array<number>, removeSeidList: Array<number>) {
|
||||
|
||||
let otiginalSeidList = [
|
||||
{list: addSeidList, multi: 1},
|
||||
{list: removeSeidList, multi: -1}
|
||||
];
|
||||
for(let {list, multi} of otiginalSeidList) {
|
||||
let effectList = new Array<any>(); // any: dic_zyz_se表内容
|
||||
for(let seid of list) {
|
||||
let dicSeid = getSeidById(seid);
|
||||
if(dicSeid && dicSeid.id > 0){
|
||||
addSeid(effectList, dicSeid.id, dicSeid.gainValueArr)
|
||||
}
|
||||
}
|
||||
|
||||
for(let {type, gainValueArr: [ability, value]} of effectList) {
|
||||
if(!reIncAttr[HERO_ATTR[ability]]) {
|
||||
reIncAttr[HERO_ATTR[ability]] = new CeAttrData();
|
||||
}
|
||||
if(type == SEID_TYPE.TYPE101) { // 加值
|
||||
reIncAttr[HERO_ATTR[ability]].ratioUp += value * multi;
|
||||
} else if (type == SEID_TYPE.TYPE102) { // 加百分比
|
||||
reIncAttr[HERO_ATTR[ability]].fixUp += value * multi;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 获取dic_zyz_se内容
|
||||
function addSeid(effectList: Array<any>, seidId:number, seidValue = new Array<number>()){
|
||||
// console.log('addSeidEffect', seidId, seidValue)
|
||||
let curSeid = getSeidById(seidId);
|
||||
if(!curSeid) {console.log("seidId not found:"+seidId);return;}
|
||||
if(!seidValue) seidValue = curSeid.gainValueArr;
|
||||
|
||||
if(curSeid.type === 999){
|
||||
for(let i = 0;i < seidValue.length;i++){
|
||||
addSeid(effectList, seidValue[i]);
|
||||
}
|
||||
return;
|
||||
}
|
||||
effectList.push(curSeid);
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
import { GOOD_TYPE, ITID, CURRENCY, CURRENCY_TYPE, COUNTER } from './../consts/consts';
|
||||
import { EquipModel } from './../db/Equip';
|
||||
import { CounterModel } from './../db/Counter';
|
||||
import { decodeStr } from '../pubUtils/util';
|
||||
import { decodeStr, resResult } from '../pubUtils/util';
|
||||
import { getGoodById } from '../pubUtils/gamedata';
|
||||
import { RoleModel } from '../db/Role';
|
||||
import { setAp } from './actionPointService';
|
||||
import { ItemModel } from '../db/Item';
|
||||
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);
|
||||
@@ -119,4 +121,58 @@ async function rewardCurrency (roleId: string, dicGood: any, data: {id:number,cn
|
||||
currencyType: dicCurrency.type
|
||||
});
|
||||
return goods;
|
||||
}
|
||||
|
||||
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>() ;
|
||||
for(let {id, count} of goods) {
|
||||
let goodInfo = getGoodById(id);
|
||||
if(goodInfo.goodType == GOOD_TYPE.CONSUMES|| goodInfo.goodType == GOOD_TYPE.SCRIPT) { // 消耗品
|
||||
let {isCurrency} = ITID.get(goodInfo.itid);
|
||||
if(isCurrency) { // 货币
|
||||
if(!role) role = await RoleModel.findByRoleId(roleId);
|
||||
let dicCurrency = CURRENCY.get(id);
|
||||
if(dicCurrency.type == CURRENCY_TYPE.GOLD) { // 处理元宝
|
||||
if(role.gold < count + costGold) return false;
|
||||
costGold += count;
|
||||
} else if(dicCurrency.type == CURRENCY_TYPE.COIN) { // 处理铜币
|
||||
if(role.coin < count + costCoin) return false;
|
||||
costCoin += count;
|
||||
}
|
||||
} else {
|
||||
let findItem = items.find(cur => cur.id == id);
|
||||
if(findItem) {
|
||||
findItem.count += count;
|
||||
} else {
|
||||
items.push({id, count}); ids.push(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for(let {id, count} of items) {
|
||||
let item = await ItemModel.findbyRoleAndGidAndCount(roleId, id, count);
|
||||
if(!item) return false
|
||||
}
|
||||
|
||||
// 推送参数
|
||||
let gold = 0, coin = 0, resultGoods = [];
|
||||
if(costGold > 0) {
|
||||
role = await RoleModel.costGold(roleId, costGold);
|
||||
if(role) gold = role.gold;
|
||||
}
|
||||
if(costCoin > 0) {
|
||||
role = await RoleModel.costCoin(roleId, costCoin);
|
||||
if(role) coin = role.coin;
|
||||
}
|
||||
if(items.length > 0) {
|
||||
let {hasError, result} = await ItemModel.decreaseItems(roleId, items);
|
||||
if(hasError) return;
|
||||
resultGoods = result;
|
||||
}
|
||||
|
||||
let uids = [{uid: roleId, sid}];
|
||||
pinus.app.get('channelService').pushMessageByUids('onItemUpdate', resResult(STATUS.SUCCESS, {goods: resultGoods, gold, coin} ), uids);
|
||||
|
||||
return true
|
||||
}
|
||||
Reference in New Issue
Block a user