From 99500b7bf4ff936e3f1da507d6a1289d5f805c07 Mon Sep 17 00:00:00 2001 From: dy Date: Fri, 15 Dec 2023 22:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E5=8A=9F=E8=83=BDredis?= =?UTF-8?q?=E7=9B=B4=E5=8F=96=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api_s2c/equip/ApiStarUp.ts | 2 +- src/api_s2c/equip/ApiWear.ts | 2 +- src/api_s2c/hero/ApiAwake.ts | 2 +- src/api_s2c/hero/ApiJinJie.ts | 2 +- src/api_s2c/hero/ApiLvUp.ts | 2 +- src/api_s2c/hero/ApiPotency.ts | 2 +- src/api_s2c/hero/ApiTalent.ts | 2 +- src/api_s2c/hero/ApiWeaponUp.ts | 3 ++- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/api_s2c/equip/ApiStarUp.ts b/src/api_s2c/equip/ApiStarUp.ts index 360c950..360a245 100644 --- a/src/api_s2c/equip/ApiStarUp.ts +++ b/src/api_s2c/equip/ApiStarUp.ts @@ -57,7 +57,7 @@ export default async function (call: ApiCall) if (equip.star == 5) md_redPoint_check(call.conn, 'equip_star_5'); if (equip.wearaId) { - let hero = await G.redis.get('hero', call.conn.uid, equip.wearaId); + let hero = await HeroFun.getHero(call, equip.wearaId) if (hero) { hero.equip[G.gc.equip[equip.equipId].type] = EquipShared.fmtEquip(equip); await HeroFun.changeHeroAttr(call, hero, { equip: hero.equip }); diff --git a/src/api_s2c/equip/ApiWear.ts b/src/api_s2c/equip/ApiWear.ts index d2db0a1..edea5c0 100644 --- a/src/api_s2c/equip/ApiWear.ts +++ b/src/api_s2c/equip/ApiWear.ts @@ -7,7 +7,7 @@ import { EquipShared } from '../../shared/public/equip'; import kfjsFun from "../../public/kaifujingsai"; export default async function (call: ApiCall) { - let hero = await G.redis.get('hero', call.conn.uid, call.req.heroId); + let hero = await HeroFun.getHero(call, call.req.heroId) if (!hero) return call.error(globalThis.lng.equip_10); if (hero.lv < G.gc.herocom.equipOpenLv) return call.error(`英雄${G.gc.herocom.equipOpenLv}级开启`); diff --git a/src/api_s2c/hero/ApiAwake.ts b/src/api_s2c/hero/ApiAwake.ts index d691fc7..a4bd0c8 100644 --- a/src/api_s2c/hero/ApiAwake.ts +++ b/src/api_s2c/hero/ApiAwake.ts @@ -4,7 +4,7 @@ import { PlayerFun } from '../../public/player'; import { ReqAwake, ResAwake } from "../../shared/protocols/hero/PtlAwake"; export default async function (call: ApiCall) { - let hero = await G.redis.get('hero', call.uid, call.req._id); + let hero = await HeroFun.getHero(call, call.req._id) if (!hero) return call.error('', { code: -1 }); let awake = hero.awake || 0; diff --git a/src/api_s2c/hero/ApiJinJie.ts b/src/api_s2c/hero/ApiJinJie.ts index c9c51c3..47b8cd3 100644 --- a/src/api_s2c/hero/ApiJinJie.ts +++ b/src/api_s2c/hero/ApiJinJie.ts @@ -11,7 +11,7 @@ import { PublicShared } from "../../shared/public/public"; export default async function (call: ApiCall) { - let hero = await G.redis.get('hero', call.uid, call.req.id); + let hero = await HeroFun.getHero(call, call.req.id) if (!hero) return call.error(globalThis.lng.hero_1); if (G.gc.herogrow[G.gc.hero[hero.heroId].jjup] == undefined) return call.error(globalThis.lng.hero_6); diff --git a/src/api_s2c/hero/ApiLvUp.ts b/src/api_s2c/hero/ApiLvUp.ts index b7d312d..6e52ad4 100644 --- a/src/api_s2c/hero/ApiLvUp.ts +++ b/src/api_s2c/hero/ApiLvUp.ts @@ -11,7 +11,7 @@ import kfjsFun from "../../public/kaifujingsai"; export default async function (call: ApiCall) { - let hero = await G.redis.get('hero', call.uid, call.req.id); + let hero = await HeroFun.getHero(call, call.req.id) let up = call.req.up || 1 if (!hero) return call.errorCode(-1); if (hero.lv >= call.conn.gud.lv * 3 || hero.lv + up > call.conn.gud.lv * 3) return call.errorCode(-2); diff --git a/src/api_s2c/hero/ApiPotency.ts b/src/api_s2c/hero/ApiPotency.ts index b17157f..4ee9586 100644 --- a/src/api_s2c/hero/ApiPotency.ts +++ b/src/api_s2c/hero/ApiPotency.ts @@ -6,7 +6,7 @@ import { ReqPotency, ResPotency } from "../../shared/protocols/hero/PtlPotency"; export default async function (call: ApiCall) { if (!G.gc.hero_qianneng[call.req.type]) return call.error(globalThis.lng.hero_14); - let hero = await G.redis.get('hero', call.uid, call.req._id); + let hero = await HeroFun.getHero(call, call.req._id) let qiannneg = hero.qiannneg || Object.fromEntries(Object.keys(G.gc.hero_qianneng).map(k => [k, 0])); let nextLv = qiannneg[call.req.type] + 1; diff --git a/src/api_s2c/hero/ApiTalent.ts b/src/api_s2c/hero/ApiTalent.ts index af1a9f1..d6f6e93 100644 --- a/src/api_s2c/hero/ApiTalent.ts +++ b/src/api_s2c/hero/ApiTalent.ts @@ -6,7 +6,7 @@ export default async function (call: ApiCall) { let typeConf = G.gc.hero_tf[call.req.type]; if (!typeConf) return call.error('', { code: -1 }); - let hero = await G.redis.get('hero', call.uid, call.req._id); + let hero = await HeroFun.getHero(call, call.req._id) if (!hero) return call.error('', { code: -2 }); let talent = hero.talent || Object.fromEntries(Object.keys(G.gc.hero_tf).map(t => [t, 0])); diff --git a/src/api_s2c/hero/ApiWeaponUp.ts b/src/api_s2c/hero/ApiWeaponUp.ts index ee43e58..63aa4a0 100644 --- a/src/api_s2c/hero/ApiWeaponUp.ts +++ b/src/api_s2c/hero/ApiWeaponUp.ts @@ -5,7 +5,8 @@ import { ReqWeaponUp, ResWeaponUp } from "../../shared/protocols/hero/PtlWeaponU import { PublicShared } from '../../shared/public/public'; export default async function (call: ApiCall) { - let hero = await G.redis.get('hero', call.uid, call.req.id); + let hero = await HeroFun.getHero(call, call.req.id) + let heroConf = G.gc.hero[hero?.heroId]; if (!hero) return call.error(globalThis.lng.hero_1);