diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 4af46ce29..9f8cddd3d 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -661,7 +661,7 @@ export class HeroHandler { if(!costResult) return resResult(STATUS.BATTLE_GOLD_NOT_ENOUGH); // 皮肤处理 - let { skins, skinId, consumes, ce } = hero; + let { skins, skinId, consumes, ce, scrollActive } = hero; let dicHero = gameData.hero.get(skinId); let dicJob = getJobByGradeAndClass(dicHero.jobClass, 0); @@ -669,8 +669,13 @@ export class HeroHandler { let initInfo = HeroModel.getInitInfo({ job: dicJob.jobid, skins, skinId, ce, star: dicHero.initialStars, quality: dicHero.quality, - scrollActive: true, scrollId: dicHeroScroll.id, scrollStar: dicHeroScroll.stars, scrollQuality: dicHeroScroll.quality, scrollColorStar: dicHeroScroll.colorstars + scrollActive: scrollActive, + scrollId: scrollActive? dicHeroScroll.id: 0, + scrollStar: scrollActive? dicHeroScroll.stars: 0, + scrollQuality: scrollActive? dicHeroScroll.quality: 0, + scrollColorStar: scrollActive? dicHeroScroll.colorstars: 0, }); + let calHeroCe = new CalHeroCe(hid, initInfo); let heroAttr = calHeroCe.cal(HERO_SYSTEM_TYPE.REBIRTH); await HeroModel.updateHeroInfo(roleId, hid, { ...initInfo, attr: heroAttr }); @@ -679,7 +684,7 @@ export class HeroHandler { let curJewels: jewelUpdate[] = []; for(let { jewel, id } of hero.ePlace) { if(jewel > 0) { - let jewelInfo = await JewelModel.putOnOrOff(jewel, hid, id); + let jewelInfo = await JewelModel.putOnOrOff(jewel, 0, id); curJewels.push({ seqId: jewelInfo.seqId, id: jewelInfo.id, diff --git a/game-server/app/services/rankService.ts b/game-server/app/services/rankService.ts index 47e2960d6..6b24e3bf6 100644 --- a/game-server/app/services/rankService.ts +++ b/game-server/app/services/rankService.ts @@ -15,7 +15,6 @@ import { getRandSingleEelm } from "../pubUtils/util"; import { RANK_FIRST_REWARD_STATUS } from '../consts'; import { CounterModel } from "../db/Counter"; import { ActivityTimeLimitRankModel } from "../db/ActivityTimeLimitRank"; -import { stringify } from "querystring"; /** diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts index 05a16e1d5..2274644b0 100644 --- a/shared/consts/constModules/sysConst.ts +++ b/shared/consts/constModules/sysConst.ts @@ -288,7 +288,8 @@ export function getInfoKeyByRedisKey(redisKey: REDIS_KEY) { case REDIS_KEY.SUM_CE_SNAPSHOT: // 战力限时排行榜的快照 return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] }; - + default: + return { infoKey: REDIS_KEY.USER_INFO, extraKey: [] }; } }