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-31 16:29:22 +08:00
commit 17ae62472e
35 changed files with 420 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/api_cross/hbzb/ApiUpdateHbzbCrossUser.ts
View File

@ -1,18 +1,23 @@
import { ApiCall } from "tsrpc";
import { ReqUpdateHbzbCrossUser, ResUpdateHbzbCrossUser } from "../../cross/protocols/hbzb/PtlUpdateHbzbCrossUser";
import {ApiCall} from "tsrpc";
import {ReqUpdateHbzbCrossUser, ResUpdateHbzbCrossUser} from "../../cross/protocols/hbzb/PtlUpdateHbzbCrossUser";
/**更新跨服数据库里，黑帮争霸的玩家数据 */
export default async function (call: ApiCall<ReqUpdateHbzbCrossUser, ResUpdateHbzbCrossUser>) {
let setData = {
"data":{
let setData: any = {
"data": {
player: call.req.user.player,
roles: call.req.user.roles,
uid: call.req.uid
},
"jifen": -999999,
"rank": -999999,
"zbsgroup":""
};
G.mongodb.collection('hbzb_user_cross').updateOne({ uid: setData.data.uid }, { $set: setData }, { upsert: true });
call.succ({ });
if (call.req.isNew) {
setData = {
...setData,
"jifen": -999999,
"rank": -999999,
"zbsgroup": ""
}
}
G.mongodb.collection('hbzb_user_cross').updateOne({uid: setData.data.uid}, {$set: setData}, {upsert: true});
call.succ({});
}

2
src/api_s2c/event/pobinglibao/ApiReceive.ts
View File

@ -29,5 +29,5 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
call.succ({})
HongDianChange.sendChangeKey(call.uid, ['pobinglibao']);
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

33
src/api_s2c/event/xiaofeijingsai/ApiOpen.ts
View File

@ -21,23 +21,18 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || call.req.limit || 100
let rmbuse = await G.crossmongodb.collection('rmbuse').find({
time: {
$gte: _hd.stime,
$lte: _hd.etime + 10
}
}).sort({change: 1}).limit(limit).toArray()
let rmbuse = await G.crossmongodb.collection('rmbuse').find({type: `xfjs_${G.huodong.xfjsId}`}).sort({change: 1}).limit(limit).toArray()
let list: any = rmbuse.map(i => ({...i, total: R.negate(i.change)}))
let rankList = sortRankList(_hd.data.rank, list)
let users = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != 'system')}}).toArray()
let users = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i != 'system')}}).toArray()
rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i._id) || {}}))
rankList = rankList.map(i => ({...i, player: users.find(v => v.uid == i.uid) || {}}))
// 活动结束前半小时，缓存过期时间改为10秒
let exTime = (G.time + 1800) > _hd.etime ? 10 : 60
// 活动结束前半小时，缓存过期时间改为5秒
let exTime = (G.time + 1800) > _hd.etime ? 5 : 10
G.crossioredis.setex(`rank:xiaofeijingsai`, exTime, JSON.stringify(rankList));
@ -53,14 +48,13 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
*/
export function sortRankList(rank, list) {
let rankList = []
let ccc = 0
rank.map(i => {
for (let k = i.rank[0] - 1; k < i.rank[1]; k++) {
if (list[k]?.total >= i.need[0].n) {
rankList.push({...list[k - ccc], rank: k})
if (list[0]?.total >= i.need[0].n) {
rankList.push({...list[0], rank: k, _id: list[0].uid})
list = R.tail(list)
} else {
rankList.push({_id: 'system', total: i.need[0].n, rank: k, player: {}})
ccc += 1
}
}
})
@ -68,18 +62,21 @@ export function sortRankList(rank, list) {
}
// 获取自己的信息
async function getMyData(call, rankList) {
async function getMyData(call: ApiCall, rankList) {
let myData = rankList.find(i => i._id == call.uid)
if (myData) return myData
let myCut: any = await G.crossmongodb.collection('rmbuse').findOne({uid: call.uid})
let myCut: any = await G.crossmongodb.collection('rmbuse').findOne({
uid: call.uid,
type: `xfjs_${G.huodong.xfjsId}`
})
let myUser = await G.mongodb.collection('user').findOne({uid: call.uid})
G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, myUser, {upsert: true})
G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true})
if (!myCut) {
myCut = {_id: myUser.uid, total: 0}
}
return {player: myUser, ...myCut, total: R.negate(myCut.total), rank: -1}
return {player: myUser, ...myCut, total: R.negate(myCut.change) || 0, rank: -1, _id: myUser.uid}
}

2
src/api_s2c/event/yuandan/ApiDMRec.ts
View File

@ -31,5 +31,5 @@ export default async function (call: ApiCall<ReqDMRec, ResDMRec>) {
call.succ({prize})
HongDianChange.sendChangeKey(call.uid, ['yuandan']);
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

2
src/api_s2c/event/yuandan/ApiDZRec.ts
View File

@ -32,5 +32,5 @@ export default async function (call: ApiCall<ReqDZRec, ResDZRec>) {
call.succ({[gift.id]: prize})
HongDianChange.sendChangeKey(call.uid, ['yuandan']);
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

2
src/api_s2c/event/yuandan/ApiExchange.ts
View File

@ -25,5 +25,5 @@ export default async function (call: ApiCall<ReqExchange, ResExchange>) {
call.succ({})
HongDianChange.sendChangeKey(call.uid, ['yuandan']);
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

8
src/api_s2c/event/yuandan/ApiOpen.ts
View File

@ -3,14 +3,18 @@ import {ReqOpen, ResOpen} from "../../../shared/protocols/event/yuandan/PtlOpen"
import {HuoDongFun} from "../../../public/huodongfun";
import {PayFun} from "../../../public/pay";
import {Yuandanfun} from "./fun";
import {PublicShared} from "../../../shared/public/public";
export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let _hd = await Yuandanfun.getCon(call)
if (!_hd) return call.errorCode(-1)
let payIds = _hd.data.gift.filter(i => i.payid).map(i => i.payid)
let data = await Yuandanfun.getData(call, _hd.hdid)
call.succ({
data: await Yuandanfun.getData(call, _hd.hdid),
payLog: await PayFun.getPayLogs(call.uid, payIds)
data: {...data, isSameDay: PublicShared.chkSameDate(data.qiandaoTime, G.time)},
payLog: await PayFun.getPayLogs(call.uid, payIds),
})
}

6
src/api_s2c/event/yuandan/ApiTaskRec.ts
View File

@ -29,9 +29,9 @@ export default async function (call: ApiCall<ReqTaskRec, ResTaskRec>) {
await PlayerFun.sendPrize(call, _prize);
let changedata = { data: _mydata, prize: _prize}
// 推送红点
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
call.succ(changedata);
// 推送红点
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

2
src/api_s2c/event/yuandan/ApiZLRec.ts
View File

@ -40,5 +40,5 @@ export default async function (call: ApiCall<ReqZLRec, ResZLRec>) {
call.succ({[call.req.id]: prize})
HongDianChange.sendChangeKey(call.uid, ['yuandan']);
HongDianChange.sendChangeKey(call.uid, ['huodonghd']);
}

16
src/api_s2c/event/yuandan/fun.ts
View File

@ -24,7 +24,7 @@ export class Yuandanfun {
exchange: {},
taskfinish: [],
taskval: await this.getTaskVal(call),
qiandaoTime: data?.qiandaoTime || 0,
qiandaoTime: data?.qiandaoTime || 1,
refreshTime: G.time
},
}, {upsert: true, returnDocument: 'after'})).value
@ -35,7 +35,7 @@ export class Yuandanfun {
static async refreshPayLog(call: ApiCall) {
let _hd = await this.getCon(call)
let payIds = _hd?.data?.gift?.filter(i=>i.payId).map(i=>i.payId)
let payIds = _hd?.data?.gift?.filter(i => i.payId).map(i => i.payId)
PayFun.delPayLog(call.uid, ...payIds.map(i => {
return {payId: i, val: []}
}))
@ -74,7 +74,8 @@ export class Yuandanfun {
let _hd = await this.getCon(call)
if (!_hd) return
// let _mydata = await Christmasfun.getMyData(call, hdid)
await this.getData(call, _hd.hdid)
let _tasks = _hd.data.task
let _setData = {
@ -88,7 +89,6 @@ export class Yuandanfun {
let _taskCon = _tasks[ele]
if (_taskCon.stype != stype) continue
let _pval = _taskCon.pval
// 不符合任务要求
if (!(await chkCall(_taskCon["cond"], chkval, arg))) continue
@ -105,10 +105,10 @@ export class Yuandanfun {
// 设置任务
if (isset == 1) {
await G.mongodb.collection('event').updateOne(
{uid: call.uid, type: `yuandan${_hd.hdid}`},
_setData
)
await G.mongodb.collection('event').updateOne({
uid: call.uid,
type: `yuandan${_hd.hdid}`
}, _setData)
}
}

1
src/api_s2c/eventlist/ApihdGetList.ts
View File

@ -12,6 +12,7 @@ export default async function (call: ApiCall<ReqhdGetList, ReshdGetList>) {
// 消费竞赛是跨服活动，活动开启时，同步当前用户信息到跨服数据库
G.huodong.xfjs = !!_hdList.find(i => i.htype == 11);
if (G.huodong.xfjs) {
G.huodong.xfjsId = _hdList.find(i => i.htype == 11).hdid
let myUser = await G.mongodb.collection('user').findOne({uid: call.uid})
G.crossmongodb.collection('huodong_user').updateOne({uid: call.uid}, {$set: myUser}, {upsert: true})
}

2
src/api_s2c/gongyu/mingdao/ApiRepair.ts
View File

@ -62,7 +62,7 @@ export default async function (call: ApiCall<ReqRepair, ResRepair>) {
} else {
cutItem = R.find(R.whereEq({a: "item", t: "21"}))(need)
}
let rankKfjs = new RankKfjs(6)
let rankKfjs = RankKfjs(6)
rankKfjs.setDataAndCheck({
player: call.conn.gud,
valArr: [await rankKfjs.getRankScore(call.uid) + cutItem.n]

32
src/api_s2c/hbzb/jfs/ApiOpen.ts
View File

@ -1,18 +1,16 @@
import { ApiCall } from "tsrpc";
import { Rank } from '../../../public/rank/rank';
import { ReqOpen, ResOpen } from "../../../shared/protocols/hbzb/jfs/PtlOpen";
import { PublicShared } from '../../../shared/public/public';
import { getHbzbData, getMyRank, getToper200RankUid, updateHbzbCrossUser } from "./fun";
import {ApiCall} from "tsrpc";
import {Rank} from '../../../public/rank/rank';
import {ReqOpen, ResOpen} from "../../../shared/protocols/hbzb/jfs/PtlOpen";
import {PublicShared} from '../../../shared/public/public';
import {getHbzbData, getMyRank, getToper200RankUid, updateHbzbCrossUser} from "./fun";
export default async function (call: ApiCall<ReqOpen, ResOpen>) {
//查看本地数据库里，刷出来的玩家数据
let dbData = await getHbzbData(call.uid );
let dbData = await getHbzbData(call.uid);
let data: typeof dbData.data = dbData?.data || {} as any;
if (dbData == null) {
//如果没有，则同步到跨服
await updateHbzbCrossUser(await call.conn.getDefaultFightData(), true);
}
//如果没有，则同步到跨服
await updateHbzbCrossUser(await call.conn.getDefaultFightData(), dbData == null);
if (!data.refreshTime || data.refreshTime < PublicShared.getToDayZeroTime()) {
data.winNum = 0;
@ -26,19 +24,21 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
//积分赛时的排行榜，是本服积分排序
data.jifen = 0;
//但是刷出来的对手，是跨服的玩家
let callRes = await G.clientCross.callApi('hbzb/jfs/GetEnemy', { uid: call.uid, auto: true });
if (!callRes.isSucc){
let callRes = await G.clientCross.callApi('hbzb/jfs/GetEnemy', {uid: call.uid, auto: true});
if (!callRes.isSucc) {
//todo 健壮性处理
return call.errorCode(-4)
}
if (callRes.res.enemy.length)
data.enemy = callRes.res.enemy.map(e => { return { ...e, result: null }; });
data.enemy = callRes.res.enemy.map(e => {
return {...e, result: null};
});
}
G.mongodb.cPlayerInfo('hbzb').updateOne(
{ uid: call.uid, type: 'hbzb' },
{ $set: { data: data } },
{ upsert: true }
{uid: call.uid, type: 'hbzb'},
{$set: {data: data}},
{upsert: true}
);
}

89
src/api_s2c/hero/ApiGetList.ts
View File

@ -21,34 +21,7 @@ export default async function (call: ApiCall<ReqGetList, ResGetList>) {
color[heroCon[v.heroId].colour] += 1;
});
// 修复配件数据
let peijianids = [];
Object.values(list).map(hero => {
hero.peijian && Object.values(hero.peijian).map(
i => peijianids.push(G.mongodb.conversionId(PeijianShared.fmt(i)._id))
)
});
let peijians = (await G.mongodb.collection("peijian").find(
{uid: call.uid, _id: {$in: peijianids}}, {projection: {_id: 1}}
).toArray()).map(temp => G.mongodb.conversionId(temp._id));
let changes = {};
Object.values(list).map(hero => {
for (let pos in hero.peijian) {
if (!peijians.includes(PeijianShared.fmt(hero.peijian[pos])._id)) {
hero.peijian[pos] = "";
changes[hero._id] = hero.peijian;
}
}
})
for (let oid in changes) {
// 修复数据
G.mongodb.collection("hero").updateOne(
G.mongodb.conversionIdObj({_id: oid}), {$set: {peijian: changes[oid]}}
)
}
await checkDataAndFix(call, list)
// 记录玩家最大等级，颜色相关数据 注册任务用
await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({uid: call.conn.uid, type: 'usertasklog'},
@ -68,4 +41,64 @@ export default async function (call: ApiCall<ReqGetList, ResGetList>) {
lshd: heros || {},
gbzj: (await G.mongodb.cPlayerInfo('gbzj').findOne({uid: call.uid, type: 'gbzj'}))?.rec || {}
});
}
/**
* 修复玩家出现的饰品和配件数据错误导致的进不去游戏
* @param call
* @param list
*/
async function checkDataAndFix(call: ApiCall, list: ResGetList['list']) {
try {
// 修复配件数据
let peijianids = [];
Object.values(list).map(hero => {
hero.peijian && Object.values(hero.peijian).map(
i => peijianids.push(G.mongodb.conversionId(PeijianShared.fmt(i)._id))
)
});
let peijians = (await G.mongodb.collection("peijian").find(
{uid: call.uid, _id: {$in: peijianids}}, {projection: {_id: 1}}
).toArray()).map(temp => G.mongodb.conversionId(temp._id));
let shiwuIds = R.flatten(R.values(list).map(hero => R.values(hero.shiwu).map(i => G.mongodb.conversionId(i._id))))
let shiwus = (await G.mongodb.collection("shiwu").find(
{uid: call.uid, _id: {$in: shiwuIds}}, {projection: {_id: 1}}
).toArray()).map(i => G.mongodb.conversionId(i._id));
let peijianChanges = {};
let shiwuChanges = {};
Object.values(list).map(hero => {
for (let pos in hero.peijian) {
if (!peijians.includes(PeijianShared.fmt(hero.peijian[pos])._id)) {
hero.peijian[pos] = "";
peijianChanges[hero._id] = hero.peijian;
}
}
for (let pos in hero.shiwu) {
if (!shiwus.includes(hero.shiwu[pos]._id)) {
hero.shiwu = R.omit([pos], hero.shiwu)
shiwuChanges[hero._id] = hero.shiwu;
}
}
})
for (let oid in peijianChanges) {
// 修复数据
G.mongodb.collection("hero").updateOne(
G.mongodb.conversionIdObj({_id: oid}), {$set: {peijian: peijianChanges[oid]}}
)
}
for (let oid in shiwuChanges) {
// 修复数据
G.mongodb.collection("hero").updateOne(
G.mongodb.conversionIdObj({_id: oid}), {$set: {shiwu: shiwuChanges[oid]}}
)
}
} catch (e) {
console.log('======修复英雄配件和饰物报错====',e)
}
}

29
src/api_s2c/hongdian/fun.ts
View File

@ -269,7 +269,7 @@ export class HongDianFun {
for (let i = 1; i <= 7; i++) {
let prize = kfjsFun.getStatus(i)
if (PublicShared.getOpenServerDay() <= prize.conf.showDay[1]) continue
let rankKfjs = new RankKfjs(i)
let rankKfjs = RankKfjs(i)
let myRank = await rankKfjs.getRankSortByOne(call.uid)
if (prize.type > 0 && !data?.record?.[i] && myRank >= 0) {
canGet[i] = true
@ -349,7 +349,7 @@ export class HuoDongHongDianFun {
ishd = await this.pobinglibao(call, element)
}
if (element.htype == 14) {
// 检测 htype 10 破冰活动红点
// 检测 htype 10 元旦活动红点
ishd = await this.yuandan(call, element)
}
@ -367,17 +367,21 @@ export class HuoDongHongDianFun {
/**破冰礼包红点 */
static async pobinglibao(call: ApiCall, _hd: ReqAddHuoDong): Promise<hongdianVal> {
let gift = _hd?.data?.gift?.find(i => i.free == true && !i.payId)
if (!gift) return {show: false}
if (gift) return {show: true}
let payLog = await PayFun.getPayLog(call.uid, gift.payId)
payLog = payLog?.filter(i => i.time >= _hd.stime && i.time <= _hd.etime) || []
if (!payLog || !payLog.length) return {show: false}
let payIds = _hd?.data?.gift?.filter(i=>i.payId).map(i=>i.payId)
let payLogs = await PayFun.getPayLogs(call.uid, payIds)
// 取奖励列表，判断是否有可领取奖励
let data = await G.mongodb.cEvent('pobinglibao').findOne({uid: call.uid, type: 'pobinglibao'})
let rec = data?.record?.[call.req.id].length
if (rec && (rec >= 3 || data?.record?.[gift.id] == call.req.recId)) return {show: false}
return {show: true}
for (let item of _hd?.data?.gift){
let rec = data?.record?.[item.id]?.length
if (item.free== true && !item.payId) return {show: true}
if (payLogs[item.payId]?.length && (!rec || rec < PublicShared.getDiff(payLogs[item.payId][0].time))) return {show: true}
}
return {show:false}
}
/**元旦活动红点 */
@ -392,16 +396,15 @@ export class HuoDongHongDianFun {
if (data?.gameNum < _hd.data.gamefree) return {show: true}
if (!PublicShared.chkSameDate(data?.qiandaoTime || 0, G.time)) {
if (!PublicShared.chkSameDate(data?.qiandaoTime || 1, G.time)) {
return {show: true}
}
for (let i = 1; i++; i <= data.taskval.length) {
if (data?.taskval[i] >= _hd?.data?.task?.[i]?.pval && !data?.taskfinish.find(v => v == i + '')) {
for (const i in data.taskval) {
if (data?.taskval[i] >= _hd?.data?.task?.[i]?.pval && !data?.taskfinish.find(v => v == i)) {
return {show: true}
}
}
return {show: false}
}

2
src/api_s2c/jiuba/ApiLottery.ts
View File

@ -137,7 +137,7 @@ export default async function (call: ApiCall<ReqLottery, ResLottery>) {
changeData: changeData
});
let rankKfjs = new RankKfjs(1)
let rankKfjs = RankKfjs(1)
rankKfjs.setDataAndCheck({
player: call.conn.gud,
valArr: [await rankKfjs.getRankScore(call.uid) + call.req.type]

2
src/api_s2c/jjc/ApiOpen.ts
View File

@ -2,6 +2,7 @@ import {ApiCall} from "tsrpc";
import {JJCFun} from '../../public/jjc';
import {ReqOpen, ResOpen} from "../../shared/protocols/jjc/PtlOpen";
import {PublicShared} from '../../shared/public/public';
import {UserFun} from "../../public/user";
export default async function (call: ApiCall<ReqOpen, ResOpen>) {
const dbData = await JJCFun.getMyData(call.uid);
@ -28,6 +29,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
...enemy
});
UserFun.activeHeadFrame(call.uid, 'jjc_rank', data["rank"] + 1);
JJCFun.checkUpdatePlayer()
}

2
src/api_s2c/kaifujingsai/ApiOpen.ts
View File

@ -12,7 +12,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
const {min, max} = Rank.pageToMin(call.req.page, call.req.offset)
let rankKfjs = new RankKfjs(status.type)
let rankKfjs = RankKfjs(status.type)
let endTime = PublicShared.getToDayZeroTime(PublicShared.getToDayZeroTime(G.openTime) + status.conf.showDay[1] * 86400)

2
src/api_s2c/kaifujingsai/ApiReceive.ts
View File

@ -15,7 +15,7 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
if (data?.record?.[call.req.type]) return call.errorCode(-2)
// 查询自己排名，发奖
let rankKfjs = new RankKfjs(call.req.type)
let rankKfjs = RankKfjs(call.req.type)
let myRank = await rankKfjs.getRankSortByOne(call.uid)
let conf = R.find(i => i.rank[0] <= myRank + 1 && i.rank[1] >= myRank + 1)(prize)

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

@ -43,7 +43,7 @@ export default async function (call: ApiCall<ReqFight, ResFight>) {
valArr: [changeInfo.lv]
});
let rankKfjs = new RankKfjs(5)
let rankKfjs = RankKfjs(5)
rankKfjs.setDataAndCheck({
player: call.conn.gud,
valArr: [changeInfo.lv-1]

26
src/api_s2c/peijian/ApiGetList.ts
View File

@ -1,14 +1,14 @@
import { ApiCall } from "tsrpc";
import { ReqGetList, ResGetList } from "../../shared/protocols/peijian/PtlGetList";
import {ApiCall} from "tsrpc";
import {ReqGetList, ResGetList} from "../../shared/protocols/peijian/PtlGetList";
export default async function (call: ApiCall<ReqGetList, ResGetList>) {
let _maxLv = 0
let color = {}
let peijianCon = G.gc.peijian
let dbList = (await G.mongodb.collection('peijian').find({ uid: call.uid }).toArray()).map(p => {
let dbList = (await G.mongodb.collection('peijian').find({uid: call.uid}).toArray()).map(p => {
let np = G.mongodb.conversionIdObj(p);
let { uid, ...ops } = np;
let {uid, ...ops} = np;
if (np.lv > _maxLv) _maxLv = np.lv
if (!color[peijianCon[np.peijianId].colour]) color[peijianCon[np.peijianId].colour] = 0
@ -16,15 +16,25 @@ export default async function (call: ApiCall<ReqGetList, ResGetList>) {
return ops;
});
// 修复配件穿戴在不存在的英雄身上
let heroIds = R.values(call.conn.gud.heroPos)
let fixIds = dbList.filter(i => i.wearId && !heroIds.includes(i.wearId)).map(i => G.mongodb.conversionId(i._id))
if (fixIds.length) {
await G.mongodb.collection('peijian').updateMany({_id: {$in: fixIds}}, {$set: {wearId: ''}})
}
// 记录玩家最大等级，颜色相关数据 注册任务用
await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ uid: call.conn.uid, type: 'usertasklog' },
{ $set: { maxpeijianlv: _maxLv, peijiancolor: color } }, { upsert: true })
await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({uid: call.conn.uid, type: 'usertasklog'},
{$set: {maxpeijianlv: _maxLv, peijiancolor: color}}, {upsert: true})
let list = Object.fromEntries(dbList.map(p => [G.formatRedisKey(p._id), p]));
G.redis.set('peijian', call.uid, list);
let recLshd = await G.mongodb.collection('playerInfo', 'lshd_peijian').findOne({ uid: call.conn.uid, type: 'lshd_peijian' });
let { uid, _id, type, ...peijians } = (recLshd || {});
let recLshd = await G.mongodb.collection('playerInfo', 'lshd_peijian').findOne({
uid: call.conn.uid,
type: 'lshd_peijian'
});
let {uid, _id, type, ...peijians} = (recLshd || {});
call.conn.lshd.peijian = peijians || {};
call.succ({

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

@ -38,7 +38,7 @@ export default async function (call: ApiCall<ReqFight, ResFight>) {
// (await call.conn.gonghui)?.addExp(20, call.uid);
let rankKfjs = new RankKfjs(4)
let rankKfjs = RankKfjs(4)
rankKfjs.setDataAndCheck({
player: call.conn.gud,
valArr: [call.conn.gud.mapId]

5
src/api_s2c/user/ApiPing.ts
View File

@ -21,8 +21,9 @@ export default async function (call: ApiCall<ReqPing, ResPing>) {
openDay: PublicShared.getOpenServerDay()
});
let gud = call.conn?.gud
G.server.sendMsgByUid(call.uid, 'msg_s2c/PlayerChange', {
jinbi: call.conn.gud.jinbi,
rmbmoney: call.conn.gud.rmbmoney
jinbi: gud?.jinbi,
rmbmoney: gud?.rmbmoney
});
}

2
src/extends.ts
View File

@ -250,7 +250,7 @@ BaseConnection.prototype.refreshPower = async function (this: BaseConnection<Ser
G.mongodb.collection('user').updateOne({ uid: this.uid }, { $set: dbUpdate });
this.sendMsg('msg_s2c/PlayerChange', dbUpdate);
let rankKfjs = new RankKfjs(7)
let rankKfjs = RankKfjs(7)
rankKfjs.setDataAndCheck({
player: this.gud,
valArr: [power]

155
src/fix_patch/patch_20231230.ts Normal file
View File

@ -0,0 +1,155 @@
import { log } from "console";
import { patchFun, patchInit } from "../patch";
import { TanXianFun } from "../public/tanxian";
import { PublicShared } from "../shared/public/public";
class Path {
async fun1(a: any) {
let hdid = 1703860546; // 正式服活动id
// let hdid = 1703917224; // 测试服活动id
let today_zero_time = PublicShared.getToDayZeroTime();
// 查询今天登录的用户
let today_login_users = await G.mongodb.collection("user").find(
{ loginTime: { $gte: today_zero_time } },
{ projection: { uid: 1 } }
).toArray();
for (let i = 0; i < today_login_users.length; i++) {
let uid = today_login_users[i].uid;
let init: boolean = false;
let hdata: any = await G.mongodb.cEvent(`yuandan${hdid}`).findOne({
uid: uid, type: `yuandan${hdid}`
});
if (!hdata) {
init = true;
hdata = {
uid: uid,
gift: {},
qiandao: {},
gameNum: 0,
exchange: {},
taskfinish: [],
taskval: {
"1": 1,
"2": 0,
"3": 0,
"4": 0,
"5": 0,
"6": 0,
"7": 0,
"8": 0,
"9": 0
},
qiandaoTime: 1,
refreshTime: G.time,
type: `yuandan${hdid}`,
}
}
let taskval = {};
// taskid=1, stype=123 今日登录
taskval["1"] = 1;
// taskid=2, stype=158 今日参与抓娃娃次数
taskval["2"] = hdata.gameNum;
// taskid=3, stype=127 挑战 n 次清缴真主党
let myData = await G.mongodb.cPlayerInfo('qjzzd').findOne({ uid: uid, type: 'qjzzd' });
if (myData?.refreFightTime > PublicShared.getToDayZeroTime()) {
taskval["3"] = myData?.useFightNum || 0;
} else {
taskval["3"] = 0;
}
// taskid=4, stype=155 领取每日任务最终宝箱
let task = await G.mongodb.collection('task').findOne({ uid: uid, taskid: 25 });
if (task && task.lasttime >= today_zero_time && task.finish == 1) {
taskval["4"] = 1;
} else {
taskval["4"] = 0;
}
// taskid=5, stype=142 势力 配置xx 捐献进行 n 次捐献
let jxdata = await G.mongodb.collection('gonghuiUser').findOne({ uid: uid });
if (jxdata && jxdata.jx?.refreshTime > today_zero_time) {
if (jxdata.jx?.record) {
taskval["5"] = jxdata.jx.record["2"] || 0
}else{
taskval["5"] = 0
}
} else {
taskval["5"] = 0;
}
// taskid=6, stype=156 每日钻石消耗
taskval["6"] = 0;
let uselogs = (await G.mongodb.collection('rmbuse').find(
{ uid: uid, cTime: { $gte: today_zero_time }, isAdd: false },
{ projection: { change: 1 } }
).toArray()).forEach(e => { taskval["6"] += -e.change; });
// taskid=7, stype=122 进行 n 次快速探险
taskval["7"] = 0;
const data = await G.mongodb.collection('tanxian').findOne({ uid: uid });
if (data?.resetTime > PublicShared.getToDayZeroTime()) {
taskval["7"] = data.useFastGuaJiNum || 0
}
// taskid=8, stype=157 获得vip经验
let orde_logs = await G.mongodb.collection('payOrderLog' as any).find(
{ uid: uid, ctime: { $gte: today_zero_time * 1000 } },
).toArray();
taskval["8"] = 0;
orde_logs.forEach(e => {
let pay = G.gc.pay[e.payId];
if (pay) taskval["8"] += pay.payExp[0].n;
})
// taskid=9, stype=157 获得vip经验
taskval["9"] = 0;
orde_logs.forEach(e => {
let pay = G.gc.pay[e.payId];
if (pay) taskval["9"] += pay.payExp[0].n;
})
if (!init) {
await G.mongodb.cEvent(`yuandan${hdid}`).updateOne(
{ uid: uid, type: `yuandan${hdid}` },
{ $set: { taskval: taskval } }
)
} else {
hdata.taskval = taskval;
await G.mongodb.cEvent(`yuandan${hdid}`).updateOne({ uid: uid, type: `yuandan${hdid}` }, { $set: hdata }, { upsert: true })
}
console.log("玩家执行完成：", uid, taskval);
}
return "sucess!!!"
}
async run() {
await this.fun1(1);
}
}
async function main() {
await patchInit()
let patch = new Path();
await patch.run();
console.log("逻辑执行完成，等待退出");
setTimeout(function () {
console.log('结束程序');
process.exit();
}, 3000);
}
main();

3
src/global.ts
View File

@ -106,7 +106,8 @@ class _G {
/**跨服活动——消费竞赛的开启状态 */
huodong = {
xfjs: false
xfjs: false,
xfjsId: ''
};
private event = new EventEmitter();

4
src/json/playerHeadFrame.json
View File

@ -54,8 +54,8 @@
"undefined": "游轮竞技第1名获得，解锁后攻击加成+1%",
"img": "txk_016",
"cond": [
"time",
-1
"jjc_rank",
1
],
"intr": "playerheadFrame_des_4",
"sort": 4,

4
src/public/kaifujingsai.ts
View File

@ -27,7 +27,7 @@ async function setHeroLvCount(call) {
let score = R.sum(arrList.map(i => i.lv))
let rankKfjs = new RankKfjs(2)
let rankKfjs = RankKfjs(2)
rankKfjs.setDataAndCheck({
player: call.conn.gud,
valArr: [score]
@ -37,7 +37,7 @@ async function setHeroLvCount(call) {
async function setEquipLvCount(call) {
let status = getStatus()
if (status.type != 3) return
let rankKfjs = new RankKfjs(3)
let rankKfjs = RankKfjs(3)
let equips = await G.mongodb.collection('equip').find({
uid: call.uid,
wearaId: {$in: R.values(call.conn.gud.heroPos)}

6
src/public/player.ts
View File

@ -225,9 +225,9 @@ export class PlayerFun {
}
G.mongodb.collection('rmbuse').insertOne(data);
// 消费竞赛开启时写入跨服数据库
if (G.huodong.xfjs && !data.isAdd) {
G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid}, {
time: G.time,
if (G.huodong.xfjs && !data.isAdd && typeof data.change == 'number') {
G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid, type: `xfjs_${G.huodong.xfjsId}`}, {
$set: {time: G.time},
$inc: {change: data.change}
}, {upsert: true});
}

19
src/public/rank/rank.ts
View File

@ -12,8 +12,9 @@ import { RankWzryCross } from './rank_wzry';
import { RankXszm } from './rank_xszm';
import { RankZccg } from './rank_zccg';
import * as util from 'util'
import { RankKfjs } from "./rank_kfjs";
import { RankKfjs_1 } from "./rank_kfjs";
import { clusterRunOnce } from '../../clusterUtils';
import { number } from 'mathjs';
@ -33,8 +34,7 @@ export abstract class Rank {
zccg: RankZccg;
tujian: RankTujian;
wzryCross: RankWzryCross;
kfjs: RankKfjs
}> = {};
}> & k_v<Rank> = {};
queue = new Queue();
findKey = 'uid';
@ -109,7 +109,7 @@ export abstract class Rank {
}
constructor() {
Rank.list[this.getType()] = this;
Rank.list[this.getType() as string] = this;
this.cotr();
}
@ -135,7 +135,11 @@ export abstract class Rank {
//将db里的数据，写入到 rank:xxx:sort里
//写入的单条数据为： {uid:score}
this.db.find({ type: this.type }, {
// 首先清理redis中sort数据 在从数据库中初始化
await G.ioredis.del(this.getRedisKeySort);
this.db.find({ type: this.type }, {
projection: {
"idKey": 1,
"type": 1,
@ -263,7 +267,7 @@ export abstract class Rank {
}
return item;
})
if(ghid.length > 0){
if (ghid.length > 0) {
let ghinfo = await G.mongodb.collection("gonghui").find(
{ _id: { $in: ghid } }, { projection: { name: 1 } }
).toArray();
@ -302,7 +306,8 @@ export abstract class Rank {
})
}
return res.map(ele => ele.data).sort(this.compareSort) as any;
// 按照redis uids 排序顺序排序
return res.sort((a,b)=>uids.indexOf(a.idKey)-uids.indexOf(b.idKey)).map(ele => ele.data);
}
return []
}

64
src/public/rank/rank_kfjs.ts
View File

@ -1,23 +1,18 @@
import {rankType} from '../../shared/protocols/rank/PtlOpen';
import {rankInfo} from '../../shared/protocols/type';
import {Rank} from './rank';
import { rankType } from '../../shared/protocols/rank/PtlOpen';
import { rankInfo } from '../../shared/protocols/type';
import { Rank } from './rank';
import kfjsFun from "../kaifujingsai";
export class RankKfjs extends Rank {
export class RankKfjs_1 extends Rank {
ctype: string;
ortype: string
ctype: string
constructor(ctype) {
super();
this.ctype = ctype
this.ortype = `kfjs${kfjsFun.getStatus().type}`
get ortype() {
return `kfjs${kfjsFun.getStatus().type}`
}
getType(): rankType {
let status = kfjsFun.getStatus(this.ctype)
return <rankType>`kfjs${status.type}`;
return <rankType>`kfjs1`;
}
async setDataAndCheck(info: rankInfo) {
@ -26,4 +21,47 @@ export class RankKfjs extends Rank {
if (status.type == -1) return
this.addNew(info)
}
}
export class RankKfjs_2 extends RankKfjs_1 {
getType(): rankType {
return <rankType>`kfjs2`;
}
}
export class RankKfjs_3 extends RankKfjs_1 {
getType(): rankType {
return <rankType>`kfjs3`;
}
}
export class RankKfjs_4 extends RankKfjs_1 {
getType(): rankType {
return <rankType>`kfjs4`;
}
}
export class RankKfjs_5 extends RankKfjs_1 {
getType(): rankType {
return <rankType>`kfjs5`;
}
}
export class RankKfjs_6 extends RankKfjs_1 {
getType(): rankType {
return <rankType>`kfjs6`;
}
}
export class RankKfjs_7 extends RankKfjs_1 {
getType(): rankType {
return <rankType>`kfjs7`;
}
}
export function RankKfjs(type: number) {
return <RankKfjs_1>Rank.list[`kfjs${type}`]
}

18
src/public/scheduler/scheduler_xiaofeijingsai.ts
View File

@ -39,22 +39,20 @@ export class Scheduler_xfjs_Local_Ctor extends Scheduler {
let limit = _hd.data?.rank?.slice(-1)?.[0]?.rank?.slice(-1)?.[0] || 100
let rmbuse = await G.crossmongodb.collection('rmbuse').find({
time: {
$gte: _hd.stime,
$lte: _hd.etime + 10
}
}).sort({change: 1}).limit(limit).toArray()
let rmbuse = await G.crossmongodb.collection('rmbuse').find({type: `xfjs_${_hd.hdid}`}).sort({change: 1}).limit(limit).toArray()
let list: any = rmbuse.map(i => ({...i, total: R.negate(i.change)}))
let ranklist = sortRankList(_hd.data.rank, list)
let rankList = sortRankList(_hd.data.rank, list)
let userList = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i != 'system')}}).toArray()
rankList = rankList.map(i => ({...i, player: userList.find(v => v.uid == i.uid) || {}}))
R.forEach(i => {
let users = R.slice(i.rank[0] - 1, i.rank[1])(ranklist)
let users = R.slice(i.rank[0] - 1, i.rank[1])(rankList).filter(i => i._id != 'system')
users.map(v => {
if (v._id == 'system') return
if (G.config.serverId != users.sid) return;
if (G.config.serverId != v.player?.sid) return;
EmailFun.addEmail({
uid: v._id,
type: 'system',

9
src/setStartAfther.ts
View File

@ -28,6 +28,7 @@ import { addListener } from './globalListener';
import { SchedulerManage } from './public/scheduler/scheduler';
import {CrossEmailPull} from "./public/scheduler/scheduler_cross_email_pull";
import {Scheduler_xfjs_Local_Ctor} from "./public/scheduler/scheduler_xiaofeijingsai";
import { RankKfjs_1, RankKfjs_2, RankKfjs_3, RankKfjs_4, RankKfjs_5, RankKfjs_6, RankKfjs_7 } from './public/rank/rank_kfjs';
export async function startAfter() {
//事件监听和定时器初始化
@ -58,6 +59,14 @@ export async function startAfter() {
new RankSlzd5();
new RankSlzd6();
new RankKfjs_1();
new RankKfjs_2();
new RankKfjs_3();
new RankKfjs_4();
new RankKfjs_5();
new RankKfjs_6();
new RankKfjs_7();
new RankZccg();
new RankTujian();

2
src/shared/protocols/hongdian/PtlGet.ts
View File

@ -55,7 +55,7 @@ export type hongdianKey =
| 'pobinglibao'
| 'payForDiamond'
| 'leichonglibao'
| 'yuandan';
export type hongdianVal = {
show?: boolean;
// 看功能需要

7
src/shared/protocols/serviceProto.ts
View File

@ -15608,13 +15608,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
"type": "Literal",
"literal": "leichonglibao"
}
},
{
"id": 40,
"type": {
"type": "Literal",
"literal": "yuandan"
}
}
]
},