Merge branch 'bugfix' into dev

src/api_s2c/equip/ApiStarUp.ts

@@ -57,7 +57,7 @@ export default async function (call: ApiCall<ReqStarUp, ResStarUp, ServiceType>)
     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 });

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<ReqWear, ResWear, ServiceType>) {
-    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}级开启`);

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<ReqAwake, ResAwake>) {
-    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;

src/api_s2c/hero/ApiChangePos.ts

@@ -9,7 +9,7 @@ import {HeroFun} from "../../public/hero";
 export const maxPosNum = 6;
 
 export default async function (call: ApiCall<ReqChangePos, ResChangePos>) {
-    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);
 
     let heroPos = Object.assign({}, call.conn.heroPos);

src/api_s2c/hero/ApiJinJie.ts

@@ -11,7 +11,7 @@ import { PublicShared } from "../../shared/public/public";
 
 export default async function (call: ApiCall<ReqJinJie, ResJinJie, ServiceType>) {
 
-    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);

src/api_s2c/hero/ApiLvUp.ts

@@ -11,7 +11,7 @@ import kfjsFun from "../../public/kaifujingsai";
 
 export default async function (call: ApiCall<ReqLvUp, ResLvUp, ServiceType>) {
 
-    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);

src/api_s2c/hero/ApiPotency.ts

@@ -6,7 +6,7 @@ import { ReqPotency, ResPotency } from "../../shared/protocols/hero/PtlPotency";
 export default async function (call: ApiCall<ReqPotency, ResPotency>) {
     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;
 

src/api_s2c/hero/ApiTalent.ts

@@ -6,7 +6,7 @@ export default async function (call: ApiCall<ReqTalent, ResTalent>) {
     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]));

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<ReqWeaponUp, ResWeaponUp>) {
-    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);

src/api_s2c/kuangdong/ApiYanShi.ts

@@ -5,9 +5,16 @@ import {ReqYanShi, ResYanShi} from "../../shared/protocols/kuangdong/PtlYanShi";
 
 export default async function (call: ApiCall<ReqYanShi, ResYanShi>) {
     let hdid = call.req.hdid
-    let kdInfo = await KuangDongfun.getKaiCaiInfo(hdid)
+    let con = await KuangDongfun.getCon(hdid)
 
-    if (!kdInfo) {
+    let kdInfo
+    if (con.public_map == 1){
+        kdInfo = await KuangDongfun.getKaiCaiInfo(hdid)
+    }else {
+        kdInfo = await KuangDongfun.getKaiCaiInfo(hdid, call.uid)
+    }
+
+    if (!kdInfo || !con) {
         return call.error('', {code: -1, message: globalThis.lng.kudangdong_1})
     }
 
@@ -30,12 +37,15 @@ export default async function (call: ApiCall<ReqYanShi, ResYanShi>) {
     _need && await PlayerFun.cutNeed(call, _need);
 
     kdInfo.yanshi = 8 * 3600
+    if (!kdInfo.ctime) kdInfo.ctime = G.time
+    if (!kdInfo.etime) kdInfo.etime = G.time
+    if (!kdInfo.kdtype) kdInfo.kdtype = con.type
 
     // 如果调用这个方法，会upsert，在没有查到数据的情况下，
     // 会插入空数据，全服玩家的查询列表接口都会报错
     // await KuangDongfun.setminingZhanLing(call.uid, hdid, { $set: { yanshi: kdInfo.yanshi } })
     await G.mongodb.collection('kuangdong').updateOne({uid: call.uid, hdid: hdid},
-        {$set: {yanshi: kdInfo.yanshi}});
+        {$set: kdInfo});
 
     kdInfo._id = kdInfo._id.toString()
     let changeData = {