From 91c2827b332263e460651cd98c1eced233a23265 Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 25 Dec 2023 20:27:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=20=E8=87=AA=E9=80=89=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/pay.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/pay.ts b/src/public/pay.ts index fcb2c5f..a8c75ec 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -251,7 +251,7 @@ export class PayFun { console.log("Christmasfun.payChristmas Error", e); } - if (payArgs.selectPrize) { + if (payArgs && payArgs?.selectPrize) { let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`); if (selectPrize) { prize.push(...JSON.parse(selectPrize)) @@ -422,7 +422,7 @@ export class PayFun { * payArgs里传相应参数，selectList选择的奖励列表 * 往后所有自选类型，走这个方法，配置格式同4、14 */ - if (payArgs.htype && payArgs.selectList) { + if (payArgs && payArgs?.htype && payArgs?.selectList) { let call = this.getCall(player) // @ts-ignore let _hdInfo = (await HuoDongFun.gethdList(call, payArgs.htype))[0] From 905ed441e41eabfd8a3f650a824306f564e5a99e Mon Sep 17 00:00:00 2001 From: dy Date: Mon, 25 Dec 2023 20:54:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?redis=E4=B8=B4=E6=97=B6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/module/redis.ts | 35 +++++++++++++++++------------------ src/public/gud.ts | 18 ++++++++++-------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/module/redis.ts b/src/module/redis.ts index 4e14ff2..e62562b 100644 --- a/src/module/redis.ts +++ b/src/module/redis.ts @@ -1,21 +1,20 @@ -import { PeiJian } from '../shared/protocols/peijian/PtlGetList'; -import { CollectionDxlt } from './collection_dxlt'; -import { CollectionEmail } from './collection_email'; -import { CollectionEquip } from './collection_equip'; -import { CollectionFightLog } from './collection_fightLog'; -import { CollectionGBTX } from './collection_gbtx'; -import { CollectionHero } from './collection_hero'; -import { CollectionItem } from './collection_item'; -import { CollectionJJC } from './collection_jjc'; -import { CollectionShiwu } from './collection_shiwu'; -import { CollectionShop } from './collection_shop'; -import { CollectionTanXian } from './collection_tanxian'; -import { CollectionUser } from './collection_user'; +import {PeiJian} from '../shared/protocols/peijian/PtlGetList'; +import {CollectionDxlt} from './collection_dxlt'; +import {CollectionEmail} from './collection_email'; +import {CollectionEquip} from './collection_equip'; +import {CollectionFightLog} from './collection_fightLog'; +import {CollectionGBTX} from './collection_gbtx'; +import {CollectionHero} from './collection_hero'; +import {CollectionItem} from './collection_item'; +import {CollectionJJC} from './collection_jjc'; +import {CollectionShiwu} from './collection_shiwu'; +import {CollectionShop} from './collection_shop'; +import {CollectionTanXian} from './collection_tanxian'; +import {CollectionUser} from './collection_user'; import {payLog} from '../shared/protocols/pay/PtlGetList'; -import { rankInfo } from '../shared/protocols/type'; -import { CollectionFriend } from '../module/collection_friend'; -import { CollectionGongHui } from '../module/collection_gonghui'; - +import {rankInfo} from '../shared/protocols/type'; +import {CollectionFriend} from '../module/collection_friend'; +import {CollectionGongHui} from '../module/collection_gonghui'; export type sortEd = { @@ -29,7 +28,7 @@ export type sortEd = { export type RedisCollections1 = { user: CollectionUser; gbtx: CollectionGBTX; - tanxian: Omit; + tanxian: Omit | any; dxlt: CollectionDxlt; jjc: CollectionJJC; }; diff --git a/src/public/gud.ts b/src/public/gud.ts index c4a4dda..7ff21d5 100644 --- a/src/public/gud.ts +++ b/src/public/gud.ts @@ -18,15 +18,17 @@ export async function clearGud(uid) { G.ioredis.del(`gudVersion:${uid}_pid`); G.ioredis.del(`gudVersion:${uid}_ver`); } - - if(await G.redis.type('tanxian', uid)){ - console.log('清空tanxian Redis',uid); - G.redis.del("tanxian",uid); + + if (await G.redis.type('tanxian', uid)) { + console.log('清空tanxian Redis', uid); + // G.redis.del("tanxian", uid); + G.redis.set('tanxian', uid, {}) } - try{ - console.log('清空friend:list Redis',uid); - G.redis.hDel("friend:list",uid); - }catch(e){ + try { + // console.log('清空friend:list Redis', uid); + // G.redis.hDel("friend:list", uid); + // G.redis.hSet('friend:list', uid, {}) + } catch (e) { } }; From 9c4ba3a3342bfa8ff4376a8dec4fe3e86a61bd05 Mon Sep 17 00:00:00 2001 From: dy Date: Tue, 26 Dec 2023 09:47:06 +0800 Subject: [PATCH 3/4] fix --- src/test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test.ts b/src/test.ts index dc482ec..5c67607 100644 --- a/src/test.ts +++ b/src/test.ts @@ -42,6 +42,7 @@ async function start() { // let c = await getItemNum('0_64e7024f1b2a9acc9e6900fb',['27382','12']); // console.log('c',c) +} //定义全局变量 ctor(); From ba364e13f6ddcab688392ee83a9fb93b56fd6f76 Mon Sep 17 00:00:00 2001 From: chenkai Date: Tue, 26 Dec 2023 10:24:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=A2=86=E4=B8=BB?= =?UTF-8?q?=E6=9D=A5=E8=A2=AD=E6=8E=A5=E5=8F=A3=E5=9B=9E=E5=8F=82=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=20num=20=E5=AD=97=E6=AE=B5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/public/lingzhulaixi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/lingzhulaixi.ts b/src/public/lingzhulaixi.ts index eb4e6a7..dc27050 100644 --- a/src/public/lingzhulaixi.ts +++ b/src/public/lingzhulaixi.ts @@ -74,7 +74,7 @@ export class LingZhuLaiXifun { // 隔天清零 if (_myData && PublicShared.chkSameDate(_myData.time, G.time)) { _res = { - num: _myData.num, + num: _myData.num || 0, time: _myData.time, maxdps: _myData.maxdps }