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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
dy 2023-12-26 14:16:28 +08:00
commit 60bbb97a40
4 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api_s2c/dixialeitai/ApiFight.ts
View File

@ -12,7 +12,7 @@ export default async function (call: ApiCall<ReqFight, ResFight>) {
let change: Partial<ResOpen> = {};
let data = await DxltFun.getData(call);
if (data.killBoss >= G.gc.dxlt_com.dayFightLayer) return call.error(globalThis.lng.dixialeitai_2);
if (data.killBoss >= G.gc.dxlt_com.dayFightLayer) return call.error(globalThis.lng.dixialeitai_13);
if (G.gc.dxlt_layer[data.curLayer].type != 1) return call.error(globalThis.lng.dixialeitai_3);
if (data.over) return call.error(globalThis.lng.dixialeitai_4);
if (!data.heros[call.req]) return call.error(globalThis.lng.dixialeitai_5);

14
src/public/gud.ts
View File

@ -19,18 +19,8 @@ export async function clearGud(uid) {
G.ioredis.del(`gudVersion:${uid}_ver`);
}
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);
// G.redis.hSet('friend:list', uid, {})
} catch (e) {
}
//清空探险缓存
G.ioredis.del(`tanxian:${uid}`);
};
/**

27
src/public/shop.ts
View File

@ -1,11 +1,11 @@
import {CollectionShop} from '../module/collection_shop';
import {ResOpen, shopItem} from '../shared/protocols/shop/PtlOpen';
import {PublicShared} from '../shared/public/public';
import {ShiwuFun} from './shiwu';
import { CollectionShop } from '../module/collection_shop';
import { ResOpen, shopItem } from '../shared/protocols/shop/PtlOpen';
import { PublicShared } from '../shared/public/public';
import { ShiwuFun } from './shiwu';
type shopData = ResOpen;
type changeData = {
[k in keyof shopData]: shopData[k]
[k in keyof (shopData & { version?: number | string })]: (shopData & { version?: number | string })[k]
};
export class ShopFun {
@ -48,13 +48,13 @@ export class ShopFun {
}
static async changeShopData(uid: string, shopId: string, change: Partial<changeData>) {
let where = {uid: uid, shopId: shopId}
G.mongodb.collection("shop").updateOne(where, {$set: change})
let where = { uid: uid, shopId: shopId }
G.mongodb.collection("shop").updateOne(where, { $set: change })
}
static async initShopData(uid: string, shopId: string) {
let gud = await G.mongodb.collection("user").findOne({uid: uid}, {
projection: {lv: 1, _id: 0}
let gud = await G.mongodb.collection("user").findOne({ uid: uid }, {
projection: { lv: 1, _id: 0 }
})
let lv = gud?.lv || 1;
@ -69,7 +69,7 @@ export class ShopFun {
}
return (await G.mongodb.collection("shop").findOneAndUpdate(
{uid: uid, shopId: shopId},
{ uid: uid, shopId: shopId },
{
$set: {
buyNum: {},
@ -80,7 +80,7 @@ export class ShopFun {
lastFreeRefreshTime: G.time
}
},
{upsert: true, returnDocument: 'after'}
{ upsert: true, returnDocument: 'after' }
)).value
}
@ -101,11 +101,12 @@ export class ShopFun {
if (shopConf.freeRefreshInterval > 0 && G.time - shopData.lastFreeRefreshTime >= shopConf.freeRefreshInterval) {
shopData.useFreeRefreshNum = 0;
shopData.lastFreeRefreshTime = G.time;
await this.changeShopData(uid, shopId, {useFreeRefreshNum: 0, lastFreeRefreshTime: G.time});
await this.changeShopData(uid, shopId, { useFreeRefreshNum: 0, lastFreeRefreshTime: G.time });
}
if (shopConf.version && shopConf.version != shopData.version) {
await this.changeShopData(uid, shopId, {shopItems: this.getShopItems(shopId, lv)})
shopData.shopItems = this.getShopItems(shopId, lv);
await this.changeShopData(uid, shopId, { shopItems: shopData.shopItems, version: shopConf.version });
}
return shopData

15
src/public/tanxian.ts
View File

@ -9,21 +9,22 @@ export class TanXianFun {
static async changeData(call: ApiCall, change: dataChange) {
G.mongodb.collection('tanxian').updateOne({ uid: call.uid }, { $set: { ...change } });
for (let k in change) {
G.redis.set('tanxian', call.uid, k as any, change[k]);
}
let data = await this.getData(call);
Object.assign(data, change);
G.ioredis.set(`tanxian:${call.uid}`, JSON.stringify(data));
}
/**获取探险数据 */
static async getData(call: ApiCall, cache = true) {
if (cache && await G.redis.type('tanxian', call.uid) != null) return await G.redis.get('tanxian', call.uid);
if(cache){
let data = await G.ioredis.get(`tanxian:${call.uid}`);
if (data) return JSON.parse(data);
}
let { _id, uid, ...data } = await G.mongodb.collection('tanxian').findOne({ uid: call.uid });
if (!data.eventTime) {
data.eventTime = G.time;
G.mongodb.collection('tanxian').updateOne({ uid: call.uid }, { $set: { eventTime: G.time } });
}
await G.redis.set('tanxian', call.uid, data);
await G.ioredis.set(`tanxian:${call.uid}`, JSON.stringify(data));
return data;
}
/**获取快速探险次数 */