qixin/HJ_Server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bugfix' of http://git.legu.cc/qixin/HJ_Server into bugfix

Browse Source
This commit is contained in:
ciniao 2023-12-26 10:33:07 +08:00
commit a0043e1080
5 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/module/redis.ts
View File

@ -1,21 +1,20 @@
import { PeiJian } from '../shared/protocols/peijian/PtlGetList'; import {PeiJian} from '../shared/protocols/peijian/PtlGetList';
import { CollectionDxlt } from './collection_dxlt'; import {CollectionDxlt} from './collection_dxlt';
import { CollectionEmail } from './collection_email'; import {CollectionEmail} from './collection_email';
import { CollectionEquip } from './collection_equip'; import {CollectionEquip} from './collection_equip';
import { CollectionFightLog } from './collection_fightLog'; import {CollectionFightLog} from './collection_fightLog';
import { CollectionGBTX } from './collection_gbtx'; import {CollectionGBTX} from './collection_gbtx';
import { CollectionHero } from './collection_hero'; import {CollectionHero} from './collection_hero';
import { CollectionItem } from './collection_item'; import {CollectionItem} from './collection_item';
import { CollectionJJC } from './collection_jjc'; import {CollectionJJC} from './collection_jjc';
import { CollectionShiwu } from './collection_shiwu'; import {CollectionShiwu} from './collection_shiwu';
import { CollectionShop } from './collection_shop'; import {CollectionShop} from './collection_shop';
import { CollectionTanXian } from './collection_tanxian'; import {CollectionTanXian} from './collection_tanxian';
import { CollectionUser } from './collection_user'; import {CollectionUser} from './collection_user';
import {payLog} from '../shared/protocols/pay/PtlGetList'; import {payLog} from '../shared/protocols/pay/PtlGetList';
import { rankInfo } from '../shared/protocols/type'; import {rankInfo} from '../shared/protocols/type';
import { CollectionFriend } from '../module/collection_friend'; import {CollectionFriend} from '../module/collection_friend';
import { CollectionGongHui } from '../module/collection_gonghui'; import {CollectionGongHui} from '../module/collection_gonghui';
export type sortEd = { export type sortEd = {
@ -29,7 +28,7 @@ export type sortEd = {
export type RedisCollections1 = { export type RedisCollections1 = {
user: CollectionUser; user: CollectionUser;
gbtx: CollectionGBTX; gbtx: CollectionGBTX;
tanxian: Omit<CollectionTanXian, 'fastGuaJiNum'>; tanxian: Omit<CollectionTanXian, 'fastGuaJiNum'> | any;
dxlt: CollectionDxlt; dxlt: CollectionDxlt;
jjc: CollectionJJC; jjc: CollectionJJC;
}; };

16
src/public/gud.ts
View File

@ -19,14 +19,16 @@ export async function clearGud(uid) {
G.ioredis.del(`gudVersion:${uid}_ver`); G.ioredis.del(`gudVersion:${uid}_ver`);
} }
if(await G.redis.type('tanxian', uid)){ if (await G.redis.type('tanxian', uid)) {
console.log('清空tanxian Redis',uid); console.log('清空tanxian Redis', uid);
G.redis.del("tanxian",uid); // G.redis.del("tanxian", uid);
G.redis.set('tanxian', uid, {})
} }
try{ try {
console.log('清空friend:list Redis',uid); // console.log('清空friend:list Redis', uid);
G.redis.hDel("friend:list",uid); // G.redis.hDel("friend:list", uid);
}catch(e){ // G.redis.hSet('friend:list', uid, {})
} catch (e) {
} }
}; };

2
src/public/lingzhulaixi.ts
View File

@ -74,7 +74,7 @@ export class LingZhuLaiXifun {
// 隔天清零 // 隔天清零
if (_myData && PublicShared.chkSameDate(_myData.time, G.time)) { if (_myData && PublicShared.chkSameDate(_myData.time, G.time)) {
_res = { _res = {
num: _myData.num, num: _myData.num || 0,
time: _myData.time, time: _myData.time,
maxdps: _myData.maxdps maxdps: _myData.maxdps
} }

4
src/public/pay.ts
View File

@ -250,7 +250,7 @@ export class PayFun {
console.log("Christmasfun.payChristmas Error", e); console.log("Christmasfun.payChristmas Error", e);
} }
if (payArgs.selectPrize) { if (payArgs && payArgs?.selectPrize) {
let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`); let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`);
if (selectPrize) { if (selectPrize) {
prize.push(...JSON.parse(selectPrize)) prize.push(...JSON.parse(selectPrize))
@ -421,7 +421,7 @@ export class PayFun {
* payArgs里传相应参数，selectList选择的奖励列表 * payArgs里传相应参数，selectList选择的奖励列表
* 往后所有自选类型，走这个方法，配置格式同4、14 * 往后所有自选类型，走这个方法，配置格式同4、14
*/ */
if (payArgs.htype && payArgs.selectList) { if (payArgs && payArgs?.htype && payArgs?.selectList) {
let call = this.getCall(player) let call = this.getCall(player)
// @ts-ignore // @ts-ignore
let _hdInfo = (await HuoDongFun.gethdList(call, payArgs.htype))[0] let _hdInfo = (await HuoDongFun.gethdList(call, payArgs.htype))[0]

1
src/test.ts
View File

@ -42,6 +42,7 @@ async function start() {
// let c = await getItemNum('0_64e7024f1b2a9acc9e6900fb',['27382','12']); // let c = await getItemNum('0_64e7024f1b2a9acc9e6900fb',['27382','12']);
// console.log('c',c) // console.log('c',c)
}
//定义全局变量 //定义全局变量
ctor(); ctor();