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

Merge branch 'bugfix' into dev

Browse Source
This commit is contained in:
xcy 2023-12-29 18:43:58 +08:00
commit 59a07175e6
14 changed files with 67 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ export default async function (call: ApiCall<ReqOpen, ResOpen>) {
let users = await G.crossmongodb.collection('huodong_user').find({uid: {$in: rankList.map(i => i._id).filter(i => i._id != '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
@ -57,7 +57,7 @@ export function sortRankList(rank, list) {
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})
rankList.push({...list[k - ccc], rank: k, _id: list[k - ccc].uid})
} else {
rankList.push({_id: 'system', total: i.need[0].n, rank: k, player: {}})
ccc += 1
@ -75,11 +75,11 @@ async function getMyData(call, rankList) {
let myCut: any = await G.crossmongodb.collection('rmbuse').findOne({uid: call.uid})
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.total), rank: -1, _id: myUser.uid}
}

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]

2
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

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/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]

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]

2
src/extends.ts
View File

@ -251,7 +251,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]

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)}

2
src/public/player.ts
View File

@ -227,7 +227,7 @@ export class PlayerFun {
// 消费竞赛开启时写入跨服数据库
if (G.huodong.xfjs && !data.isAdd) {
G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid}, {
time: G.time,
$set: {time: G.time},
$inc: {change: data.change}
}, {upsert: true});
}

8
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();
}

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

@ -4,20 +4,15 @@ import {Rank} from './rank';
import kfjsFun from "../kaifujingsai";
export class RankKfjs extends Rank {
export class RankKfjs_1 extends Rank {
ctype: string = "1";
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>`kfjs${this.ctype}`;
}
async setDataAndCheck(info: rankInfo) {
@ -27,3 +22,34 @@ export class RankKfjs extends Rank {
this.addNew(info)
}
}
export class RankKfjs_2 extends RankKfjs_1 {
ctype: string = "2"
}
export class RankKfjs_3 extends RankKfjs_1 {
ctype: string = "3"
}
export class RankKfjs_4 extends RankKfjs_1 {
ctype: string = "4"
}
export class RankKfjs_5 extends RankKfjs_1 {
ctype: string = "5"
}
export class RankKfjs_6 extends RankKfjs_1 {
ctype: string = "6"
}
export class RankKfjs_7 extends RankKfjs_1 {
ctype: string = "7"
}
export function RankKfjs(type: number) {
return <RankKfjs_1>Rank.list[`kfjs${type}`]
}

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();