diff --git a/js_docker_dev.js b/js_docker_dev.js index f9afc33..1a227e9 100644 --- a/js_docker_dev.js +++ b/js_docker_dev.js @@ -35,7 +35,7 @@ function dockerLogin() { const region = 'ap-northeast-1'; const instanceId = 'cri-fe5eqsg73zl4vd4m'; const version = '2018-12-01'; - const command = `aliyun cr GetAuthorizationToken --profile dev --region ${region} --InstanceId ${instanceId} --version ${version} --force`; + const command = `aliyun cr GetAuthorizationToken --profile heijiao-dev --region ${region} --InstanceId ${instanceId} --version ${version} --force`; const output = execSync(command, { encoding: 'utf8' }); const result = JSON.parse(output); const password = result.AuthorizationToken.replace(/"/g, ''); diff --git a/js_docker_prod.js b/js_docker_prod.js index 6920e3c..2f9f375 100644 --- a/js_docker_prod.js +++ b/js_docker_prod.js @@ -35,7 +35,7 @@ function dockerLogin() { const region = 'ap-northeast-1'; const instanceId = 'cri-azy285s79zw3ti5v'; const version = '2018-12-01'; - const command = `aliyun cr GetAuthorizationToken --profile prod --region ${region} --InstanceId ${instanceId} --version ${version} --force`; + const command = `aliyun cr GetAuthorizationToken --profile heijiao-prod --region ${region} --InstanceId ${instanceId} --version ${version} --force`; const output = execSync(command, { encoding: 'utf8' }); const result = JSON.parse(output); const password = result.AuthorizationToken.replace(/"/g, ''); diff --git a/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts b/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts new file mode 100644 index 0000000..958a0bf --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiDuiHuan.ts @@ -0,0 +1,41 @@ +import HQJGFun from "./fun"; +import { ApiCall } from "tsrpc"; +import { PlayerFun } from "../../../public/player"; +import { ReqDuiHuan, ResDuiHuan } from "../../../shared/protocols/event/huangqijiuguan/PtlDuiHuan"; + + + +export default async function (call: ApiCall) { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + if (!hd || Object.keys(hd).length <= 0) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let need = []; + let prize = []; + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + for (let id in call.req.dh) { + let con = hd.data.duihuan.filter(x => x.id == Number(id))[0]; + + if ((mydata.duihuan[id] || 0) + call.req.dh[id] > con.buyNum) { + return call.error("", { code: -2, message: globalThis.lng.hqjgtips_28 }) + } + + for (let i = 0; i < call.req.dh[id]; i++) { + need.push(...con.need); + prize.push(...con.prize); + } + + mydata.duihuan[id] = (mydata.duihuan[id] || 0) + call.req.dh[id]; + } + + // 检查消耗 + await PlayerFun.checkNeedIsMeet(call, need); + // 发送奖励 + await PlayerFun.sendPrize(call, prize); + // 记录兑换次数 + await HQJGFun.setMyData(call.uid, hd.hdid, { duihuan: mydata.duihuan }); + + call.succ({ prize: prize, data: mydata }) +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiFight.ts b/src/api_s2c/event/huangqijiuguan/ApiFight.ts new file mode 100644 index 0000000..b7f1085 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiFight.ts @@ -0,0 +1,40 @@ +import { ApiCall } from "tsrpc"; +import { ReqFight, ResFight } from "../../../shared/protocols/event/huangqijiuguan/PtlFight"; +import { HuoDongFun } from "../../../public/huodongfun"; +import HQJGFun from "./fun"; +import { fightResult } from "../../../shared/fightControl/fightType"; +import { FightFun } from "../../../public/fight"; + +export default async function (call: ApiCall) { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + + if (!hd) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + // 个人活动信息 + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + + // 开始战斗 + let result: fightResult = await FightFun.fightNpc(call, hd.data.bossId, 'hqjg'); + + let up = false; + let today = HQJGFun.today(hd); + // 历史最大伤害 + if (result.totalDamage[0] > mydata.bossres.maxdps) { + up = true; + mydata.bossres.maxdps = result.totalDamage[0]; + } + + // 今日最大伤害 + if (result.totalDamage[0] > (mydata.bossres.todaydps[today] || 0)) { + up = true; + mydata.bossres.todaydps[today] = result.totalDamage[0]; + } + + // 更新伤害数据 + up && await HQJGFun.setMyData(call.uid, call.req.hdid, { bossres: mydata.bossres }); + + call.succ({ data: mydata, result: result }); +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiOpen.ts b/src/api_s2c/event/huangqijiuguan/ApiOpen.ts new file mode 100644 index 0000000..660ba47 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiOpen.ts @@ -0,0 +1,15 @@ +import HQJGFun from "./fun"; +import { ApiCall } from "tsrpc"; +import { ReqOpen, ResOpen } from "../../../shared/protocols/event/huangqijiuguan/PtlOpen"; + +export default async (call: ApiCall) => { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + if (!hd || Object.keys(hd).length <= 0) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + + call.succ({ data: mydata }) +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiRankList.ts b/src/api_s2c/event/huangqijiuguan/ApiRankList.ts new file mode 100644 index 0000000..27cb7e1 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiRankList.ts @@ -0,0 +1,7 @@ +import { ApiCall } from "tsrpc"; +import { ReqRankList, ResRankList } from "../../../shared/protocols/event/huangqijiuguan/PtlRankList"; +import HQJGFun from "./fun"; + +export default async function (call: ApiCall) { + HQJGFun.getRankList(call.req.hdid).then(data => call.succ({ rankList: data })); +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts b/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts new file mode 100644 index 0000000..888b3b3 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiRecDpsPrize.ts @@ -0,0 +1,46 @@ +import { ApiCall } from "tsrpc"; +import HQJGFun, { Data } from "./fun"; +import { ReqRecDpsPrize, ResRecDpsPrize } from "../../../shared/protocols/event/huangqijiuguan/PtlRecDpsPrize"; +import { PlayerFun } from "../../../public/player"; + +export default async function (call: ApiCall) { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + + if (!hd) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let data = hd.data as Data + + // 个人活动信息 + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + + // 领取伤害奖励 + let prize = []; + for (let rec of call.req.recid) { + let con = data.bossTask.filter(x => x.id == rec)[0]; + + if (mydata.bossres.recdpstask.includes(con.id)) { + continue + } + + if (con.need > (mydata.bossres.maxdps || 0)) { + continue + } + + mydata.bossres.recdpstask.push(con.id); + prize = prize.concat(con.prize); + } + + if (prize.length <= 0) { + call.error("", { code: -2, message: lng.hqjgtips_27 }); + } else { + // 发送奖励 + await PlayerFun.sendPrize(call, prize); + // 设置领奖记录 + await HQJGFun.setMyData(call.uid, call.req.hdid, { bossres: mydata.bossres }); + } + + call.succ({ data: mydata, prize: prize }) +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts b/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts new file mode 100644 index 0000000..ae5d668 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiTaskRec.ts @@ -0,0 +1,52 @@ +import HQJGFun from "./fun"; +import { ApiCall } from "tsrpc"; +import { ReqTaskRec, ResTaskRec } from "../../../shared/protocols/event/huangqijiuguan/PtlTaskRec"; +import { PlayerFun } from "../../../public/player"; + +export default async function (call: ApiCall) { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + if (!hd || Object.keys(hd).length <= 0) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let today = HQJGFun.today(hd); + if (today < call.req.day) { + // 未到领取时间 + return call.error('', { code: -1, message: globalThis.lng.hqjgtips_29 }) + } + + let prize = []; + let taskday = `day${call.req.day}` + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + + for (let id of call.req.taskid) { + let con = hd.data.task[taskday][id]; + + if (!con) { + continue + } + + if (mydata.task.rec[taskday] && mydata.task.rec[taskday].includes(id)) { + continue + } + + if (!mydata.task.val[taskday] || (mydata.task.val[taskday][id] || 0) < con.pval) { + continue + } + + prize = prize.concat(con.prize); + mydata.task.rec[taskday] = (mydata.task.rec[taskday] || []).push(id) + } + + if (prize.length <= 0) { + return call.error("", { code: -2, message: globalThis.lng.hqjgtips_28 }) + } + + // 发送奖励 + await PlayerFun.sendPrize(call, prize); + // 设置领取记录 + await HQJGFun.setMyData(call.uid, call.req.hdid, mydata); + + call.succ({ data: mydata, prize: prize }); +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts b/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts new file mode 100644 index 0000000..0b22e98 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiZhaoMu.ts @@ -0,0 +1,48 @@ +import { ApiCall } from "tsrpc"; +import { ReqZhaoMu, ResZhaoMu } from "../../../shared/protocols/event/huangqijiuguan/PtlZhaoMu"; +import HQJGFun from "./fun"; +import { PlayerFun } from "../../../public/player"; +import { PublicShared } from "../../../shared/public/public"; + +export default async function (call: ApiCall) { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + if (!hd || Object.keys(hd).length <= 0) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let need = [{ a: hd.data.huobi.a, t: hd.data.huobi.t, n: hd.data.huobi.n * call.req.num }]; + + // 检测消耗 + await PlayerFun.checkNeedIsMeet(call, need); + + let prize = []; + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + + for (let n = 1; n <= call.req.num; n++) { + let num = mydata.zhaomu.num + n; + let baodi = hd.data.baodi.filter(x => x.num == num); + if (baodi.length > 0) { + // 触发保底 + prize = prize.concat(baodi[0].prize); + } else { + // 常规掉落 + let temp = PublicShared.randomDropAny<{ + a: string, t: string, n: number, p: number + }>( + hd.data.chouka.filter(x => x.cishu <= num) + ); + prize.push({ a: temp.a, t: temp.t, n: temp.n }); + } + mydata.zhaomu.num = num; + } + + // 扣除消耗 + await PlayerFun.cutNeed(call, need); + // 发送奖励 + await PlayerFun.sendPrize(call, prize); + // 设置抽卡数据 + await HQJGFun.setMyData(call.uid, call.req.hdid, { zhaomu: mydata.zhaomu }); + + call.succ({ data: mydata, prize: prize }) +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts b/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts new file mode 100644 index 0000000..6107988 --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/ApiZhaoMuPrizeRec.ts @@ -0,0 +1,42 @@ +import { ApiCall } from "tsrpc"; +import { ReqZhaoMuPrizeRec, ResZhaoMuPrizeRec } from "../../../shared/protocols/event/huangqijiuguan/PtlZhaoMuPrizeRec"; +import HQJGFun from "./fun"; +import { PlayerFun } from "../../../public/player"; + +export default async function (call: ApiCall) { + let hd = await HQJGFun.HdInfo(call, call.req.hdid); + if (!hd || Object.keys(hd).length <= 0) { + // 无此活动 + return call.error('', { code: -1, message: globalThis.lng.huodong_open_1 }) + } + + let prize = []; + let mydata = await HQJGFun.getMydata(call, call.req.hdid); + + for (let rec of call.req.recid) { + let con = hd.data.choukajiangli[rec.idx]; + + if (con.num > mydata.zhaomu.num || mydata.zhaomu.prize.includes(rec.idx)) { + continue + } + + if (con.dlz) { + prize.push(con.dlz[rec.sec]); + } else { + prize = prize.concat(con.prize); + } + + mydata.zhaomu.prize.push(rec.idx); + } + + if (prize.length <= 0) { + return call.error('', { code: -2, message: globalThis.lng.hqjgtips_28 }) + } + + // 发送奖励 + await PlayerFun.sendPrize(call, prize); + // 设置领取数据 + await HQJGFun.setMyData(call.uid, call.req.hdid, { zhaomu: mydata.zhaomu }); + + call.succ({ prize: prize, data: mydata }) +} \ No newline at end of file diff --git a/src/api_s2c/event/huangqijiuguan/fun.ts b/src/api_s2c/event/huangqijiuguan/fun.ts new file mode 100644 index 0000000..175420b --- /dev/null +++ b/src/api_s2c/event/huangqijiuguan/fun.ts @@ -0,0 +1,334 @@ +import { ApiCall } from "tsrpc" +import { ReqAddHuoDong } from "../../../monopoly/protocols/PtlAddHuoDong" +import { HuoDongFun } from "../../../public/huodongfun" +import { PublicShared } from "../../../shared/public/public" +import { EmailFun } from "../../../public/email" + +// hddata.data +export interface Data { + show: 1 + task: { + [k: `day${number}`]: { + [k: string]: { pval: number, stype: string, cond: string[], tiaozhuan: number, prize: atn[], des: string } + } + } + + huobi: atn // 抽卡货币 + bossId: number // boss表的ID + + // boss排行邮件 + bossRank_des: string + bossRank_title: string + + // boss挑战等级奖励邮 + bossLvReward_des: string + bossLvReward_title: string + + chouka: { a: string, t: string, n: number, p: number, gailv: number, cishu: number }[] + + choukajiangli: { num: number, prize?: any[], dlz: { [k: string]: atn } }[] + + baodi: { num: number, prize: any[] }[] + + gift: { id: number, free: boolean, payId: string, buynum: number, prize: atn[] }[] + + duihuan: { id: number, need: atn[], prize: atn[], buyNum: number }[] + + bossLvReward: { lv: number, need: number, prize: atn[] }[] + + bossTask: { id: number, need: number, prize: atn[] }[] + + bossRank: { id: string, rank: [number, number], prize: atn[] } +} + +export interface PlayerData { + // 招募数据 + zhaomu: { + // 招募次数 + num: number + // 次数奖励领取记录 + prize: number[] + }; + + // 任务计数 + task: { + rec: { [k: `day${number}`]: number[] } + val: { [k: `day${number}`]: { [id: string]: number } } + }, + + // 礼包购买记录 + giftbuy: { [id: string]: { num: number, select: number[] } } + + // 兑换次数记录 + duihuan: { [id: string]: number } + + // boss挑战数据 + bossres: { + // 历史最大伤害 + maxdps: number + // 今日最大伤害 + todaydps: { + [k: string]: number + } + // 今日奖励领取记录 + recdpstask: number[] + } + + // 最后修改数据时间 + lasttime: number +} + +export default class HQJGFun { + static get htype() { + return 15 + }; + + static rankkey(hdid: number) { + return `rank:huangqijiuguan_${hdid}` + } + + /** 默认数据 */ + static get defaultData() { + return { + zhaomu: { + num: 0, + prize: [] + }, + task: { + val: {}, + rec: {} + }, + giftbuy: {}, + duihuan: {}, + bossres: { + maxdps: 0, + zhanli: 0, + todaydps: {}, + recdpstask: [] + }, + lasttime: 0 + } + } + + static today(hdinfo: ReqAddHuoDong) { + /** + * 获取活动开启到第几天 从1开始 + */ + return PublicShared.getDiff(hdinfo.stime, G.time) + } + + /** + * 获取排行榜 + */ + static async getRankList(hdid: number) { + let uids = await G.mongodb.collection("event").find( + { type: this.dataType(hdid) }, + { + sort: { "bossres.maxdps": -1, "bossres.zhanli": -1 }, + projection: { uid: 1, bossres: 1 } + } + ).limit(50).toArray(); + + let userinfo = await G.mongodb.collection('user').find( + { uid: { $in: uids.map(v => v.uid) } }, + ).toArray(); + + let res = []; + for (let rank = 1; rank <= uids.length; rank++) { + let uid = uids[rank - 1].uid; + let user = userinfo.find(v => v.uid == uid); + if (user) { + res.push({ rank, ...user, valArr: [uids[rank - 1].bossres.maxdps] }); + } + } + + return res + } + + /** 数据类型 */ + static dataType(hdid: number) { + return `huangqijiuguan_${hdid}` as `huangqijiuguan_${number}` + } + + /** 获取活动数据 */ + static async HdInfo(call: ApiCall, hdid?: number): Promise { + if (!hdid) { + let hdlist = await HuoDongFun.gethdList( + call, this.htype + ); + return hdlist.length > 0 ? hdlist[0] : null + } else { + return await HuoDongFun.getHdidInfo(call, hdid) as any as ReqAddHuoDong & { data: Data } + } + } + + + /** 获取我的数据 */ + static async getMydata(call: ApiCall, hdid?: number) { + if (!hdid) { + hdid = (await HQJGFun.HdInfo(call)).hdid; + } + let data = await G.mongodb.cEvent(this.dataType(hdid)).findOne({ + uid: call.uid, type: this.dataType(hdid) + }, { projection: { _id: 0 } }); + + if (!data) { + data = (await G.mongodb.cEvent(this.dataType(hdid)).findOneAndUpdate({ + uid: call.uid, type: this.dataType(hdid) + }, { + $set: this.defaultData + }, { upsert: true, returnDocument: 'after', projection: { _id: 0 } })).value; + } + + return data + } + + /** 设置我的数据 */ + static async setMyData(uid: string, hdid: number, update: { [k in keyof Partial]: PlayerData[k] }) { + if (!update.lasttime) { + update.lasttime = G.time; + } + + let res = await G.mongodb.cEvent(this.dataType(hdid)).updateOne( + { uid: uid, type: this.dataType(hdid) }, { $set: update } + ); + + if (res.upsertedCount <= 0) { + await G.mongodb.cEvent(this.dataType(hdid)).updateOne( + { uid: uid, type: this.dataType(hdid) }, { $set: Object.assign(this.defaultData, update) } + ); + } + } + + static async buy(call: ApiCall, payId: string) { + let hddata = await this.HdInfo(call); + + if (!hddata) { // 活动不存在 + return + } + + let mydata = await this.getMydata(call); + await this.setMyData(call.uid, (await this.HdInfo(call)).hdid, mydata); + } + + /** + * 每日伤害等级奖励结算 + */ + static async dayDpsLvPrize(time: number) { + console.log( + "黄旗酒馆 每日伤害等级奖励结算 开始执行。。。" + ) + // 取stime小于当前时间的最后一条数据 + let hdinfo = await G.mongodb.collection("hdinfo").find({ + htype: this.htype, stime: { $lte: time } + }, { sort: { stime: -1 } }).limit(1).toArray(); + + // 没有活动数 + if (hdinfo.length <= 0) { + return + } + + let hd = hdinfo[0]; + let hdid = hdinfo[0].hdid; + // 活动结束 + if (hd.etime < G.time - 300) { + return + } + + let today = PublicShared.getDiff(hd.stime, G.time - 300); + G.mongodb.collection("event").find({ type: `huangqijiuguan_${hdid}` }).toArray().then(datas => { + let hddata = hd.data as Data; + for (let i = 0; i < datas.length; i++) { + let data = datas[i]; + + let lvprize: { lv: number; need?: number; prize?: atn[] }; + let dps = data.bossres.todaydps[today] || 0; + for (let lvinfo of hddata.bossLvReward) { + if (dps < lvinfo.need) { + continue; + } + if (!lvprize || lvprize.lv < lvinfo.lv) { + lvprize = lvinfo; + } + } + + if (!lvprize) continue + let title = hddata.bossLvReward_title; + let content = hddata.bossLvReward_des; + EmailFun.addEmail({ + uid: data.uid, + title: title, + type: "system", + content: content, + prize: lvprize.prize, + contentInsertArr: [lvprize.lv], + }) + } + console.log( + "黄旗酒馆 每日伤害等级奖励结算 执行完成！！！" + ) + }) + } + + /** + * 最大伤害排行奖励结算 + */ + static async endDpsRankPrize(time: number) { + console.log( + "黄旗酒馆 最大伤害排行奖励结算 开始执行。。。" + ) + let today = PublicShared.getToDayZeroTime(time + 300); + let yesterday = PublicShared.getToDayZeroTime(time - 300); + + // 查询昨天23:59:00或者今天00:00:00结束的活动 + let hdinfo = await G.mongodb.collection("hdinfo").find({ + htype: this.htype, rtime: { $gt: yesterday, $lte: today } + }).toArray(); + + // 没有活动数 + if (hdinfo.length <= 0) { + return + } + + let hd = hdinfo[0]; + let hdid = hdinfo[0].hdid; + if (hd.data.sendrank) { + return + } + + let uids = await G.mongodb.collection("event").find( + { type: this.dataType(hdid) }, + { + sort: { "bossres.maxdps": -1, "bossres.zhanli": -1 }, + projection: { uid: 1, bossres: 1 } + } + ).toArray(); + + for (let rank = 1; rank <= uids.length; rank++) { + let con = hd.data.bossRank.filter( + (x: { rank: number[] }) => rank >= x.rank[0] && rank <= x.rank[1] + )[0]; + if (!con) continue; + // 发送排名奖励 + await EmailFun.addEmail({ + uid: uids[rank - 1].uid, + title: hd.data.bossRank_title, + type: "system", + content: hd.data.bossRank_des, + prize: con.prize, + contentInsertArr: [rank], + }) + } + // 标记已发送 + await G.mongodb.collection("hdinfo").updateOne( + { hdid: hdid }, { $set: { "data.sendrank": true } } + ); + + console.log( + "黄旗酒馆 最大伤害排行奖励结算 执行结束！！！" + ) + } +} + +G.on("NEW_DAY", HQJGFun.dayDpsLvPrize.bind(HQJGFun)); +G.on("NEW_DAY", HQJGFun.endDpsRankPrize.bind(HQJGFun)); \ No newline at end of file diff --git a/src/api_s2c/event/zhanling/ApiOpen.ts b/src/api_s2c/event/zhanling/ApiOpen.ts index e6dc37b..183f741 100644 --- a/src/api_s2c/event/zhanling/ApiOpen.ts +++ b/src/api_s2c/event/zhanling/ApiOpen.ts @@ -24,7 +24,10 @@ export default async function (call: ApiCall) { await PayFun.delPayLog( call.uid, { payId: G.gc.zhanling.payId, val: [] } ); - + // 战令重置的时候需要删除所有的任务进度，但是每天的任务进度不做处理，因为每天会自然重置，怕玩家会刷 + // ZhanLingTasks.clearLog(call.uid, 'day'); + ZhanLingTasks.clearLog(call.uid, 'week'); + ZhanLingTasks.clearLog(call.uid, 'round'); data = (await G.mongodb.cEvent('zhanling').findOneAndUpdate({ uid: call.uid, type: 'zhanling' diff --git a/src/api_s2c/heroskin/ApiUplv.ts b/src/api_s2c/heroskin/ApiUplv.ts index dc281e2..667c448 100644 --- a/src/api_s2c/heroskin/ApiUplv.ts +++ b/src/api_s2c/heroskin/ApiUplv.ts @@ -18,6 +18,8 @@ export default async function (call: ApiCall) { need = need.concat( G.gc.heroSkinLv[skinconf.colour][cur_lv + i].need ) + let conf = G.gc.heroSkin[call.req.skid]; + need.push({ a: "item", "t": conf.heroId, "n": G.gc.heroSkinLv[skinconf.colour][cur_lv + i].suipian }); } // 检测消耗 diff --git a/src/api_s2c/jjc/ApiOpen.ts b/src/api_s2c/jjc/ApiOpen.ts index 700ada3..0d6b0ee 100644 --- a/src/api_s2c/jjc/ApiOpen.ts +++ b/src/api_s2c/jjc/ApiOpen.ts @@ -30,6 +30,6 @@ export default async function (call: ApiCall) { }); UserFun.activeHeadFrame(call.uid, 'jjc_rank', data["rank"] + 1); - JJCFun.checkUpdatePlayer() + //JJCFun.checkUpdatePlayer() } \ No newline at end of file diff --git a/src/fix_patch/patch_20240109-1.ts b/src/fix_patch/patch_20240109-1.ts new file mode 100644 index 0000000..d20f380 --- /dev/null +++ b/src/fix_patch/patch_20240109-1.ts @@ -0,0 +1,119 @@ +import { patchFun, patchInit } from "../patch"; +import { PublicShared } from "../shared/public/public"; +import { JJCFun } from "../public/jjc"; + +function getRankPrize(rank: number, conf?: typeof G.gc.jjc_ph['']) { + if (!conf) { + conf = Object.values(G.gc.jjc_ph).filter(v => rank >= v.ph[0] && rank <= v.ph[1])[0]; + } + if (conf) { + return [...conf.prize, { a: 'item', t: '11', n: typeof conf.rongyuprize == 'number' ? conf.rongyuprize : PublicShared.eval(conf.rongyuprize, { a: rank }) }]; + } else { + return []; + } +} + +class Path { + + async addEmail(email, isCross = false) { + let { prize, uid, ...e } = email; + let lng = await G.redis.rawGet(`user:lng:${uid}`); + let sendEmail = { + _id: null, + uid: uid, + type: e.type, + title: e.lngTitle ? (e.lngTitle[lng] || e.lngTitle['ja']) : e.title, + content: e.lngContent ? (e.lngContent[lng] || e.lngContent['ja']) : e.content, + createTime: e.createTime || G.time, + contentInsertArr: e.contentInsertArr || [] + } as any; + + /**跨服邮件给sid标识*/ + // if (isCross) { + // sendEmail.sid = uid.split('_')[0]; + // } + if ((prize === null || prize === void 0 ? void 0 : prize.length) > 0) { + sendEmail.prizeData = { + prize: email.prize, + isGet: false + }; + } + if (email.g123log && Object.keys(email.g123log).length > 0) + sendEmail.g123log = email.g123log; + + if (email.lngTitle) { + sendEmail.lngTitle = email.lngTitle; + sendEmail.lngContent = email.lngContent; + } + //太亏了！换其他清理机制，getAllEmail是性能消耗大户 + //todo.. 换其他清理机制 + // if (!isCross) { + // let emailList = await this.getAllEmail(uid); + // if (emailList.length >= 50) { + // emailList.sort((a, b) => { + // let noPrizeA = a.prizeData == undefined ? 0 : 1; + // let noPrizeB = b.prizeData == undefined ? 0 : 1; + // let getA = a.prizeData?.isGet == true ? 0 : 1; + // let getB = b.prizeData?.isGet == true ? 0 : 1; + // if (noPrizeA != noPrizeB) { + // return noPrizeA - noPrizeB; + // } else if (getA != getB) { + // return getA - getB; + // } + // return a.createTime - b.createTime; + // }); + // this.removeEmail(uid, emailList[0]._id); + // G.server.sendMsgByUid(uid, 'msg_s2c/EmailDel', emailList[0]._id); + // } + // } + //@ts-ignore + await G.mongodb.collection('email').insertOne({ + ttl: new Date(), ...G.mongodb.conversionIdObj(sendEmail) + }) + } + + async sendEmail(uid: string, rank: number, prize: atn[]) { + + if (uid.indexOf('npc_') != -1) return; + + await this.addEmail({ + uid: uid, + type: 'system', + title: G.gc.jjc_com.email.titel, + content: G.gc.jjc_com.email.content, + prize: prize, + contentInsertArr: [rank] + }); + } + async fun1(a: any) { + for (let conf of Object.values(G.gc.jjc_ph)) { + let players = await JJCFun.getRankListUid(conf.ph[0] - 1, conf.ph[1]); + + for (let index = 0; index < players.length; index++) { + let uid = players[index]; + await this.sendEmail(uid, conf.ph[0] + index, getRankPrize(conf.ph[0] + index, conf)); + console.log("sendEmail", uid, conf.ph[0] + index) + } + } + + 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(); diff --git a/src/fix_patch/patch_20240109.ts b/src/fix_patch/patch_20240109.ts new file mode 100644 index 0000000..fa6453e --- /dev/null +++ b/src/fix_patch/patch_20240109.ts @@ -0,0 +1,684 @@ +import { patchFun, patchInit } from "../patch"; + +class Path { + + async fun1(a: any) { + const con = { + "16_6575db20f6ef8b7da5c8f1fd": { + "item": { + "1": 55400000, + "12": 10600, + "2": 223000, + "6": 690 + }, + "attr": { + "rmbmoney": 30500, + "jinbi": 2850000000 + } + }, + "15_6575a14b2f930bd5e51ccde9": { + "item": { + "1": 137200000, + "12": 16600, + "2": 273700, + "6": 1735 + }, + "attr": { + "rmbmoney": 35200, + "jinbi": 3420000000 + } + }, + "10_6573c51480a92f081d78e1d9": { + "item": { + "1": 35600000, + "12": 13000, + "2": 67800, + "6": 1180 + }, + "attr": { + "rmbmoney": 12400, + "jinbi": 630000000 + } + }, + "10_6573ecd9a884822d24482a1a": { + "item": { + "1": 103200000, + "18": 9490, + "12": 28000, + "2": 421600, + "6": 1300 + }, + "attr": { + "rmbmoney": 53400, + "jinbi": 5210000000 + } + }, + "11_657412487fe3541fe7241a60": { + "item": { + "1": 35000000, + "12": 99300, + "2": 110900, + "6": 460 + }, + "attr": { + "rmbmoney": 19200, + "jinbi": 1830000000 + } + }, + "11_657436eb3bc021c4e335f356": { + "item": { + "1": 197200000, + "12": 243700, + "2": 597200, + "6": 2475 + }, + "attr": { + "rmbmoney": 97400, + "jinbi": 9930000000 + } + }, + "11_657428e87fe3541fe7245b75": { + "item": { + "1": 71200000, + "12": 64300, + "2": 219300, + "6": 910 + }, + "attr": { + "rmbmoney": 37300, + "jinbi": 3630000000 + } + }, + "10_6573aeb2602e0a72e8279b54": { + "item": { + "1": 17800000, + "12": 22300, + "2": 58100, + "6": 240 + }, + "attr": { + "rmbmoney": 10500, + "jinbi": 940000000 + } + }, + "11_657447453bc021c4e3362403": { + "item": { + "1": 322000000, + "18": 31290, + "12": 134800, + "2": 1297200, + "6": 4035 + }, + "attr": { + "rmbmoney": 162900, + "jinbi": 16160000000 + } + }, + "11_657405957b27be6c2f4cac11": { + "item": { + "1": 18600000, + "18": 1050, + "12": 74500, + "2": 79900, + "6": 245 + }, + "attr": { + "rmbmoney": 12000, + "jinbi": 980000000 + } + }, + "14_6575004f7aecd430eb86fbb5": { + "item": { + "1": 44000000, + "18": 3440, + "12": 104800, + "2": 182600, + "6": 545 + }, + "attr": { + "rmbmoney": 25300, + "jinbi": 2270000000 + } + }, + "16_6575d6ac2e4ba33a00a04cbc": { + "item": { + "1": 36600000, + "12": 13000, + "2": 108200, + "6": 470 + }, + "attr": { + "rmbmoney": 19100, + "jinbi": 1870000000 + } + }, + "12_6574823b27bd4264da470583": { + "item": { + "1": 8800000, + "12": 123000, + "2": 37500, + "6": 115 + }, + "attr": { + "rmbmoney": 7300, + "jinbi": 530000000 + } + }, + "16_6575b61caff1b610d8bc6c96": { + "item": { + "24": 6, + "10": 200, + "12": 55000, + "600": 20, + "18": 1400, + "1": 16200000, + "2": 64900, + "6": 180, + "9": 3500 + }, + "attr": { + "rmbmoney": 14400, + "jinbi": 840000000 + } + }, + "14_6574f2e66c7af0fe3713b718": { + "item": { + "1": 48800000, + "12": 12700, + "2": 90900, + "6": 655 + }, + "attr": { + "rmbmoney": 12400, + "jinbi": 1100000000 + } + }, + "11_65740da4deb68620911e96ef": { + "item": { + "1": 64200000, + "18": 5580, + "12": 28300, + "2": 265400, + "6": 820 + }, + "attr": { + "rmbmoney": 33800, + "jinbi": 3270000000 + } + }, + "15_657594c3a7981612a8ea7e0e": { + "item": { + "1": 96800000, + "18": 8870, + "12": 3700, + "2": 397200, + "6": 1230 + }, + "attr": { + "rmbmoney": 50400, + "jinbi": 4920000000 + } + }, + "11_657434f8290f4393568f16fe": { + "item": { + "1": 129000000, + "12": 198300, + "2": 392100, + "6": 1630 + }, + "attr": { + "jinbi": 6500000000 + } + }, + "14_657512ee7aecd430eb872b5d": { + "item": { + "1": 121800000, + "12": 36400, + "2": 363400, + "6": 1530 + }, + "attr": { + "rmbmoney": 31500, + "jinbi": 6150000000 + } + }, + "11_657454089beef4c060edab88": { + "item": { + "1": 96600000, + "18": 8660, + "12": 149200, + "2": 392900, + "6": 1215 + }, + "attr": { + "rmbmoney": 49800, + "jinbi": 4890000000 + } + }, + "10_6573e8aa80a92f081d7930b4": { + "item": { + "1": 242400000, + "18": 16210, + "12": 84100, + "2": 978800, + "6": 3040 + }, + "attr": { + "rmbmoney": 123100, + "jinbi": 12180000000 + } + }, + "11_6573fd7a08e89e5a6859446e": { + "item": { + "1": 178200000, + "18": 16230, + "12": 10900, + "2": 717000, + "6": 2225 + }, + "attr": { + "rmbmoney": 92000, + "jinbi": 8990000000 + } + }, + "11_65744fe2d0256beb85eed193": { + "item": { + "1": 262800000, + "18": 25540, + "12": 55800, + "2": 1057600, + "6": 3275 + }, + "attr": { + "rmbmoney": 134000, + "jinbi": 13190000000 + } + }, + "11_657440e7ee44bd9935bbbd7c": { + "item": { + "1": 83000000, + "18": 7160, + "12": 250900, + "2": 341800, + "6": 1055 + }, + "attr": { + "rmbmoney": 43300, + "jinbi": 4220000000 + } + }, + "11_657420932dd070117eb15e92": { + "item": { + "1": 307400000, + "18": 29210, + "12": 50200, + "2": 1239200, + "6": 3880 + }, + "attr": { + "jinbi": 15470000000 + } + }, + "14_65750da36439ef15582d6e6d": { + "item": { + "1": 105000000, + "12": 93900, + "2": 361000, + "6": 1335 + }, + "attr": { + "rmbmoney": 54100, + "jinbi": 5310000000 + } + }, + "12_6574762427bd4264da46ce63": { + "item": { + "1": 44400000, + "18": 3390, + "12": 15900, + "2": 185000, + "6": 555 + }, + "attr": { + "rmbmoney": 25000, + "jinbi": 2290000000 + } + }, + "16_6575e1625685671e63fe001f": { + "item": { + "1": 12600000, + "2": 51400, + "6": 155 + }, + "attr": { + "rmbmoney": 9200, + "jinbi": 710000000 + } + }, + "10_6573e236a884822d244816a0": { + "item": { + "1": 76200000, + "18": 6760, + "12": 79600, + "2": 310200, + "6": 945 + }, + "attr": { + "rmbmoney": 40700, + "jinbi": 3870000000 + } + }, + "10_6573a17268053554fe606611": { + "item": { + "1": 109200000, + "18": 9410, + "12": 58000, + "2": 428000, + "6": 2365 + }, + "attr": { + "rmbmoney": 55000, + "jinbi": 5240000000 + } + }, + "15_657595a3a7981612a8ea8009": { + "item": { + "1": 19200000, + "18": 830, + "12": 74800, + "2": 84100, + "6": 1115 + }, + "attr": { + "rmbmoney": 11300, + "jinbi": 990000000 + } + }, + "11_657438a83bc021c4e335f86e": { + "item": { + "1": 71200000, + "18": 6300, + "12": 55600, + "2": 292500, + "6": 905 + }, + "attr": { + "rmbmoney": 37200, + "jinbi": 3600000000 + } + }, + "10_6573e0395fe4caaf29a9b83c": { + "item": { + "1": 9000000, + "12": 184000, + "2": 45800, + "6": 135 + }, + "attr": { + "rmbmoney": 6400, + "jinbi": 530000000 + } + }, + "10_6573e596dc05fa03150d7db1": { + "item": { + "1": 12800000, + "18": 410, + "12": 15400, + "2": 60000, + "6": 175 + }, + "attr": { + "rmbmoney": 8200, + "jinbi": 690000000 + } + }, + "14_65752c79c85dd4cf1a874893": { + "item": { + "1": 14200000, + "12": 33700, + "2": 64500, + "6": 185 + }, + "attr": { + "rmbmoney": 8900, + "jinbi": 790000000 + } + }, + "12_657455ed6b804f4a6d4b53a2": { + "item": { + "1": 160800000, + "18": 14900, + "12": 4800, + "2": 650900, + "6": 2025 + }, + "attr": { + "rmbmoney": 82000, + "jinbi": 8080000000 + } + }, + "12_657481316ad7b8861da8a914": { + "item": { + "1": 5600000, + "18": 450, + "12": 34600, + "2": 25500, + "6": 65 + }, + "attr": { + "rmbmoney": 7800, + "jinbi": 300000000 + } + }, + "4_6571c11bb0b5337a4d3a63a0": { + "item": { + "24": 7, + "10": 400, + "12": 15600, + "600": 50, + "18": 190, + "1": 5200000, + "2": 16300, + "6": 10, + "9": 8500 + }, + "attr": { + "rmbmoney": 8800, + "jinbi": 310000000 + } + }, + "10_6573714bc7069a58e96ba077": { + "item": { + "1": 14400000, + "18": 610, + "12": 11800, + "2": 66400, + "6": 190 + }, + "attr": { + "rmbmoney": 9000, + "jinbi": 770000000 + } + }, + "11_65744ba29beef4c060ed803c": { + "item": { + "1": 331800000, + "12": 14800, + "2": 1001400, + "6": 4155 + }, + "attr": { + "rmbmoney": 167500, + "jinbi": 16670000000 + } + }, + "16_6575d57c5685671e63fdb6ee": { + "item": { + "1": 13600000, + "12": 42700, + "2": 44500, + "6": 420 + }, + "attr": { + "rmbmoney": 7000, + "jinbi": 430000000 + } + }, + "11_65743bb09beef4c060ed46e7": { + "item": { + "10": 300, + "12": 8100, + "600": 30, + "18": 920, + "1": 18400000, + "2": 69600, + "6": 170, + "9": 4500 + }, + "attr": { + "rmbmoney": 13700, + "jinbi": 950000000 + } + }, + "10_6573bb4b68053554fe60940c": { + "item": { + "1": 19400000, + "18": 1080, + "12": 63000, + "2": 83100, + "6": 235 + }, + "attr": { + "rmbmoney": 12300, + "jinbi": 1010000000 + } + }, + "16_6575d97df2211cd2ff29ba12": { + "item": { + "1": 3400000, + "12": 11100, + "2": 16700, + "6": 50 + }, + "attr": { + "rmbmoney": 5000, + "jinbi": 250000000 + } + }, + "11_657434c6d0256beb85ee6fae": { + "item": { + "1": 80600000, + "18": 7360, + "12": 232000, + "2": 332200, + "6": 1025 + }, + "attr": { + "rmbmoney": 42100, + "jinbi": 4090000000 + } + }, + "16_6575b6d0f6ef8b7da5c84bf0": { + "item": { + "1": 70600000, + "12": 29700, + "2": 218200, + "6": 900 + }, + "attr": { + "rmbmoney": 36000, + "jinbi": 3610000000 + } + }, + "10_6587fbf00c11d852663c5bbb": { + "item": { + "1": 26800000, + "18": 1940, + "12": 168000, + "2": 118300, + "6": 350 + }, + "attr": { + "rmbmoney": 15300, + "jinbi": 1410000000 + } + }, + "10_657397c2f31ed0c046ef3730": { + "item": { + "1": 220800000, + "18": 1900, + "12": 8800, + "2": 701400, + "6": 2780 + }, + "attr": { + "rmbmoney": 112100, + "jinbi": 11100000000 + } + } + } + + const uids = Object.keys(con); + let _users = await G.mongodb.find('user', { uid: { $in: uids } }) + for (let i = 0; i < _users.length; i++) { + let user = _users[i] + const uid = user.uid + const _delattr = con[uid]["attr"] + const _delitem = con[uid]["item"] + let _setUserData = {} + let _dellog = { "attr": {}, "item": {} } + for (let t in _delattr) { + if (t == "rmbmoney") { + let v = user.rmbmoney - _delattr[t] + if (v < 0) { v = 0 } + _setUserData[t] = v + _dellog["attr"][t] = { "old": user.rmbmoney, "new": v } + } + else if (t == "jinbi") { + let v = user.jinbi - _delattr[t] + if (v < 0) { v = 0 } + _setUserData[t] = v + _dellog["attr"][t] = { "old": user.jinbi, "new": v } + } + } + + const itemIds = Object.keys(_delitem); + // 删除item + let _itemlist = await G.mongodb.collection('item').find({ "uid": uid, "itemId": { "$in": itemIds } }).toArray(); + for (let i = 0; i < _itemlist.length; i++) { + const _item = _itemlist[i] + const _itemid = _item.itemId + const del = _delitem[_itemid] || 0 + let v = _item.num - del + if (v < 0) { v = 0 } + let _setItemData = {} + _setItemData["num"] = v + _dellog["item"][_itemid] = { "old": _item.num, "new": v } + await G.mongodb.collection('item').updateOne({ "uid": uid, "itemId": _itemid }, { "$set": _setItemData }); + } + await G.mongodb.collection('user').updateOne({ "uid": uid }, { "$set": _setUserData }); + // 输出日志 + console.log(uid, ":", _dellog); + } + + 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(); diff --git a/src/fix_patch/patch_20240110.ts b/src/fix_patch/patch_20240110.ts new file mode 100644 index 0000000..103ec36 --- /dev/null +++ b/src/fix_patch/patch_20240110.ts @@ -0,0 +1,51 @@ +import { patchInit } from "../patch"; + + +class Path { + + async fun1(a: any) { + let taskType = 2; + let users = await G.mongodb.collection('user').find({ loginTime: { $gte: 1704643200 } }).toArray(); + for (let i = 0; i < users.length; i++) { + let user = users[i]; + let unFinishTask = (await G.mongodb.collection('task').find({ + uid: user.uid, type: taskType, finish: 0 + }, { projection: { taskid: 1 } }).toArray()).map(i => i.taskid); + + if (unFinishTask.length >= 2) { + for (let taskid of unFinishTask) { + let con = G.gc.task[taskType][taskid]; + if (!con) { + await G.mongodb.collection("task").deleteOne({ + uid: user.uid, taskid: taskid + }); + console.log(`删除玩家${user.uid}任务:${taskid}`); + } + if (unFinishTask.includes(con.pretask)) { + await G.mongodb.collection("task").deleteOne({ + uid: user.uid, taskid: taskid + }); + console.log(`删除玩家${user.uid}任务:${taskid}`); + } + } + } + } + } + + + 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(); diff --git a/src/globalListener.ts b/src/globalListener.ts index 57fee50..d396c76 100644 --- a/src/globalListener.ts +++ b/src/globalListener.ts @@ -15,13 +15,14 @@ import { ZhanLingTasks } from './public/zhanling'; import { player } from './shared/protocols/user/type'; import { PublicShared } from './shared/public/public'; import { setGud } from './public/gud'; -import {checkResetBuyLog} from "./api_s2c/event/zhoumolibao/ApiOpen"; -import {Christmasfun} from "./api_s2c/event/christmas/fun"; -import {PushGiftFun} from "./public/pushgift"; -import {LeiChongLiBaoBuyGift} from "./api_s2c/event/leichonglibao/ApiReceive"; +import { checkResetBuyLog } from "./api_s2c/event/zhoumolibao/ApiOpen"; +import { PushGiftFun } from "./public/pushgift"; +import { LeiChongLiBaoBuyGift } from "./api_s2c/event/leichonglibao/ApiReceive"; import { HongDianChange } from './api_s2c/hongdian/fun'; export type gEventType = { + /**新的一天 */ + NEW_DAY: (time: number) => void; /**玩家断开连接 */ PLAYER_DISCONNECT: (uid: string) => void; /**玩家修改名字 */ @@ -165,7 +166,7 @@ export function addListener() { XstaskFun.uidTask[uid] = null; delete XstaskFun.uidTask[uid]; } - setGud(uid,{ logoutTime: G.time }); + setGud(uid, { logoutTime: G.time }); G.mongodb.collection('user').updateOne({ uid: uid }, { $set: { logoutTime: G.time } }); }); @@ -177,7 +178,7 @@ export function addListener() { } }); - G.on('PLAYER_PAY', async (player, payId, payArgs,call) => { + G.on('PLAYER_PAY', async (player, payId, payArgs, call) => { let conf: any = await PayFun.getConf(payId, payArgs); ActionLog.addDayLog(player.uid, { key: 'pay', val: conf.payExp[0].n }); ActionLog.addRetainLog(player.uid, { key: 'pay', val: conf.payExp[0].n }); diff --git a/src/jsonType.ts b/src/jsonType.ts index 93e06a4..87cc3f9 100644 --- a/src/jsonType.ts +++ b/src/jsonType.ts @@ -1825,6 +1825,7 @@ type gc_hero_skin = { type gc_hero_skin_lv = { [colour: string]: { [lv: string]: { + suipian: number buff: { [k: string]: number } need: { a: string, t: string, n: number }[]; } diff --git a/src/lng.ts b/src/lng.ts index b399088..55bd6f7 100644 --- a/src/lng.ts +++ b/src/lng.ts @@ -359,6 +359,10 @@ class Lng { weiwang_12: "weiwang_12"; + hqjgtips_27: "hqjgtips_27"; + hqjgtips_28: "hqjgtips_28"; + hqjgtips_29: "hqjgtips_29"; + "11111" = "globalThis.lng.chat_1" // return call.error('', { code: -3, message: globalThis.lng.chat_2 }); } \ No newline at end of file diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 9679fcc..22753cc 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -24,6 +24,7 @@ import {ResOpen as ResOpenZhoumolibao} from '../shared/protocols/event/zhoumolib import {ResOpen as ResOpenPobinglibao} from '../shared/protocols/event/pobinglibao/PtlOpen'; import {ResOpen as ResOpenLeiChongLiBao} from '../shared/protocols/event/leichonglibao/PtlOpen'; import {event as ResOpenYuandan} from '../shared/protocols/event/yuandan/PtlOpen'; +import {PlayerData} from "../api_s2c/event/huangqijiuguan/fun"; export type eventType = { shouchong: { @@ -74,6 +75,7 @@ export type eventType = { [k: `leichonglibao${number}`]: ResOpenLeiChongLiBao & { opentime: number }; [k: `yuandan${number}`]: ResOpenYuandan; [k: `pobinglibao${number}`]: ResOpenPobinglibao; + [k: `huangqijiuguan_${number}`]: PlayerData; }; export type CollectionEvent = { diff --git a/src/module/collection_fightLog.ts b/src/module/collection_fightLog.ts index a0bc0d5..58f84d9 100644 --- a/src/module/collection_fightLog.ts +++ b/src/module/collection_fightLog.ts @@ -1,4 +1,4 @@ import {fightResult} from '../shared/fightControl/fightType'; -export type CollectionFightLog = fightResult & { uid: string, type: string }; \ No newline at end of file +export type CollectionFightLog = fightResult & { uid: string, type: string, ttl: Date}; \ No newline at end of file diff --git a/src/public/fight.ts b/src/public/fight.ts index f857147..89095b0 100644 --- a/src/public/fight.ts +++ b/src/public/fight.ts @@ -11,7 +11,7 @@ import { re, string } from "mathjs"; import { getGud } from './gud'; import { PushGiftFun } from "./pushgift"; -type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross'; +type fightType = 'tanxian' | 'pata' | 'jjc' | 'gbtx' | 'qjzzd' | 'meirishilian' | 'wzrycross' | 'hqjg'; let fights: { [key: string]: FightControl } = { @@ -87,9 +87,13 @@ export class FightFun { /**挑战竞技场 */ static async fightJJc(call: ApiCall, rankInfo: rankInfo) { - if (rankInfo.player.uid.indexOf('npc_') != -1) return await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid)); + let result; - let result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); + if (rankInfo.player.uid.indexOf('npc_') != -1) { + result = await this.fightNpc(call, G.gc.jjc_npc[rankInfo.player.uid].npcId, 'jjc', await this.getPlayerFightData(call.conn.uid)); + } else { + result = this.fight([await this.getPlayerFightData(call.conn.uid), await this.getPlayerFightData(rankInfo.player.uid)]); + } // 竞技场 战败触发推送礼包 if (result.winSide != 0) { @@ -137,14 +141,14 @@ export class FightFun { * @param result */ static async saveLog(uid: string, type: string, result: fightResult) { - let writeList = ['ganhai', 'jjc', 'hbzbJfs', 'hbzbZbs', 'slzd', 'clsl'] + let writeList = ['ganhai', 'jjc', 'hbzbJfs', 'hbzbZbs', 'slzd', 'clsl'] if (uid.indexOf('npc') != -1 || !writeList.includes(type)) return; - G.mongodb.collection('fightLog').insertOne({ uid, type, ...result }) + G.mongodb.collection('fightLog').insertOne({ uid, type, ...result, ttl: new Date() }) } static async readLog(uid: string, type: string, len = 20) { - return await G.mongodb.collection('fightLog').find({ uid, type }).limit(len).toArray() || [] + return await G.mongodb.collection('fightLog').find({ uid, type }).limit(len).sort({ _id: -1 }).toArray() || [] } } \ No newline at end of file diff --git a/src/public/jjc.ts b/src/public/jjc.ts index d571417..67726f1 100644 --- a/src/public/jjc.ts +++ b/src/public/jjc.ts @@ -94,37 +94,37 @@ export class JJCFun { * @param uTimeOffset * @param isUpdate 是否更新数据 */ - static async checkUpdatePlayer(min: number = 0, max: number = 1000, uTimeOffset: number = 600, isUpdate: boolean = true) { - // 获取指定排名用户uid - let sortInfo = await this.getRankListUid(min, max) - if (!sortInfo.length) return [] - let updateArr = [] + // static async checkUpdatePlayer(min: number = 0, max: number = 1000, uTimeOffset: number = 600, isUpdate: boolean = true) { + // // 获取指定排名用户uid + // let sortInfo = await this.getRankListUid(min, max) + // if (!sortInfo.length) return [] + // let updateArr = [] - let users = await G.redis.hGetAll('rank:jjc:data') + // let users = await G.redis.hGetAll('rank:jjc:data') - for (let i = 0; i < sortInfo.length; i++) { - let uid = sortInfo[i] - let rankInfo = users[uid] - if (!rankInfo?.player) continue - // 比对utime，判断是否更新数据 - if (!rankInfo.player.isNpc) { - if (!rankInfo.utime || (rankInfo.utime && rankInfo.utime < (G.time - uTimeOffset))) { - updateArr.push(rankInfo) - } - } - } - // 更新数据 - if (isUpdate && updateArr.length > 0) { - let playerArrInfo = await G.mongodb.collection("user").find({uid: {$in: updateArr.map(i => i.uid)}}).toArray() - for (let i = 0; i < playerArrInfo.length; i++) { - let playerInfo = playerArrInfo[i] - let index = updateArr.findIndex(x => x.player.uid == playerInfo.uid) - updateArr[index].player = playerInfo - updateArr[index].utime = G.time - this.updatePlayerData(playerInfo.uid, updateArr[index]); - } - } - } + // for (let i = 0; i < sortInfo.length; i++) { + // let uid = sortInfo[i] + // let rankInfo = users[uid] + // if (!rankInfo?.player) continue + // // 比对utime，判断是否更新数据 + // if (!rankInfo.player.isNpc) { + // if (!rankInfo.utime || (rankInfo.utime && rankInfo.utime < (G.time - uTimeOffset))) { + // updateArr.push(rankInfo) + // } + // } + // } + // // 更新数据 + // if (isUpdate && updateArr.length > 0) { + // let playerArrInfo = await G.mongodb.collection("user").find({uid: {$in: updateArr.map(i => i.uid)}}).toArray() + // for (let i = 0; i < playerArrInfo.length; i++) { + // let playerInfo = playerArrInfo[i] + // let index = updateArr.findIndex(x => x.player.uid == playerInfo.uid) + // updateArr[index].player = playerInfo + // updateArr[index].utime = G.time + // this.updatePlayerData(playerInfo.uid, updateArr[index]); + // } + // } + // } /** * 获取指定范围排名的用户，仅返回uid[] diff --git a/src/public/pay.ts b/src/public/pay.ts index bf4deb7..6052922 100644 --- a/src/public/pay.ts +++ b/src/public/pay.ts @@ -260,7 +260,10 @@ export class PayFun { let selectPrize = await G.ioredis.get(`pay:${payId}:${player.uid}`); if (selectPrize) { prize.push(...JSON.parse(selectPrize)) - G.ioredis.del(`pay:${payId}:${player.uid}`) + //支付A check -> 玩家支付 -> 网络延迟 + //支付B check -> 玩家支付 -> pay -> del + //支付A -> pay 时，这里可能被清了，导致给玩家发放了空的奖励，因此，这里不清除 + //G.ioredis.del(`pay:${payId}:${player.uid}`) } } diff --git a/src/public/player.ts b/src/public/player.ts index 3a8f49c..1cf7ef2 100644 --- a/src/public/player.ts +++ b/src/public/player.ts @@ -1,25 +1,27 @@ -import { ObjectId, OptionalId } from 'mongodb'; -import { ApiCall, BaseConnection, TsrpcError } from 'tsrpc'; -import { checkPlayerGift } from '../api_s2c/event/xianshilibao/fun'; -import { md_redPoint_check } from '../api_s2c/gongyu/mingdao/ApiOpen'; -import { CollectionPeiJian } from '../module/collection_peijian'; -import { Wjjl } from '../module/collection_wjjl'; -import { MongodbCollections } from '../module/mongodb'; -import { G123 } from '../sdk/G123'; -import { ResGetList } from '../shared/protocols/item/PtlGetList'; -import { ResLogin } from '../shared/protocols/user/PtlLogin'; -import { player } from '../shared/protocols/user/type'; -import { HeroShared, otherBuff } from '../shared/public/hero'; -import { PublicShared } from '../shared/public/public'; -import { HeroFun } from './hero'; -import { ShiwuFun } from './shiwu'; -import { UserFun } from './user'; -import { getItemByItemId, getItemNum } from './item'; -import { getGud, setGud } from './gud'; -import { addGameLog } from "../gameLog"; -import { PushGiftFun } from "./pushgift"; +import {ObjectId, OptionalId} from 'mongodb'; +import {ApiCall, BaseConnection, TsrpcError} from 'tsrpc'; +import {checkPlayerGift} from '../api_s2c/event/xianshilibao/fun'; +import {md_redPoint_check} from '../api_s2c/gongyu/mingdao/ApiOpen'; +import {CollectionPeiJian} from '../module/collection_peijian'; +import {Wjjl} from '../module/collection_wjjl'; +import {MongodbCollections} from '../module/mongodb'; +import {G123} from '../sdk/G123'; +import {ResGetList} from '../shared/protocols/item/PtlGetList'; +import {ResLogin} from '../shared/protocols/user/PtlLogin'; +import {player} from '../shared/protocols/user/type'; +import {HeroShared, otherBuff} from '../shared/public/hero'; +import {PublicShared} from '../shared/public/public'; +import {HeroFun} from './hero'; +import {ShiwuFun} from './shiwu'; +import {UserFun} from './user'; +import {getItemByItemId, getItemNum} from './item'; +import {getGud, setGud} from './gud'; +import {addGameLog} from "../gameLog"; +import {PushGiftFun} from "./pushgift"; import { ActionLog } from './actionLog/actionLog'; -import HeroSkinFun from './heroskin'; +import { roleDataType } from '../shared/fightControl/fightType'; +import { PlayerShared } from '../shared/public/player'; + export type call = { get otherBuff(): otherBuff; @@ -41,6 +43,41 @@ export type call = { }; export class PlayerFun { + /** + * 通过uid获取战斗数据 + * @param uid + * @returns + */ + static async getDefaultFightDataByUid(uid:string){ + let gud = await getGud(uid); + let posObj = gud.heroPos; + let roles: k_v = {}; + if (gud.selectMatrix && gud.matrixPos) { + posObj = gud.matrixPos[gud.selectMatrix]; + } + let heros = await HeroFun.getHeros({uid:uid}, Object.values(posObj).filter(_id => _id != '') as string[]); + let otherBuff = UserFun.getOtherBuff(gud) + + Object.entries(posObj).forEach(obj => { + let pos = obj[0]; + let _id = obj[1]; + let hero = heros.filter(h => h._id == _id)[0]; + + if (hero) { + roles[pos] = { + ...hero, + attr: { + ...HeroShared.getHeroBasicAttr(hero, { ...otherBuff, allBuff: HeroShared.getAllBuff(heros) }, Number(pos)) + } + }; + } + }); + + return { + player: { ...gud, buff: PlayerShared.getBuff(gud) }, + roles: roles + }; + } /** * 获取玩家atn数量 */ @@ -70,13 +107,13 @@ export class PlayerFun { if (err) { // 消耗不足 触发推送礼包 PushGiftFun.chkItemGift(call.uid, atn) - throw new TsrpcError('', { code: -104, atn: atn }); + throw new TsrpcError('', {code: -104, atn: atn}); } else { - return { isOk: false, atn: atn }; + return {isOk: false, atn: atn}; } } } - return { isOk: true, atn: null }; + return {isOk: true, atn: null}; } /** @@ -94,7 +131,7 @@ export class PlayerFun { atn: need }; if (args.length < 1) { - throw new TsrpcError('', { code: -104, atn: meet.atn }); + throw new TsrpcError('', {code: -104, atn: meet.atn}); } return await this.checkNeedByArgs(call, ...args); } @@ -117,10 +154,10 @@ export class PlayerFun { all.push(this.addItem(call, item)); } // 记录消耗 - addGameLog(call.uid, call.service.name, call.req, { need: val }) + addGameLog(call.uid, call.service.name, call.req, {need: val}) await Promise.all(all); G.emit('USE_ITEM', call.conn.gud, needArr.map(need => { - return { ...need, n: Math.abs(need.n) }; + return {...need, n: Math.abs(need.n)}; })); } @@ -136,18 +173,16 @@ export class PlayerFun { let equip = prizeList.filter(atn => atn.a == 'equip' && atn.n != 0); let shiwu = prizeList.filter(atn => atn.a == 'shiwu' && atn.n != 0); let peijian = prizeList.filter(atn => atn.a == 'peijian' && atn.n != 0); - let heroskin = prizeList.filter(atn => atn.a == 'heroskin' && atn.n != 0); // 记录获得 - addGameLog(call.uid, call.service.name, call.req, { prize: prizeList }) + addGameLog(call.uid, call.service.name, call.req, {prize: prizeList}) await Promise.all([ attr.length > 0 && this.addAttr(call, attr), item.length > 0 && this.addItem(call, item), hero.length > 0 && this.addHero(call, hero), equip.length > 0 && this.addEquip(call, equip), shiwu.length > 0 && this.addShiwu(call, shiwu), - peijian.length > 0 && this.addPeijian(call, peijian), - heroskin.length > 0 && this.addHeroskin(call, heroskin), + peijian.length > 0 && this.addPeijian(call, peijian) ]); return prizeList; @@ -182,9 +217,9 @@ export class PlayerFun { } } - if ((atn.t == 'rmbmoney' || atn.t == 'jinbi') && atn.n > 0) { + if( (atn.t == 'rmbmoney' || atn.t == 'jinbi') && atn.n > 0 ){ //统计今日获取的金币和钻石 - ActionLog.addDayLog(call.conn.uid, { key: 'got_' + atn.t, val: atn.n }); + ActionLog.addDayLog(call.conn.uid, { key: 'got_'+atn.t, val: atn.n }); } // 增加vip经验的任务监听 @@ -192,7 +227,7 @@ export class PlayerFun { G.emit("Class_task_157", 'Class_task_157', call, atn.n, 0); } all.push(this.changeAttr(call.conn.uid, change)); - all.push(this.upAttr(call, { ...atn, n: change[atn.t] })); + all.push(this.upAttr(call, {...atn, n: change[atn.t]})); //await this.changeAttr(call.conn.uid, change); //await this.upAttr(call, {...atn, n: change[atn.t]}); } @@ -235,17 +270,17 @@ export class PlayerFun { G.mongodb.collection('rmbuse').insertOne(data); // 消费竞赛开启时写入跨服数据库 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 }); + G.crossmongodb.collection('rmbuse').updateOne({uid: data.uid, type: `xfjs_${G.huodong.xfjsId}`}, { + $set: {time: G.time}, + $inc: {change: data.change} + }, {upsert: true}); } } static async changeAttr(uid: string, change: Partial) { setGud(uid, change); - G.mongodb.collection('user').updateOne({ uid: uid }, { $set: change }); + G.mongodb.collection('user').updateOne({uid: uid}, {$set: change}); if (G.server.uid_connections[uid]) { checkPlayerGift(G.server.uid_connections[uid].gud, change); @@ -267,9 +302,9 @@ export class PlayerFun { const curLv = call.conn.gud.lv; while (conf[curLv + addLv + 1] && atn.n >= conf[curLv + addLv + 1].need) { addLv++; - G123.sendUserLevelUp({ ...call.conn.gud, lv: curLv + addLv, nexp: atn.n }); + G123.sendUserLevelUp({...call.conn.gud, lv: curLv + addLv, nexp: atn.n}); } - addLv && await this.addAttr(call, { lv: curLv + addLv }); + addLv && await this.addAttr(call, {lv: curLv + addLv}); break; case 'payExp': let addVip = 0; @@ -278,7 +313,7 @@ export class PlayerFun { while (vipConf[curVip + addVip + 1] && atn.n >= vipConf[curVip + addVip + 1].exp) { addVip++; } - addVip && await this.addAttr(call, { vip: curVip + addVip }); + addVip && await this.addAttr(call, {vip: curVip + addVip}); break; } } @@ -289,7 +324,7 @@ export class PlayerFun { static async addItem(call: call, val: atn[]) { for (let atn of val) { let upObj = { - filter: { uid: call.uid, itemId: atn.t }, + filter: {uid: call.uid, itemId: atn.t}, update: { $setOnInsert: { firstTime: G.time, @@ -321,7 +356,7 @@ export class PlayerFun { }; G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options); call.addEventMsg('msg_s2c/ItemChange', atn.t, data); - addGameLog(call.uid, "_itemChange", { "additem": 1 }, { + addGameLog(call.uid, "_itemChange", {"additem": 1}, { "filter": upObj.filter, "update": upObj.update, "options": upObj.options @@ -329,10 +364,10 @@ export class PlayerFun { } else { if (item.num + atn.n <= 0) { await Promise.all([ - G.mongodb.collection('item').deleteOne({ uid: call.uid, itemId: atn.t }) + G.mongodb.collection('item').deleteOne({uid: call.uid, itemId: atn.t}) ]); - call.addEventMsg('msg_s2c/ItemChange', atn.t, { num: 0 }); - addGameLog(call.uid, "_itemChange", { "delitem": 1 }, { "itemId": atn.t }) + call.addEventMsg('msg_s2c/ItemChange', atn.t, {num: 0}); + addGameLog(call.uid, "_itemChange", {"delitem": 1}, {"itemId": atn.t}) } else { await Promise.all([ G.mongodb.collection('item').updateOne(upObj.filter, upObj.update, upObj.options) @@ -341,7 +376,7 @@ export class PlayerFun { num: item.num + atn.n, lastTime: upObj.update.$set.lastTime }); - addGameLog(call.uid, "_itemChange", { "attritem": 1 }, { + addGameLog(call.uid, "_itemChange", {"attritem": 1}, { "filter": upObj.filter, "update": upObj.update, "options": upObj.options, @@ -376,7 +411,7 @@ export class PlayerFun { insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); - let { _id, ...ops } = v; + let {_id, ...ops} = v; Wjjl.setVal(call.uid, `has_equip_color_${G.gc.equip[ops.equipId].colour}`, 1, false); @@ -410,10 +445,10 @@ export class PlayerFun { */ static async cutEquip(call: call, _idArr: string[]) { for (let _id of _idArr) { - G.mongodb.collection('equip').deleteOne({ uid: call.uid, _id: new ObjectId(_id) }); - call.addEventMsg('msg_s2c/EquipChange', _id, { num: 0 }); + G.mongodb.collection('equip').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); + call.addEventMsg('msg_s2c/EquipChange', _id, {num: 0}); - addGameLog(call.uid, "_cutEquip", {}, { _id: _id }) + addGameLog(call.uid, "_cutEquip", {}, {_id: _id}) } } @@ -447,7 +482,7 @@ export class PlayerFun { let v = insertData[key] let id = result.insertedIds[key].toHexString(); - let { _id, ...ops } = v; + let {_id, ...ops} = v; call.addEventMsg('msg_s2c/HeroChange', id, { _id: id, @@ -480,9 +515,9 @@ export class PlayerFun { static async cutHero(call: call, _idArr: string[]) { for (let _id of _idArr) { await HeroFun.delHero(call, _id); - G.mongodb.collection('hero').deleteOne({ uid: call.uid, _id: new ObjectId(_id) }); - call.addEventMsg('msg_s2c/HeroChange', _id, { num: 0 }); - addGameLog(call.uid, "_cutHero", {}, { _id: _id }) + G.mongodb.collection('hero').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); + call.addEventMsg('msg_s2c/HeroChange', _id, {num: 0}); + addGameLog(call.uid, "_cutHero", {}, {_id: _id}) } } @@ -497,7 +532,7 @@ export class PlayerFun { colour: v.colour, wearId: '', shiwuId: v.t, - jichu: ShiwuFun.randomJichu({ colour: v.colour, shiwuId: v.t }), + jichu: ShiwuFun.randomJichu({colour: v.colour, shiwuId: v.t}), fujia: [] }; if (v.shiwuBuff) { @@ -517,7 +552,7 @@ export class PlayerFun { insertData.forEach((v, key) => { let id = result.insertedIds[key].toHexString(); - let { _id, ...ops } = v; + let {_id, ...ops} = v; call.addEventMsg('msg_s2c/ShiwuChange', id, { _id: id, ...ops @@ -536,9 +571,9 @@ export class PlayerFun { */ static async cutShiwu(call: call, _idArr: string[]) { for (let _id of _idArr) { - G.mongodb.collection('shiwu').deleteOne({ uid: call.uid, _id: new ObjectId(_id) }); - call.addEventMsg('msg_s2c/ShiwuChange', _id, { num: 0 }); - addGameLog(call.uid, "_cutShiwu", {}, { _id: _id }) + G.mongodb.collection('shiwu').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); + call.addEventMsg('msg_s2c/ShiwuChange', _id, {num: 0}); + addGameLog(call.uid, "_cutShiwu", {}, {_id: _id}) } } @@ -563,7 +598,7 @@ export class PlayerFun { addGameLog(call.uid, "_addPeiJian", {}, insertData) insertData.forEach((v, key) => { - let { _id, uid, ...ops } = v; + let {_id, uid, ...ops} = v; let id = _id.toHexString(); if (G.gc.peijian[v.peijianId].colour != 5) { @@ -571,8 +606,8 @@ export class PlayerFun { lshd[v.peijianId]++; } - G.redis.set('peijian', call.uid, id, { _id: id, ...ops }); - call.addEventMsg('msg_s2c/PeijianChange', id, { _id: id, ...ops }); + G.redis.set('peijian', call.uid, id, {_id: id, ...ops}); + call.addEventMsg('msg_s2c/PeijianChange', id, {_id: id, ...ops}); }); G.mongodb.collection('playerInfo', 'lshd_peijian').updateOne( @@ -593,39 +628,15 @@ export class PlayerFun { return Object.values(result.insertedIds).map(v => G.mongodb.conversionId(v)); } - /** - * 添加皮肤 - * */ - static async addHeroskin(call: call, val: atn[]) { - let prize = []; - let upskin = {}; - let heroskin = HeroSkinFun.getHeroSkin(call); - for (let p of val) { - if (!heroskin[p.t]) { - upskin[p.t] = 1; - } else { - prize.concat(G.gc.heroSkin[p.t].zhuanhuan); - } - } - if (Object.keys(upskin).length > 0) { - this.addAttr(call, { heroskin: Object.assign(heroskin, upskin) }); - } - - // 皮肤存在转换为其他奖励 - if (prize.length > 0) { - this.sendPrize(call, prize); - } - } - /** * 删除配件 */ static async cutPeijian(call: call, _idArr: string[]) { for (let _id of _idArr) { G.redis.del('peijian', call.uid, _id); - G.mongodb.collection('peijian').deleteOne({ uid: call.uid, _id: new ObjectId(_id) }); - call.addEventMsg('msg_s2c/PeijianChange', _id, { num: 0 }); - addGameLog(call.uid, "_cutPeijian", {}, { _id: _id }) + G.mongodb.collection('peijian').deleteOne({uid: call.uid, _id: new ObjectId(_id)}); + call.addEventMsg('msg_s2c/PeijianChange', _id, {num: 0}); + addGameLog(call.uid, "_cutPeijian", {}, {_id: _id}) } } @@ -634,7 +645,7 @@ export class PlayerFun { */ static async getAttr(uid: string, where: { ctype: string; }) { let _w = where; - Object.assign(_w, { uid: uid }); + Object.assign(_w, {uid: uid}); const _res = await G.mongodb.collection('playattr').find(_w).toArray(); _res.forEach(v => { if (v._id) { @@ -649,7 +660,7 @@ export class PlayerFun { */ static async getAttrOne(uid: string, where: { ctype: string; }) { let _w = where; - Object.assign(_w, { uid: uid }); + Object.assign(_w, {uid: uid}); const _res = await G.mongodb.collection('playattr').findOne(_w); if (_res) { delete _res['_id']; @@ -665,10 +676,10 @@ export class PlayerFun { time = G.time; } let _zeroTime = PublicShared.getToDayZeroTime(time); - let _tmp = { lasttime: { $gte: _zeroTime, $lte: _zeroTime + 24 * 60 * 60 - 1 } }; + let _tmp = {lasttime: {$gte: _zeroTime, $lte: _zeroTime + 24 * 60 * 60 - 1}}; let _w = where; - Object.assign(_w, { uid: uid, ..._tmp }); + Object.assign(_w, {uid: uid, ..._tmp}); const _res = await G.mongodb.collection('playattr').find(_w).toArray(); _res.forEach(v => { if (v._id) { @@ -683,7 +694,7 @@ export class PlayerFun { */ static async setAttr(uid: string, where: { ctype: string; }, data: {}, islasttime = 1) { let _w = where; - Object.assign(_w, { uid: uid }); + Object.assign(_w, {uid: uid}); if (islasttime == 1) { data["lasttime"] = G.time; @@ -694,7 +705,7 @@ export class PlayerFun { // 加入创建数据时间 data["ctime"] = G.time; } - let _res = await G.mongodb.collection('playattr').updateMany(_w, { $set: data }, { upsert: true }); + let _res = await G.mongodb.collection('playattr').updateMany(_w, {$set: data}, {upsert: true}); return _res; } } \ No newline at end of file diff --git a/src/public/scheduler/scheduler_newDay.ts b/src/public/scheduler/scheduler_newDay.ts index 2e6598a..253adcc 100644 --- a/src/public/scheduler/scheduler_newDay.ts +++ b/src/public/scheduler/scheduler_newDay.ts @@ -59,6 +59,9 @@ export class SchedulerNewDayLocalCtor extends Scheduler { } } })() + + // 转点刷新事件 + G.emit('NEW_DAY', G.time); }) let users = Object.values(G.server.uid_connections) diff --git a/src/public/scheduler/scheduler_zhanling.ts b/src/public/scheduler/scheduler_zhanling.ts index b77d0e5..b00fdf6 100644 --- a/src/public/scheduler/scheduler_zhanling.ts +++ b/src/public/scheduler/scheduler_zhanling.ts @@ -1,5 +1,5 @@ -import {PublicShared} from '../../shared/public/public'; -import {Scheduler, schedulerType} from './scheduler'; +import { PublicShared } from '../../shared/public/public'; +import { Scheduler, schedulerType } from './scheduler'; export class SchedulerZhanLing extends Scheduler { @@ -12,12 +12,12 @@ export class SchedulerZhanLing extends Scheduler { this.isReady = false; return } - let data = await this.db.findOne({type: this.id}); + let data = await this.db.findOne({ type: this.id }); if (!data) { // 开服时间整除战令周期 - let round = Math.floor(PublicShared.getOpenServerDay() / G.gc.zhanling.eventOpen.day) + let round = Math.floor((PublicShared.getOpenServerDay() - 1) / G.gc.zhanling.eventOpen.day) let prev_run_time = PublicShared.getToDayZeroTime(G.openTime) + round * G.gc.zhanling.eventOpen.day * 86400 - this.db.updateOne({type: this.id}, {$set: {lastRunTime: prev_run_time, round: round}}, {upsert: true}); + this.db.updateOne({ type: this.id }, { $set: { lastRunTime: prev_run_time, round: round } }, { upsert: true }); } if (!data || G.time > PublicShared.getToDayZeroTime(data.lastRunTime) + 24 * 3600 * G.gc.zhanling.eventOpen.day) { @@ -33,11 +33,11 @@ export class SchedulerZhanLing extends Scheduler { // 开服时间整除战令周期 let round = Math.floor(PublicShared.getOpenServerDay() / G.gc.zhanling.eventOpen.day) // lastRunTime仅储存最大值，问题记录: 本地多人启动服务时，有调用此定时器的情况下，时间会混乱。 - await this.db.updateOne({type: this.id}, {$set: {round: round}, $max: {lastRunTime: G.time}}, {upsert: true}); + await this.db.updateOne({ type: this.id }, { $set: { round: round }, $max: { lastRunTime: G.time } }, { upsert: true }); this.startTime = PublicShared.getToDayZeroTime() + 24 * 3600 * G.gc.zhanling.eventOpen.day; this.isStart = false; - G.mongodb.collection('zhanling').updateMany({type: 'round'}, {$set: {data: {}}}); + G.mongodb.collection('zhanling').updateMany({ type: 'round' }, { $set: { data: {} } }); } } \ No newline at end of file diff --git a/src/public/task.ts b/src/public/task.ts index ba5d130..89da6db 100644 --- a/src/public/task.ts +++ b/src/public/task.ts @@ -1,9 +1,10 @@ -import {ApiCall, ApiReturn} from "tsrpc"; -import {HongDianChange} from "../api_s2c/hongdian/fun"; -import {taskType} from "../shared/protocols/task/type"; -import {PublicShared} from "../shared/public/public"; -import {PeijianFun} from "./peijian"; -import {manager} from "./taskclass"; +import { ApiCall, ApiReturn } from "tsrpc"; +import { HongDianChange } from "../api_s2c/hongdian/fun"; +import { taskType } from "../shared/protocols/task/type"; +import { PublicShared } from "../shared/public/public"; +import { PeijianFun } from "./peijian"; +import { manager } from "./taskclass"; +import ApiRecTask from "../api_s2c/event/zhanling/ApiRecTask"; let taskDict = {}; const SHUJUKU = "task"; @@ -114,7 +115,7 @@ export class TaskFun { let _taskCon = await this.getTaskConByType(_task["type"], _task["taskid"]); if (!_taskCon || Object.keys(_taskCon).length == 0) { // 策划改了任务 找不到 自动删除任务 - await G.mongodb.collection(SHUJUKU).deleteMany({uid: call.uid, taskid: _task["taskid"]}); + await G.mongodb.collection(SHUJUKU).deleteMany({ uid: call.uid, taskid: _task["taskid"] }); continue } @@ -142,12 +143,12 @@ export class TaskFun { // 任务值上限检测 _resVal = _resVal > _pval ? _pval : _resVal; // 设置任务 - let _setData = {nval: _resVal}; - let _where = {taskid: _task["taskid"]}; + let _setData = { nval: _resVal }; + let _where = { taskid: _task["taskid"] }; await this.setTask(uid, _where, _setData); if (_resVal == _pval) { - G.server.sendMsgByUid(call.uid, 'msg_s2c/TaskChange', {..._task, nval: _resVal}) + G.server.sendMsgByUid(call.uid, 'msg_s2c/TaskChange', { ..._task, nval: _resVal }) } } } @@ -187,7 +188,7 @@ export class TaskFun { // 重置每日任务 if (ttype == 1 || ttype == 4) { let _zero = PublicShared.getToDayZeroTime(G.time); - let _where = {retime: {$gte: _zero, $lte: _zero + 24 * 60 * 60 - 1}, type: ttype}; + let _where = { retime: { $gte: _zero, $lte: _zero + 24 * 60 * 60 - 1 }, type: ttype }; let _tmp = await this.getUserTaksList(call.uid, _where); if (_tmp.length == 0) await this.resetDailyTask(call, ttype); } @@ -197,7 +198,7 @@ export class TaskFun { * 重置每日任务 */ static async resetDailyTask(call: ApiCall, type: number = 1) { - await this.delTasks(call.uid, {type: type}); + await this.delTasks(call.uid, { type: type }); // 该限制改到红点检测判断，避免此处注释后，红点检测与账号创建初始化任务并发。 // if (PublicShared.chkSameDate(call.conn.gud.cTime, G.time)) return; let _taskCons = await this.getTaskConsByType(type); @@ -236,7 +237,7 @@ export class TaskFun { static async getFinishByStype(call: ApiCall, stype: number, where: {}) { // 任务刷新 await this.refreshTask(call); - Object.assign(where, {stype: stype}); + Object.assign(where, { stype: stype }); let _r = await this.getUserTaksList(call.uid, where); return _r; } @@ -255,11 +256,33 @@ export class TaskFun { // Object.assign(where, { type: { $in: ttype } }) for (let index = 0; index < ttype.length; index++) { const _type = ttype[index]; - Object.assign(_w, {type: _type, ...where}); + Object.assign(_w, { type: _type, ...where }); if (_finishType.indexOf(_type) != -1) { delete _w["finish"]; } let _tmp = await this.getUserTaksList(call.uid, _w); + // 没有未完成任务 + // 检测是否有新加任务 + if (_tmp.length == 0) { + let rectask = (await G.mongodb.collection('task').find( + { uid: call.uid, type: _type }, { projection: { taskid: 1, _id: 0 } } + ).toArray()).map(e => e.taskid); + + for (let taskid of rectask) { + let conf = G.gc.task[_type][taskid]; + // 配置不存在 + // 没有后续任务 + // 后续任务已完成 + if (!conf || !conf.followtask || rectask.includes(conf.followtask)) { + continue + } + + // 生成后续任务 + await this.setTaskInfo(call, conf.followtask, { type: _type }); + break; + } + _tmp = await this.getUserTaksList(call.uid, _w); + } _r[_type] = _tmp; } return _r; @@ -313,7 +336,7 @@ export class TaskFun { * @param call */ static async updateMainTask(call: ApiCall) { - let data = await G.mongodb.collection(SHUJUKU).findOne({uid: call.uid, type: 2, finish: 0}); + let data = await G.mongodb.collection(SHUJUKU).findOne({ uid: call.uid, type: 2, finish: 0 }); let _ftaskCon = await TaskFun.getTaskConByType(2, data.taskid); // @ts-ignore @@ -324,14 +347,14 @@ export class TaskFun { type: 2, finish: 0, taskid: data.taskid - }, {$set: {...newTask, nval: data.nval || newTask.nval, retime: data.retime,}}, {upsert: true}) + }, { $set: { ...newTask, nval: data.nval || newTask.nval, retime: data.retime, } }, { upsert: true }) } /** * 生成所有任务 */ static async generateAllTask(call: ApiCall) { - let _r = await G.mongodb.collection(SHUJUKU).count({uid: call.uid}); + let _r = await G.mongodb.collection(SHUJUKU).count({ uid: call.uid }); if (_r > 0) return; let _taskInfo = []; let _con = G.gc.task; @@ -352,7 +375,7 @@ export class TaskFun { /**生成指定类型任务-初始化 */ static async reInitTask(call: ApiCall, type: string) { // 查询类型任务是否存在 - let _r = await G.mongodb.collection(SHUJUKU).count({uid: call.uid, type: ~~type}); + let _r = await G.mongodb.collection(SHUJUKU).count({ uid: call.uid, type: ~~type }); let _taskInfo = []; if (_r == 0) { let _con = G.gc.task; @@ -374,7 +397,7 @@ export class TaskFun { */ static async getUserTaksList(uid: string, where: {}) { // type : 1 主线 2 成就 3 每日 - Object.assign(where, {uid: uid}); + Object.assign(where, { uid: uid }); let _taskInfo = await G.mongodb.collection(SHUJUKU).find(where).toArray(); _taskInfo.forEach(e => { if (e._id) delete e._id; @@ -386,7 +409,7 @@ export class TaskFun { * 删除相关任务 */ static async delTasks(uid: string, where: { type: number; }) { - Object.assign(where, {uid: uid}); + Object.assign(where, { uid: uid }); await G.mongodb.collection(SHUJUKU).deleteMany(where); } @@ -420,8 +443,8 @@ export class TaskFun { if (Object.keys(setData).length == 0) { return; } - Object.assign(where, {uid}); - setData = {$set: setData}; + Object.assign(where, { uid }); + setData = { $set: setData }; await G.mongodb.collection(SHUJUKU).updateOne(where, setData); } @@ -445,7 +468,7 @@ export class TaskFun { if ((element == "1" || element == "3") && call.conn.gud.lv < 7) continue; let _values: number[] = _ttype[element]; let _where: {} = { - uid: call.uid, type: {$in: _values}, finish: 0, '$expr': { + uid: call.uid, type: { $in: _values }, finish: 0, '$expr': { $lte: ["$pval", "$nval"] } }; @@ -534,10 +557,10 @@ export class TaskAllEmitFun { }); if (_val > (usertasklog?.maxherolv | 0)) { await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ - uid: node.call.conn.uid, - type: 'usertasklog' - }, - {$set: {maxherolv: _val}}); + uid: node.call.conn.uid, + type: 'usertasklog' + }, + { $set: { maxherolv: _val } }); } // 干部等级达到 n 级 G.emit("Class_task_106", 'Class_task_106', node.call, _val, 0); @@ -580,10 +603,10 @@ export class TaskAllEmitFun { }); if (_val > (usertasklog?.maxequiplv | 0)) { await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ - uid: node.call.conn.uid, - type: 'usertasklog' - }, - {$set: {maxequiplv: _val}}); + uid: node.call.conn.uid, + type: 'usertasklog' + }, + { $set: { maxequiplv: _val } }); } G.emit("Class_task_112", 'Class_task_112', node.call, _val, 0); // 有 n 件强化 配置 等级装备 后面复写正确值 @@ -604,10 +627,10 @@ export class TaskAllEmitFun { }); if (_val > (usertasklog?.maxequiplv | 0)) { await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ - uid: node.call.conn.uid, - type: 'usertasklog' - }, - {$set: {maxequiplv: _val}}); + uid: node.call.conn.uid, + type: 'usertasklog' + }, + { $set: { maxequiplv: _val } }); } // 有 n 件强化 配置 等级装备 后面复写正确值 G.emit("Class_task_113", 'Class_task_113', node.call, 0, 0); @@ -622,10 +645,10 @@ export class TaskAllEmitFun { let _color = G.gc.hero[element.heroId].colour; G.emit("Class_task_114", 'Class_task_114', node.call, 1, _color); await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ - uid: node.call.conn.uid, - type: 'usertasklog' - }, - {$inc: G.mongodb.createTreeObj({key: `herocolor.${_color}`, val: 1})}); + uid: node.call.conn.uid, + type: 'usertasklog' + }, + { $inc: G.mongodb.createTreeObj({ key: `herocolor.${_color}`, val: 1 }) }); } } } @@ -651,7 +674,7 @@ export class TaskAllEmitFun { await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ uid: node.call.uid, type: 'usertasklog' - }, {$set: {equipcolor: usertasklog.equipcolor}}) + }, { $set: { equipcolor: usertasklog.equipcolor } }) } // if (node.call.service.name == 'chongzhi/Open' && node.return.isSucc) { // // 累计充值 n 钻石 数量后面复写 @@ -690,10 +713,10 @@ export class TaskAllEmitFun { } _val = _val + usertasklog.friendAsk + usertasklog.sendGift await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ - uid: node.call.conn.uid, - type: 'usertasklog' - }, - {$set: {friendAsk: _val}}); + uid: node.call.conn.uid, + type: 'usertasklog' + }, + { $set: { friendAsk: _val } }); G.emit("Class_task_144", 'Class_task_144', node.call, 1, 0); } if (node.call.service.name == 'tanxian/FastGuaJi' && node.return.isSucc) { @@ -852,7 +875,7 @@ export class TaskAllEmitFun { uid: node.call.conn.uid, type: 'usertasklog' }); - let _setData = {$set: {}}; // 更新配件记录 + let _setData = { $set: {} }; // 更新配件记录 let peijianCon = G.gc.peijian; let _lv = 0; @@ -881,9 +904,9 @@ export class TaskAllEmitFun { // 配件升级到 xx 级 if (_setData["$set"]["maxpeijianlv"]) G.emit("Class_task_139", 'Class_task_139', node.call, _lv, 0); await G.mongodb.collection('playerInfo', 'usertasklog').updateOne({ - uid: node.call.conn.uid, - type: 'usertasklog' - }, + uid: node.call.conn.uid, + type: 'usertasklog' + }, _setData); } } diff --git a/src/public/user.ts b/src/public/user.ts index 5914259..a89f392 100644 --- a/src/public/user.ts +++ b/src/public/user.ts @@ -305,8 +305,11 @@ export class UserFun { gud.headFrames[conf.id] += val * v; } } + else if(conf?.cond?.[0] == "jjc_rank") { + change = true; + gud.headFrames[conf.id] = -1; + } } - if (change) { PlayerFun.changeAttr(uid, {headFrames: gud.headFrames}); G.server.sendMsgByUid(uid, 'msg_s2c/PlayerChange', {headFrames: gud.headFrames}); diff --git a/src/shared/fightControl/fightCntrol.ts b/src/shared/fightControl/fightCntrol.ts index 4db74c9..e13a18e 100644 --- a/src/shared/fightControl/fightCntrol.ts +++ b/src/shared/fightControl/fightCntrol.ts @@ -152,7 +152,7 @@ export class FightControl { this.eachLiveRoles((role) => { let heroId = role.roleData.heroId; // let shiwu = role.roleData?.shiwu || {}; - // let talent = role.roleData?.talent || {}; + let talent = role.roleData?.talent || {}; let skills = G.gc.heroskill[heroId][role.roleData.jieji || 0].bdskill || []; skills = skills.concat(role.roleData.attr.skillArr); @@ -161,15 +161,15 @@ export class FightControl { // if (!zhushuan) continue; // if (zhushuan.skill) skills.push(zhushuan.skill); // }; - // const hero_tf = G.gc.hero_tf; - // for (let key in talent) { - // let cdata = hero_tf[key][talent[key]]; - // if (cdata && cdata.skill_effect) skills.push(cdata.skill_effect); - // } + const hero_tf = G.gc.hero_tf; + for (let key in talent) { + let cdata = hero_tf[key][talent[key]]; + if (cdata && cdata.skill_effect) skills.push(cdata.skill_effect); + } // skills.push('tx06309'); - // if (!skills) return; + if (!skills) return; skills.forEach(_skill => { let askillconf = getSkillConf(_skill); if (!askillconf) return console.log('没有技能配置-->', _skill); diff --git a/src/shared/protocols/event/huangqijiuguan/PtlDuiHuan.ts b/src/shared/protocols/event/huangqijiuguan/PtlDuiHuan.ts new file mode 100644 index 0000000..b0f16c3 --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlDuiHuan.ts @@ -0,0 +1,11 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun" + +export interface ReqDuiHuan { + hdid: number + dh: { [id: number]: number } +} + +export interface ResDuiHuan { + data: PlayerData + prize: { a: string, t: string, n: number }[] +} diff --git a/src/shared/protocols/event/huangqijiuguan/PtlFight.ts b/src/shared/protocols/event/huangqijiuguan/PtlFight.ts new file mode 100644 index 0000000..dc4d6f2 --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlFight.ts @@ -0,0 +1,11 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun"; +import { fightResult } from "../../../fightControl/fightType"; + +export interface ReqFight { + hdid: number +} + +export interface ResFight { + data: PlayerData + result: fightResult; +} diff --git a/src/shared/protocols/event/huangqijiuguan/PtlOpen.ts b/src/shared/protocols/event/huangqijiuguan/PtlOpen.ts new file mode 100644 index 0000000..dd4d02e --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlOpen.ts @@ -0,0 +1,9 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun" + +export interface ReqOpen { + hdid: number +} + +export interface ResOpen { + data: PlayerData +} diff --git a/src/shared/protocols/event/huangqijiuguan/PtlRankList.ts b/src/shared/protocols/event/huangqijiuguan/PtlRankList.ts new file mode 100644 index 0000000..e301663 --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlRankList.ts @@ -0,0 +1,7 @@ +export interface ReqRankList { + hdid: number +} + +export interface ResRankList { + rankList: any[] +} diff --git a/src/shared/protocols/event/huangqijiuguan/PtlRecDpsPrize.ts b/src/shared/protocols/event/huangqijiuguan/PtlRecDpsPrize.ts new file mode 100644 index 0000000..7daff9d --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlRecDpsPrize.ts @@ -0,0 +1,11 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun" + +export interface ReqRecDpsPrize { + hdid: number + recid: number[] +} + +export interface ResRecDpsPrize { + data: PlayerData, + prize: { a: string, t: string, n: number }[] +} diff --git a/src/shared/protocols/event/huangqijiuguan/PtlTaskRec.ts b/src/shared/protocols/event/huangqijiuguan/PtlTaskRec.ts new file mode 100644 index 0000000..5e1d584 --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlTaskRec.ts @@ -0,0 +1,13 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun" + +export interface ReqTaskRec { + day: number + hdid: number + taskid: number[] +} + +export interface ResTaskRec { + data: PlayerData + prize: { a: string, t: string, n: number }[] +} + diff --git a/src/shared/protocols/event/huangqijiuguan/PtlZhaoMu.ts b/src/shared/protocols/event/huangqijiuguan/PtlZhaoMu.ts new file mode 100644 index 0000000..43075e0 --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlZhaoMu.ts @@ -0,0 +1,12 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun" + + +export interface ReqZhaoMu { + num: number + hdid: number +} + +export interface ResZhaoMu { + data: PlayerData + prize: { a: string, t: string, n: number }[] +} diff --git a/src/shared/protocols/event/huangqijiuguan/PtlZhaoMuPrizeRec.ts b/src/shared/protocols/event/huangqijiuguan/PtlZhaoMuPrizeRec.ts new file mode 100644 index 0000000..d5a6eba --- /dev/null +++ b/src/shared/protocols/event/huangqijiuguan/PtlZhaoMuPrizeRec.ts @@ -0,0 +1,11 @@ +import { PlayerData } from "../../../../api_s2c/event/huangqijiuguan/fun" + +export interface ReqZhaoMuPrizeRec { + hdid: number + recid: { idx: number, sec: string }[] +} + +export interface ResZhaoMuPrizeRec { + data: PlayerData + prize: { a: string, t: string, n: number }[] +} diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 4167d5a..e03b54a 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -51,81 +51,89 @@ import { ReqOpen as ReqOpen_8, ResOpen as ResOpen_8 } from './event/chuanshuozhi import { ReqRec as ReqRec_2, ResRec as ResRec_2 } from './event/chuanshuozhilu/PtlRec'; import { ReqGet, ResGet } from './event/diaoluoduihuan/PtlGet'; import { ReqOpen as ReqOpen_9, ResOpen as ResOpen_9 } from './event/diaoluoduihuan/PtlOpen'; -import { ReqOpen as ReqOpen_10, ResOpen as ResOpen_10 } from './event/huobanzhaomu/PtlOpen'; +import { ReqDuiHuan, ResDuiHuan } from './event/huangqijiuguan/PtlDuiHuan'; +import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './event/huangqijiuguan/PtlFight'; +import { ReqOpen as ReqOpen_10, ResOpen as ResOpen_10 } from './event/huangqijiuguan/PtlOpen'; +import { ReqRankList, ResRankList } from './event/huangqijiuguan/PtlRankList'; +import { ReqRecDpsPrize, ResRecDpsPrize } from './event/huangqijiuguan/PtlRecDpsPrize'; +import { ReqTaskRec as ReqTaskRec_1, ResTaskRec as ResTaskRec_1 } from './event/huangqijiuguan/PtlTaskRec'; +import { ReqZhaoMu, ResZhaoMu } from './event/huangqijiuguan/PtlZhaoMu'; +import { ReqZhaoMuPrizeRec, ResZhaoMuPrizeRec } from './event/huangqijiuguan/PtlZhaoMuPrizeRec'; +import { ReqOpen as ReqOpen_11, ResOpen as ResOpen_11 } from './event/huobanzhaomu/PtlOpen'; import { ReqRec as ReqRec_3, ResRec as ResRec_3 } from './event/huobanzhaomu/PtlRec'; import { ReqGet as ReqGet_1, ResGet as ResGet_1 } from './event/jierihuodong/PtlGet'; -import { ReqOpen as ReqOpen_11, ResOpen as ResOpen_11 } from './event/jierihuodong/PtlOpen'; +import { ReqOpen as ReqOpen_12, ResOpen as ResOpen_12 } from './event/jierihuodong/PtlOpen'; import { ReqRec as ReqRec_4, ResRec as ResRec_4 } from './event/jierihuodong/PtlRec'; import { ReqCheckOpen, ResCheckOpen } from './event/jijin/PtlCheckOpen'; -import { ReqOpen as ReqOpen_12, ResOpen as ResOpen_12 } from './event/jijin/PtlOpen'; +import { ReqOpen as ReqOpen_13, ResOpen as ResOpen_13 } from './event/jijin/PtlOpen'; import { ReqReceive as ReqReceive_1, ResReceive as ResReceive_1 } from './event/jijin/PtlReceive'; import { ReqLoginPrize, ResLoginPrize } from './event/kaifukuanghuan/PtlLoginPrize'; -import { ReqOpen as ReqOpen_13, ResOpen as ResOpen_13 } from './event/kaifukuanghuan/PtlOpen'; +import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/kaifukuanghuan/PtlOpen'; import { ReqShopBuy, ResShopBuy } from './event/kaifukuanghuan/PtlShopBuy'; import { ReqTaskBox, ResTaskBox } from './event/kaifukuanghuan/PtlTaskBox'; import { ReqTaskPrize, ResTaskPrize } from './event/kaifukuanghuan/PtlTaskPrize'; -import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leichonglibao/PtlOpen'; +import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/leichonglibao/PtlOpen'; import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/leichonglibao/PtlReceive'; -import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/leijichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/leijichongzhi/PtlOpen'; import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; -import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/niudanji/PtlOpen'; +import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/niudanji/PtlOpen'; import { ReqCanReceive, ResCanReceive } from './event/payForDiamond/PtlCanReceive'; import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/payForDiamond/PtlReceive'; -import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/pobinglibao/PtlOpen'; +import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/pobinglibao/PtlOpen'; import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/pobinglibao/PtlReceive'; -import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qirichongzhi/PtlOpen'; +import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; -import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/qiridenglu/PtlOpen'; +import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; -import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shiwuleichong/PtlOpen'; -import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/shouchong/PtlOpen'; +import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/shiwuleichong/PtlOpen'; +import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/shouchong/PtlOpen'; import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './event/shouchong/PtlReceive'; import { ReqBuy as ReqBuy_1, ResBuy as ResBuy_1 } from './event/xianshizhaomu/PtlBuy'; import { ReqDuihuan, ResDuihuan } from './event/xianshizhaomu/PtlDuihuan'; import { ReqLottery as ReqLottery_1, ResLottery as ResLottery_1 } from './event/xianshizhaomu/PtlLottery'; -import { ReqOpen as ReqOpen_22, ResOpen as ResOpen_22 } from './event/xianshizhaomu/PtlOpen'; +import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xianshizhaomu/PtlOpen'; import { ReqRec as ReqRec_7, ResRec as ResRec_7 } from './event/xianshizhaomu/PtlRec'; -import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } from './event/xiaofeijingsai/PtlOpen'; -import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/xinshoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/xiaofeijingsai/PtlOpen'; +import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/xinshoulibao/PtlOpen'; import { ReqBuy as ReqBuy_2, ResBuy as ResBuy_2 } from './event/yangchengmubiao/PtlBuy'; -import { ReqOpen as ReqOpen_25, ResOpen as ResOpen_25 } from './event/yangchengmubiao/PtlOpen'; +import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yangchengmubiao/PtlOpen'; import { ReqRec as ReqRec_8, ResRec as ResRec_8 } from './event/yangchengmubiao/PtlRec'; -import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/yibaichou/PtlOpen'; +import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yibaichou/PtlOpen'; import { ReqRec as ReqRec_9, ResRec as ResRec_9 } from './event/yibaichou/PtlRec'; import { ReqRecAll, ResRecAll } from './event/yibaichou/PtlRecAll'; import { ReqDMRec, ResDMRec } from './event/yuandan/PtlDMRec'; import { ReqDZRec, ResDZRec } from './event/yuandan/PtlDZRec'; import { ReqExchange, ResExchange } from './event/yuandan/PtlExchange'; -import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuandan/PtlOpen'; -import { ReqTaskRec as ReqTaskRec_1, ResTaskRec as ResTaskRec_1 } from './event/yuandan/PtlTaskRec'; +import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/yuandan/PtlOpen'; +import { ReqTaskRec as ReqTaskRec_2, ResTaskRec as ResTaskRec_2 } from './event/yuandan/PtlTaskRec'; import { ReqZLRec, ResZLRec } from './event/yuandan/PtlZLRec'; -import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/yuedujijin/PtlOpen'; +import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/yuedujijin/PtlOpen'; import { ReqRec as ReqRec_10, ResRec as ResRec_10 } from './event/yuedujijin/PtlRec'; import { ReqBuyLv, ResBuyLv } from './event/zhanling/PtlBuyLv'; -import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhanling/PtlOpen'; +import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhanling/PtlOpen'; import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './event/zhanling/PtlRecPrize'; import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; -import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhoulibao/PtlOpen'; -import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zhoumolibao/PtlOpen'; +import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zhoulibao/PtlOpen'; +import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './event/zhoumolibao/PtlOpen'; import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; -import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './event/zixuanlibao/PtlOpen'; +import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; import { ReqApply, ResApply } from './friend/PtlApply'; import { ReqDel, ResDel } from './friend/PtlDel'; import { ReqGift, ResGift } from './friend/PtlGift'; import { ReqList, ResList } from './friend/PtlList'; -import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } from './friend/PtlOpen'; +import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './friend/PtlOpen'; import { ReqRespond, ResRespond } from './friend/PtlRespond'; import { ReqRmBlackList, ResRmBlackList } from './friend/PtlRmBlackList'; import { ReqSearch, ResSearch } from './friend/PtlSearch'; import { ReqChallenge, ResChallenge } from './ganbutexun/PtlChallenge'; -import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './ganbutexun/PtlOpen'; +import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './ganbutexun/PtlOpen'; import { ReqFast, ResFast } from './ganhai/PtlFast'; -import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight'; +import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './ganhai/PtlFight'; import { ReqLog, ResLog } from './ganhai/PtlLog'; -import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } from './ganhai/PtlOpen'; +import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './ganhai/PtlOpen'; import { ReqRefresh, ResRefresh } from './ganhai/PtlRefresh'; import { ReqRefreshShip, ResRefreshShip } from './ganhai/PtlRefreshShip'; import { ReqSelect as ReqSelect_1, ResSelect as ResSelect_1 } from './ganhai/PtlSelect'; @@ -147,35 +155,35 @@ import { ReqJx, ResJx } from './gonghui/PtlJx'; import { ReqJxOpen, ResJxOpen } from './gonghui/PtlJxOpen'; import { ReqList as ReqList_1, ResList as ResList_1 } from './gonghui/PtlList'; import { ReqManage, ResManage } from './gonghui/PtlManage'; -import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } from './gonghui/PtlOpen'; +import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gonghui/PtlOpen'; import { ReqTanHe, ResTanHe } from './gonghui/PtlTanHe'; import { ReqTaskOpen, ResTaskOpen } from './gonghui/PtlTaskOpen'; import { ReqTaskReceive, ResTaskReceive } from './gonghui/PtlTaskReceive'; import { ReqUpWz, ResUpWz } from './gonghui/PtlUpWz'; import { ReqLottery as ReqLottery_2, ResLottery as ResLottery_2 } from './gonghuibaozang/PtlLottery'; -import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } from './gonghuibaozang/PtlOpen'; +import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './gonghuibaozang/PtlOpen'; import { ReqBuy as ReqBuy_4, ResBuy as ResBuy_4 } from './gonglukuangbiao/PtlBuy'; -import { ReqFight as ReqFight_2, ResFight as ResFight_2 } from './gonglukuangbiao/PtlFight'; -import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } from './gonglukuangbiao/PtlOpen'; +import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './gonglukuangbiao/PtlFight'; +import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './gonglukuangbiao/PtlOpen'; import { ReqRefresh as ReqRefresh_1, ResRefresh as ResRefresh_1 } from './gonglukuangbiao/PtlRefresh'; import { ReqActive, ResActive } from './gongyu/mingdao/PtlActive'; -import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './gongyu/mingdao/PtlOpen'; +import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './gongyu/mingdao/PtlOpen'; import { ReqRecPrize as ReqRecPrize_3, ResRecPrize as ResRecPrize_3 } from './gongyu/mingdao/PtlRecPrize'; import { ReqRepair, ResRepair } from './gongyu/mingdao/PtlRepair'; import { ReqReset as ReqReset_1, ResReset as ResReset_1 } from './gongyu/xunlianjihua/PtlReset'; import { ReqUpSkill, ResUpSkill } from './gongyu/xunlianjihua/PtlUpSkill'; import { ReqSetSkill, ResSetSkill } from './gongyu/zuozhanjihua/PtlSetSkill'; import { ReqBuyNum as ReqBuyNum_1, ResBuyNum as ResBuyNum_1 } from './hbzb/jfs/PtlBuyNum'; -import { ReqFight as ReqFight_3, ResFight as ResFight_3 } from './hbzb/jfs/PtlFight'; +import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/jfs/PtlFight'; import { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog'; -import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './hbzb/jfs/PtlOpen'; +import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './hbzb/jfs/PtlOpen'; import { ReqRec as ReqRec_11, ResRec as ResRec_11 } from './hbzb/jfs/PtlRec'; import { ReqRefresh as ReqRefresh_2, ResRefresh as ResRefresh_2 } from './hbzb/jfs/PtlRefresh'; import { ReqGetStatus, ResGetStatus } from './hbzb/PtlGetStatus'; import { ReqBuyNum as ReqBuyNum_2, ResBuyNum as ResBuyNum_2 } from './hbzb/zbs/PtlBuyNum'; -import { ReqFight as ReqFight_4, ResFight as ResFight_4 } from './hbzb/zbs/PtlFight'; +import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './hbzb/zbs/PtlFight'; import { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog'; -import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './hbzb/zbs/PtlOpen'; +import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './hbzb/zbs/PtlOpen'; import { ReqRefresh as ReqRefresh_3, ResRefresh as ResRefresh_3 } from './hbzb/zbs/PtlRefresh'; import { ReqAwake, ResAwake } from './hero/PtlAwake'; import { ReqChangePos, ResChangePos } from './hero/PtlChangePos'; @@ -194,40 +202,40 @@ import { ReqGet as ReqGet_2, ResGet as ResGet_2 } from './hongdian/PtlGet'; import { ReqGetList as ReqGetList_4, ResGetList as ResGetList_4 } from './item/PtlGetList'; import { ReqUse, ResUse } from './item/PtlUse'; import { ReqLottery as ReqLottery_3, ResLottery as ResLottery_3 } from './jiaotang/PtlLottery'; -import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jiaotang/PtlOpen'; +import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './jiaotang/PtlOpen'; import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery'; -import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './jiuba/PtlOpen'; +import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './jiuba/PtlOpen'; import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; -import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; +import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; -import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './jjc/PtlOpen'; +import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './jjc/PtlOpen'; import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; -import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kaifujingsai/PtlOpen'; +import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './kaifujingsai/PtlOpen'; import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './kaifujingsai/PtlReceive'; import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply'; import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply'; import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBuyNum'; -import { ReqFight as ReqFight_6, ResFight as ResFight_6 } from './kbzz/PtlFight'; +import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './kbzz/PtlFight'; import { ReqFightLog as ReqFightLog_1, ResFightLog as ResFightLog_1 } from './kbzz/PtlFightLog'; import { ReqGroupState, ResGroupState } from './kbzz/PtlGroupState'; -import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } from './kbzz/PtlOpen'; +import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './kbzz/PtlOpen'; import { ReqRecPrize as ReqRecPrize_4, ResRecPrize as ResRecPrize_4 } from './kbzz/PtlRecPrize'; import { ReqRefresh as ReqRefresh_5, ResRefresh as ResRefresh_5 } from './kbzz/PtlRefresh'; import { ReqAddPkNum, ResAddPkNum } from './kuangdong/PtlAddPkNum'; import { ReqGetPrize, ResGetPrize } from './kuangdong/PtlGetPrize'; import { ReqKdInfo, ResKdInfo } from './kuangdong/PtlKdInfo'; import { ReqLog as ReqLog_1, ResLog as ResLog_1 } from './kuangdong/PtlLog'; -import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './kuangdong/PtlOpen'; +import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './kuangdong/PtlOpen'; import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi'; import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing'; -import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './lingzhulaixi/PtlOpen'; +import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './lingzhulaixi/PtlOpen'; import { ReqPkBoss, ResPkBoss } from './lingzhulaixi/PtlPkBoss'; import { ReqPkRank, ResPkRank } from './lingzhulaixi/PtlPkRank'; import { ReqSaoDang, ResSaoDang } from './lingzhulaixi/PtlSaoDang'; import { ReqBuy as ReqBuy_5, ResBuy as ResBuy_5 } from './meirishilian/PtlBuy'; -import { ReqFight as ReqFight_7, ResFight as ResFight_7 } from './meirishilian/PtlFight'; -import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './meirishilian/PtlOpen'; +import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './meirishilian/PtlFight'; +import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './meirishilian/PtlOpen'; import { MsgBindUid } from './msg_c2s/MsgBindUid'; import { MsgPay } from './msg_c2s/MsgPay'; import { MsgSync } from './msg_c2s/MsgSync'; @@ -257,9 +265,9 @@ import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; import { MsgXianshilibao } from './msg_s2c/MsgXianshilibao'; -import { ReqFight as ReqFight_8, ResFight as ResFight_8 } from './pata/PtlFight'; +import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './pata/PtlFight'; import { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize'; -import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './pata/PtlOpen'; +import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './pata/PtlOpen'; import { ReqSaoDang as ReqSaoDang_1, ResSaoDang as ResSaoDang_1 } from './pata/PtlSaoDang'; import { ReqGetList as ReqGetList_5, ResGetList as ResGetList_5 } from './pay/PtlGetList'; import { ReqGetList as ReqGetList_6, ResGetList as ResGetList_6 } from './peijian/PtlGetList'; @@ -275,16 +283,16 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock'; import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './peijian/PtlWear'; import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal'; import { ReqJump, ResJump } from './peijiancangku/PtlJump'; -import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './peijiancangku/PtlOpen'; +import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './peijiancangku/PtlOpen'; import { ReqBingo, ResBingo } from './PtlBingo'; import { ReqFightTest, ResFightTest } from './PtlFightTest'; import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn'; import { ReqTest, ResTest } from './PtlTest'; import { ReqItemNoEnough, ResItemNoEnough } from './pushgift/PtlItemNoEnough'; -import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './pushgift/PtlOpen'; -import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; -import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './qjzzd/PtlOpen'; -import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './rank/PtlOpen'; +import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './pushgift/PtlOpen'; +import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './qjzzd/PtlFight'; +import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './qjzzd/PtlOpen'; +import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './rank/PtlOpen'; import { ReqConcise, ResConcise } from './shiwu/PtlConcise'; import { ReqExtract, ResExtract } from './shiwu/PtlExtract'; import { ReqGetList as ReqGetList_7, ResGetList as ResGetList_7 } from './shiwu/PtlGetList'; @@ -292,38 +300,38 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp'; import { ReqRecast, ResRecast } from './shiwu/PtlRecast'; import { ReqTakeOff as ReqTakeOff_3, ResTakeOff as ResTakeOff_3 } from './shiwu/PtlTakeOff'; import { ReqWear as ReqWear_3, ResWear as ResWear_3 } from './shiwu/PtlWear'; -import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './shootGame/PtlOpen'; +import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './shootGame/PtlOpen'; import { ReqRec as ReqRec_13, ResRec as ResRec_13 } from './shootGame/PtlRec'; import { ReqBuy as ReqBuy_6, ResBuy as ResBuy_6 } from './shop/PtlBuy'; -import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } from './shop/PtlOpen'; +import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './shop/PtlOpen'; import { ReqRefresh as ReqRefresh_6, ResRefresh as ResRefresh_6 } from './shop/PtlRefresh'; import { ReqGetBoxPrize, ResGetBoxPrize } from './sign/PtlGetBoxPrize'; import { ReqGetPrize as ReqGetPrize_2, ResGetPrize as ResGetPrize_2 } from './sign/PtlGetPrize'; -import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './sign/PtlOpen'; +import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './sign/PtlOpen'; import { ReqAim, ResAim } from './slzd/PtlAim'; import { ReqBuyNum as ReqBuyNum_4, ResBuyNum as ResBuyNum_4 } from './slzd/PtlBuyNum'; -import { ReqFight as ReqFight_10, ResFight as ResFight_10 } from './slzd/PtlFight'; +import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './slzd/PtlFight'; import { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog'; import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank'; -import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './slzd/PtlOpen'; +import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './slzd/PtlOpen'; import { ReqOpenFort, ResOpenFort } from './slzd/PtlOpenFort'; import { ReqRec as ReqRec_14, ResRec as ResRec_14 } from './slzd/PtlRec'; import { ReqRefresh as ReqRefresh_7, ResRefresh as ResRefresh_7 } from './slzd/PtlRefresh'; import { ReqSlot, ResSlot } from './slzd/PtlSlot'; import { ReqEvent, ResEvent } from './tanxian/PtlEvent'; import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; -import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; +import { ReqFight as ReqFight_12, ResFight as ResFight_12 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; -import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './tanxian/PtlOpen'; +import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './tanxian/PtlOpen'; import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; -import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './task/PtlOpen'; +import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './task/PtlOpen'; import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY'; import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo'; import { ReqChangeName, ResChangeName } from './user/PtlChangeName'; import { ReqDot, ResDot } from './user/PtlDot'; -import { ReqFight as ReqFight_12, ResFight as ResFight_12 } from './user/PtlFight'; +import { ReqFight as ReqFight_13, ResFight as ResFight_13 } from './user/PtlFight'; import { ReqGetInfo, ResGetInfo } from './user/PtlGetInfo'; import { ReqInfoOpen, ResInfoOpen } from './user/PtlInfoOpen'; import { ReqLogin, ResLogin } from './user/PtlLogin'; @@ -333,11 +341,11 @@ import { ReqRenownBuy, ResRenownBuy } from './user/PtlRenownBuy'; import { ReqRenownGetPrize, ResRenownGetPrize } from './user/PtlRenownGetPrize'; import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen'; import { ReqTujian, ResTujian } from './user/PtlTujian'; -import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './weiwang/PtlOpen'; +import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './weiwang/PtlOpen'; import { ReqUpLv, ResUpLv } from './weiwang/PtlUpLv'; import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose'; import { ReqExchange as ReqExchange_1, ResExchange as ResExchange_1 } from './weixiuchang/PtlExchange'; -import { ReqOpen as ReqOpen_62, ResOpen as ResOpen_62 } from './weixiuchang/PtlOpen'; +import { ReqOpen as ReqOpen_63, ResOpen as ResOpen_63 } from './weixiuchang/PtlOpen'; import { ReqUpLv as ReqUpLv_1, ResUpLv as ResUpLv_1 } from './weixiuchang/PtlUpLv'; import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar'; import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing'; @@ -348,7 +356,7 @@ import { ReqDldFight, ResDldFight } from './wzry/PtlDldFight'; import { ReqDldRefre, ResDldRefre } from './wzry/PtlDldRefre'; import { ReqJingCai, ResJingCai } from './wzry/PtlJingCai'; import { ReqJingCaiOpen, ResJingCaiOpen } from './wzry/PtlJingCaiOpen'; -import { ReqOpen as ReqOpen_63, ResOpen as ResOpen_63 } from './wzry/PtlOpen'; +import { ReqOpen as ReqOpen_64, ResOpen as ResOpen_64 } from './wzry/PtlOpen'; import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight'; import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd'; import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen'; @@ -356,7 +364,7 @@ import { ReqAllGet, ResAllGet } from './xstask/PtlAllGet'; import { ReqGet as ReqGet_3, ResGet as ResGet_3 } from './xstask/PtlGet'; import { ReqLvUp as ReqLvUp_4, ResLvUp as ResLvUp_4 } from './xstask/PtlLvUp'; import { ReqOnekeyReceive, ResOnekeyReceive } from './xstask/PtlOnekeyReceive'; -import { ReqOpen as ReqOpen_64, ResOpen as ResOpen_64 } from './xstask/PtlOpen'; +import { ReqOpen as ReqOpen_65, ResOpen as ResOpen_65 } from './xstask/PtlOpen'; import { ReqReceive as ReqReceive_10, ResReceive as ResReceive_10 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; @@ -574,10 +582,42 @@ export interface ServiceType { req: ReqOpen_9, res: ResOpen_9 }, - "event/huobanzhaomu/Open": { + "event/huangqijiuguan/DuiHuan": { + req: ReqDuiHuan, + res: ResDuiHuan + }, + "event/huangqijiuguan/Fight": { + req: ReqFight_1, + res: ResFight_1 + }, + "event/huangqijiuguan/Open": { req: ReqOpen_10, res: ResOpen_10 }, + "event/huangqijiuguan/RankList": { + req: ReqRankList, + res: ResRankList + }, + "event/huangqijiuguan/RecDpsPrize": { + req: ReqRecDpsPrize, + res: ResRecDpsPrize + }, + "event/huangqijiuguan/TaskRec": { + req: ReqTaskRec_1, + res: ResTaskRec_1 + }, + "event/huangqijiuguan/ZhaoMu": { + req: ReqZhaoMu, + res: ResZhaoMu + }, + "event/huangqijiuguan/ZhaoMuPrizeRec": { + req: ReqZhaoMuPrizeRec, + res: ResZhaoMuPrizeRec + }, + "event/huobanzhaomu/Open": { + req: ReqOpen_11, + res: ResOpen_11 + }, "event/huobanzhaomu/Rec": { req: ReqRec_3, res: ResRec_3 @@ -587,8 +627,8 @@ export interface ServiceType { res: ResGet_1 }, "event/jierihuodong/Open": { - req: ReqOpen_11, - res: ResOpen_11 + req: ReqOpen_12, + res: ResOpen_12 }, "event/jierihuodong/Rec": { req: ReqRec_4, @@ -599,8 +639,8 @@ export interface ServiceType { res: ResCheckOpen }, "event/jijin/Open": { - req: ReqOpen_12, - res: ResOpen_12 + req: ReqOpen_13, + res: ResOpen_13 }, "event/jijin/Receive": { req: ReqReceive_1, @@ -611,8 +651,8 @@ export interface ServiceType { res: ResLoginPrize }, "event/kaifukuanghuan/Open": { - req: ReqOpen_13, - res: ResOpen_13 + req: ReqOpen_14, + res: ResOpen_14 }, "event/kaifukuanghuan/ShopBuy": { req: ReqShopBuy, @@ -627,16 +667,16 @@ export interface ServiceType { res: ResTaskPrize }, "event/leichonglibao/Open": { - req: ReqOpen_14, - res: ResOpen_14 + req: ReqOpen_15, + res: ResOpen_15 }, "event/leichonglibao/Receive": { req: ReqReceive_2, res: ResReceive_2 }, "event/leijichongzhi/Open": { - req: ReqOpen_15, - res: ResOpen_15 + req: ReqOpen_16, + res: ResOpen_16 }, "event/leijichongzhi/Rec": { req: ReqRec_5, @@ -647,8 +687,8 @@ export interface ServiceType { res: ResLottery }, "event/niudanji/Open": { - req: ReqOpen_16, - res: ResOpen_16 + req: ReqOpen_17, + res: ResOpen_17 }, "event/payForDiamond/CanReceive": { req: ReqCanReceive, @@ -659,37 +699,37 @@ export interface ServiceType { res: ResReceive_3 }, "event/pobinglibao/Open": { - req: ReqOpen_17, - res: ResOpen_17 + req: ReqOpen_18, + res: ResOpen_18 }, "event/pobinglibao/Receive": { req: ReqReceive_4, res: ResReceive_4 }, "event/qirichongzhi/Open": { - req: ReqOpen_18, - res: ResOpen_18 + req: ReqOpen_19, + res: ResOpen_19 }, "event/qirichongzhi/Rec": { req: ReqRec_6, res: ResRec_6 }, "event/qiridenglu/Open": { - req: ReqOpen_19, - res: ResOpen_19 + req: ReqOpen_20, + res: ResOpen_20 }, "event/qiridenglu/RecPrize": { req: ReqRecPrize_1, res: ResRecPrize_1 }, "event/shiwuleichong/Open": { - req: ReqOpen_20, - res: ResOpen_20 - }, - "event/shouchong/Open": { req: ReqOpen_21, res: ResOpen_21 }, + "event/shouchong/Open": { + req: ReqOpen_22, + res: ResOpen_22 + }, "event/shouchong/Receive": { req: ReqReceive_5, res: ResReceive_5 @@ -707,36 +747,36 @@ export interface ServiceType { res: ResLottery_1 }, "event/xianshizhaomu/Open": { - req: ReqOpen_22, - res: ResOpen_22 + req: ReqOpen_23, + res: ResOpen_23 }, "event/xianshizhaomu/Rec": { req: ReqRec_7, res: ResRec_7 }, "event/xiaofeijingsai/Open": { - req: ReqOpen_23, - res: ResOpen_23 - }, - "event/xinshoulibao/Open": { req: ReqOpen_24, res: ResOpen_24 }, + "event/xinshoulibao/Open": { + req: ReqOpen_25, + res: ResOpen_25 + }, "event/yangchengmubiao/Buy": { req: ReqBuy_2, res: ResBuy_2 }, "event/yangchengmubiao/Open": { - req: ReqOpen_25, - res: ResOpen_25 + req: ReqOpen_26, + res: ResOpen_26 }, "event/yangchengmubiao/Rec": { req: ReqRec_8, res: ResRec_8 }, "event/yibaichou/Open": { - req: ReqOpen_26, - res: ResOpen_26 + req: ReqOpen_27, + res: ResOpen_27 }, "event/yibaichou/Rec": { req: ReqRec_9, @@ -759,20 +799,20 @@ export interface ServiceType { res: ResExchange }, "event/yuandan/Open": { - req: ReqOpen_27, - res: ResOpen_27 + req: ReqOpen_28, + res: ResOpen_28 }, "event/yuandan/TaskRec": { - req: ReqTaskRec_1, - res: ResTaskRec_1 + req: ReqTaskRec_2, + res: ResTaskRec_2 }, "event/yuandan/ZLRec": { req: ReqZLRec, res: ResZLRec }, "event/yuedujijin/Open": { - req: ReqOpen_28, - res: ResOpen_28 + req: ReqOpen_29, + res: ResOpen_29 }, "event/yuedujijin/Rec": { req: ReqRec_10, @@ -783,8 +823,8 @@ export interface ServiceType { res: ResBuyLv }, "event/zhanling/Open": { - req: ReqOpen_29, - res: ResOpen_29 + req: ReqOpen_30, + res: ResOpen_30 }, "event/zhanling/RecPrize": { req: ReqRecPrize_2, @@ -795,13 +835,13 @@ export interface ServiceType { res: ResRecTask }, "event/zhoulibao/Open": { - req: ReqOpen_30, - res: ResOpen_30 - }, - "event/zhoumolibao/Open": { req: ReqOpen_31, res: ResOpen_31 }, + "event/zhoumolibao/Open": { + req: ReqOpen_32, + res: ResOpen_32 + }, "event/zhoumolibao/Receive": { req: ReqReceive_6, res: ResReceive_6 @@ -811,8 +851,8 @@ export interface ServiceType { res: ResBuy_3 }, "event/zixuanlibao/Open": { - req: ReqOpen_32, - res: ResOpen_32 + req: ReqOpen_33, + res: ResOpen_33 }, "eventlist/hdGetList": { req: ReqhdGetList, @@ -835,8 +875,8 @@ export interface ServiceType { res: ResList }, "friend/Open": { - req: ReqOpen_33, - res: ResOpen_33 + req: ReqOpen_34, + res: ResOpen_34 }, "friend/Respond": { req: ReqRespond, @@ -855,24 +895,24 @@ export interface ServiceType { res: ResChallenge }, "ganbutexun/Open": { - req: ReqOpen_34, - res: ResOpen_34 + req: ReqOpen_35, + res: ResOpen_35 }, "ganhai/Fast": { req: ReqFast, res: ResFast }, "ganhai/Fight": { - req: ReqFight_1, - res: ResFight_1 + req: ReqFight_2, + res: ResFight_2 }, "ganhai/Log": { req: ReqLog, res: ResLog }, "ganhai/Open": { - req: ReqOpen_35, - res: ResOpen_35 + req: ReqOpen_36, + res: ResOpen_36 }, "ganhai/Refresh": { req: ReqRefresh, @@ -959,8 +999,8 @@ export interface ServiceType { res: ResManage }, "gonghui/Open": { - req: ReqOpen_36, - res: ResOpen_36 + req: ReqOpen_37, + res: ResOpen_37 }, "gonghui/TanHe": { req: ReqTanHe, @@ -983,20 +1023,20 @@ export interface ServiceType { res: ResLottery_2 }, "gonghuibaozang/Open": { - req: ReqOpen_37, - res: ResOpen_37 + req: ReqOpen_38, + res: ResOpen_38 }, "gonglukuangbiao/Buy": { req: ReqBuy_4, res: ResBuy_4 }, "gonglukuangbiao/Fight": { - req: ReqFight_2, - res: ResFight_2 + req: ReqFight_3, + res: ResFight_3 }, "gonglukuangbiao/Open": { - req: ReqOpen_38, - res: ResOpen_38 + req: ReqOpen_39, + res: ResOpen_39 }, "gonglukuangbiao/Refresh": { req: ReqRefresh_1, @@ -1007,8 +1047,8 @@ export interface ServiceType { res: ResActive }, "gongyu/mingdao/Open": { - req: ReqOpen_39, - res: ResOpen_39 + req: ReqOpen_40, + res: ResOpen_40 }, "gongyu/mingdao/RecPrize": { req: ReqRecPrize_3, @@ -1035,16 +1075,16 @@ export interface ServiceType { res: ResBuyNum_1 }, "hbzb/jfs/Fight": { - req: ReqFight_3, - res: ResFight_3 + req: ReqFight_4, + res: ResFight_4 }, "hbzb/jfs/GetLog": { req: ReqGetLog_1, res: ResGetLog_1 }, "hbzb/jfs/Open": { - req: ReqOpen_40, - res: ResOpen_40 + req: ReqOpen_41, + res: ResOpen_41 }, "hbzb/jfs/Rec": { req: ReqRec_11, @@ -1063,16 +1103,16 @@ export interface ServiceType { res: ResBuyNum_2 }, "hbzb/zbs/Fight": { - req: ReqFight_4, - res: ResFight_4 + req: ReqFight_5, + res: ResFight_5 }, "hbzb/zbs/GetLog": { req: ReqGetLog_2, res: ResGetLog_2 }, "hbzb/zbs/Open": { - req: ReqOpen_41, - res: ResOpen_41 + req: ReqOpen_42, + res: ResOpen_42 }, "hbzb/zbs/Refresh": { req: ReqRefresh_3, @@ -1147,32 +1187,32 @@ export interface ServiceType { res: ResLottery_3 }, "jiaotang/Open": { - req: ReqOpen_42, - res: ResOpen_42 + req: ReqOpen_43, + res: ResOpen_43 }, "jiuba/Lottery": { req: ReqLottery_4, res: ResLottery_4 }, "jiuba/Open": { - req: ReqOpen_43, - res: ResOpen_43 + req: ReqOpen_44, + res: ResOpen_44 }, "jjc/BuyFightNum": { req: ReqBuyFightNum, res: ResBuyFightNum }, "jjc/Fight": { - req: ReqFight_5, - res: ResFight_5 + req: ReqFight_6, + res: ResFight_6 }, "jjc/FightLog": { req: ReqFightLog, res: ResFightLog }, "jjc/Open": { - req: ReqOpen_44, - res: ResOpen_44 + req: ReqOpen_45, + res: ResOpen_45 }, "jjc/Receive": { req: ReqReceive_7, @@ -1183,8 +1223,8 @@ export interface ServiceType { res: ResRefresh_4 }, "kaifujingsai/Open": { - req: ReqOpen_45, - res: ResOpen_45 + req: ReqOpen_46, + res: ResOpen_46 }, "kaifujingsai/Receive": { req: ReqReceive_8, @@ -1203,8 +1243,8 @@ export interface ServiceType { res: ResBuyNum_3 }, "kbzz/Fight": { - req: ReqFight_6, - res: ResFight_6 + req: ReqFight_7, + res: ResFight_7 }, "kbzz/FightLog": { req: ReqFightLog_1, @@ -1215,8 +1255,8 @@ export interface ServiceType { res: ResGroupState }, "kbzz/Open": { - req: ReqOpen_46, - res: ResOpen_46 + req: ReqOpen_47, + res: ResOpen_47 }, "kbzz/RecPrize": { req: ReqRecPrize_4, @@ -1243,8 +1283,8 @@ export interface ServiceType { res: ResLog_1 }, "kuangdong/Open": { - req: ReqOpen_47, - res: ResOpen_47 + req: ReqOpen_48, + res: ResOpen_48 }, "kuangdong/YanShi": { req: ReqYanShi, @@ -1255,8 +1295,8 @@ export interface ServiceType { res: ResZhanLing }, "lingzhulaixi/Open": { - req: ReqOpen_48, - res: ResOpen_48 + req: ReqOpen_49, + res: ResOpen_49 }, "lingzhulaixi/PkBoss": { req: ReqPkBoss, @@ -1275,24 +1315,24 @@ export interface ServiceType { res: ResBuy_5 }, "meirishilian/Fight": { - req: ReqFight_7, - res: ResFight_7 - }, - "meirishilian/Open": { - req: ReqOpen_49, - res: ResOpen_49 - }, - "pata/Fight": { req: ReqFight_8, res: ResFight_8 }, + "meirishilian/Open": { + req: ReqOpen_50, + res: ResOpen_50 + }, + "pata/Fight": { + req: ReqFight_9, + res: ResFight_9 + }, "pata/GetPrize": { req: ReqGetPrize_1, res: ResGetPrize_1 }, "pata/Open": { - req: ReqOpen_50, - res: ResOpen_50 + req: ReqOpen_51, + res: ResOpen_51 }, "pata/SaoDang": { req: ReqSaoDang_1, @@ -1355,8 +1395,8 @@ export interface ServiceType { res: ResJump }, "peijiancangku/Open": { - req: ReqOpen_51, - res: ResOpen_51 + req: ReqOpen_52, + res: ResOpen_52 }, "Bingo": { req: ReqBingo, @@ -1379,21 +1419,21 @@ export interface ServiceType { res: ResItemNoEnough }, "pushgift/Open": { - req: ReqOpen_52, - res: ResOpen_52 - }, - "qjzzd/Fight": { - req: ReqFight_9, - res: ResFight_9 - }, - "qjzzd/Open": { req: ReqOpen_53, res: ResOpen_53 }, - "rank/Open": { + "qjzzd/Fight": { + req: ReqFight_10, + res: ResFight_10 + }, + "qjzzd/Open": { req: ReqOpen_54, res: ResOpen_54 }, + "rank/Open": { + req: ReqOpen_55, + res: ResOpen_55 + }, "shiwu/Concise": { req: ReqConcise, res: ResConcise @@ -1423,8 +1463,8 @@ export interface ServiceType { res: ResWear_3 }, "shootGame/Open": { - req: ReqOpen_55, - res: ResOpen_55 + req: ReqOpen_56, + res: ResOpen_56 }, "shootGame/Rec": { req: ReqRec_13, @@ -1435,8 +1475,8 @@ export interface ServiceType { res: ResBuy_6 }, "shop/Open": { - req: ReqOpen_56, - res: ResOpen_56 + req: ReqOpen_57, + res: ResOpen_57 }, "shop/Refresh": { req: ReqRefresh_6, @@ -1451,8 +1491,8 @@ export interface ServiceType { res: ResGetPrize_2 }, "sign/Open": { - req: ReqOpen_57, - res: ResOpen_57 + req: ReqOpen_58, + res: ResOpen_58 }, "slzd/Aim": { req: ReqAim, @@ -1463,8 +1503,8 @@ export interface ServiceType { res: ResBuyNum_4 }, "slzd/Fight": { - req: ReqFight_10, - res: ResFight_10 + req: ReqFight_11, + res: ResFight_11 }, "slzd/FightLog": { req: ReqFightLog_2, @@ -1475,8 +1515,8 @@ export interface ServiceType { res: ResMyRank }, "slzd/Open": { - req: ReqOpen_58, - res: ResOpen_58 + req: ReqOpen_59, + res: ResOpen_59 }, "slzd/OpenFort": { req: ReqOpenFort, @@ -1503,16 +1543,16 @@ export interface ServiceType { res: ResFastGuaJi }, "tanxian/Fight": { - req: ReqFight_11, - res: ResFight_11 + req: ReqFight_12, + res: ResFight_12 }, "tanxian/GuaJi": { req: ReqGuaJi, res: ResGuaJi }, "tanxian/Open": { - req: ReqOpen_59, - res: ResOpen_59 + req: ReqOpen_60, + res: ResOpen_60 }, "tanxian/Receive": { req: ReqReceive_9, @@ -1527,8 +1567,8 @@ export interface ServiceType { res: ResFinsh }, "task/Open": { - req: ReqOpen_60, - res: ResOpen_60 + req: ReqOpen_61, + res: ResOpen_61 }, "user/CDKEY": { req: ReqCDKEY, @@ -1547,8 +1587,8 @@ export interface ServiceType { res: ResDot }, "user/Fight": { - req: ReqFight_12, - res: ResFight_12 + req: ReqFight_13, + res: ResFight_13 }, "user/GetInfo": { req: ReqGetInfo, @@ -1587,8 +1627,8 @@ export interface ServiceType { res: ResTujian }, "weiwang/Open": { - req: ReqOpen_61, - res: ResOpen_61 + req: ReqOpen_62, + res: ResOpen_62 }, "weiwang/UpLv": { req: ReqUpLv, @@ -1603,8 +1643,8 @@ export interface ServiceType { res: ResExchange_1 }, "weixiuchang/Open": { - req: ReqOpen_62, - res: ResOpen_62 + req: ReqOpen_63, + res: ResOpen_63 }, "weixiuchang/UpLv": { req: ReqUpLv_1, @@ -1647,8 +1687,8 @@ export interface ServiceType { res: ResJingCaiOpen }, "wzry/Open": { - req: ReqOpen_63, - res: ResOpen_63 + req: ReqOpen_64, + res: ResOpen_64 }, "wzry/UpdateFight": { req: ReqUpdateFight, @@ -1679,8 +1719,8 @@ export interface ServiceType { res: ResOnekeyReceive }, "xstask/Open": { - req: ReqOpen_64, - res: ResOpen_64 + req: ReqOpen_65, + res: ResOpen_65 }, "xstask/Receive": { req: ReqReceive_10, @@ -2004,251 +2044,291 @@ export const serviceProto: ServiceProto = { }, { "id": 52, - "name": "event/huobanzhaomu/Open", + "name": "event/huangqijiuguan/DuiHuan", "type": "api" }, { "id": 53, - "name": "event/huobanzhaomu/Rec", + "name": "event/huangqijiuguan/Fight", "type": "api" }, { "id": 54, - "name": "event/jierihuodong/Get", + "name": "event/huangqijiuguan/Open", "type": "api" }, { "id": 55, - "name": "event/jierihuodong/Open", + "name": "event/huangqijiuguan/RankList", "type": "api" }, { "id": 56, - "name": "event/jierihuodong/Rec", + "name": "event/huangqijiuguan/RecDpsPrize", "type": "api" }, { "id": 57, - "name": "event/jijin/CheckOpen", + "name": "event/huangqijiuguan/TaskRec", "type": "api" }, { "id": 58, - "name": "event/jijin/Open", + "name": "event/huangqijiuguan/ZhaoMu", "type": "api" }, { "id": 59, - "name": "event/jijin/Receive", + "name": "event/huangqijiuguan/ZhaoMuPrizeRec", "type": "api" }, { "id": 60, - "name": "event/kaifukuanghuan/LoginPrize", + "name": "event/huobanzhaomu/Open", "type": "api" }, { "id": 61, - "name": "event/kaifukuanghuan/Open", + "name": "event/huobanzhaomu/Rec", "type": "api" }, { "id": 62, - "name": "event/kaifukuanghuan/ShopBuy", + "name": "event/jierihuodong/Get", "type": "api" }, { "id": 63, - "name": "event/kaifukuanghuan/TaskBox", + "name": "event/jierihuodong/Open", "type": "api" }, { "id": 64, - "name": "event/kaifukuanghuan/TaskPrize", + "name": "event/jierihuodong/Rec", "type": "api" }, { "id": 65, - "name": "event/leichonglibao/Open", + "name": "event/jijin/CheckOpen", "type": "api" }, { "id": 66, - "name": "event/leichonglibao/Receive", + "name": "event/jijin/Open", "type": "api" }, { "id": 67, - "name": "event/leijichongzhi/Open", + "name": "event/jijin/Receive", "type": "api" }, { "id": 68, - "name": "event/leijichongzhi/Rec", + "name": "event/kaifukuanghuan/LoginPrize", "type": "api" }, { "id": 69, - "name": "event/niudanji/Lottery", + "name": "event/kaifukuanghuan/Open", "type": "api" }, { "id": 70, - "name": "event/niudanji/Open", + "name": "event/kaifukuanghuan/ShopBuy", "type": "api" }, { "id": 71, - "name": "event/payForDiamond/CanReceive", + "name": "event/kaifukuanghuan/TaskBox", "type": "api" }, { "id": 72, - "name": "event/payForDiamond/Receive", + "name": "event/kaifukuanghuan/TaskPrize", "type": "api" }, { "id": 73, - "name": "event/pobinglibao/Open", + "name": "event/leichonglibao/Open", "type": "api" }, { "id": 74, - "name": "event/pobinglibao/Receive", + "name": "event/leichonglibao/Receive", "type": "api" }, { "id": 75, - "name": "event/qirichongzhi/Open", + "name": "event/leijichongzhi/Open", "type": "api" }, { "id": 76, - "name": "event/qirichongzhi/Rec", + "name": "event/leijichongzhi/Rec", "type": "api" }, { "id": 77, - "name": "event/qiridenglu/Open", + "name": "event/niudanji/Lottery", "type": "api" }, { "id": 78, - "name": "event/qiridenglu/RecPrize", + "name": "event/niudanji/Open", "type": "api" }, { "id": 79, - "name": "event/shiwuleichong/Open", + "name": "event/payForDiamond/CanReceive", "type": "api" }, { "id": 80, - "name": "event/shouchong/Open", + "name": "event/payForDiamond/Receive", "type": "api" }, { "id": 81, - "name": "event/shouchong/Receive", + "name": "event/pobinglibao/Open", "type": "api" }, { "id": 82, - "name": "event/xianshizhaomu/Buy", + "name": "event/pobinglibao/Receive", "type": "api" }, { "id": 83, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 84, - "name": "event/xianshizhaomu/Lottery", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 85, - "name": "event/xianshizhaomu/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 86, - "name": "event/xianshizhaomu/Rec", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 87, - "name": "event/xiaofeijingsai/Open", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 88, - "name": "event/xinshoulibao/Open", + "name": "event/shouchong/Open", "type": "api" }, { "id": 89, - "name": "event/yangchengmubiao/Buy", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 90, - "name": "event/yangchengmubiao/Open", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 91, - "name": "event/yangchengmubiao/Rec", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 92, - "name": "event/yibaichou/Open", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 93, - "name": "event/yibaichou/Rec", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 94, - "name": "event/yibaichou/RecAll", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 95, - "name": "event/yuandan/DMRec", + "name": "event/xiaofeijingsai/Open", "type": "api" }, { "id": 96, - "name": "event/yuandan/DZRec", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 97, - "name": "event/yuandan/Exchange", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 98, - "name": "event/yuandan/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 99, - "name": "event/yuandan/TaskRec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 100, - "name": "event/yuandan/ZLRec", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 101, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 102, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 103, + "name": "event/yuandan/DMRec", + "type": "api" + }, + { + "id": 104, + "name": "event/yuandan/DZRec", + "type": "api" + }, + { + "id": 105, + "name": "event/yuandan/Exchange", + "type": "api" + }, + { + "id": 106, + "name": "event/yuandan/Open", + "type": "api" + }, + { + "id": 107, + "name": "event/yuandan/TaskRec", + "type": "api" + }, + { + "id": 108, + "name": "event/yuandan/ZLRec", + "type": "api" + }, + { + "id": 109, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2256,157 +2336,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 102, + "id": 110, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 103, + "id": 111, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 104, + "id": 112, "name": "event/zhanling/Open", "type": "api" }, { - "id": 105, + "id": 113, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 106, + "id": 114, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 107, + "id": 115, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 108, + "id": 116, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 109, + "id": 117, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 110, + "id": 118, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 111, + "id": 119, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 112, + "id": 120, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 113, + "id": 121, "name": "friend/Apply", "type": "api" }, { - "id": 114, + "id": 122, "name": "friend/Del", "type": "api" }, { - "id": 115, + "id": 123, "name": "friend/Gift", "type": "api" }, { - "id": 116, + "id": 124, "name": "friend/List", "type": "api" }, { - "id": 117, + "id": 125, "name": "friend/Open", "type": "api" }, { - "id": 118, + "id": 126, "name": "friend/Respond", "type": "api" }, { - "id": 119, + "id": 127, "name": "friend/RmBlackList", "type": "api" }, { - "id": 120, + "id": 128, "name": "friend/Search", "type": "api" }, { - "id": 121, + "id": 129, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 122, + "id": 130, "name": "ganbutexun/Open", "type": "api" }, { - "id": 123, + "id": 131, "name": "ganhai/Fast", "type": "api" }, { - "id": 124, + "id": 132, "name": "ganhai/Fight", "type": "api" }, { - "id": 125, + "id": 133, "name": "ganhai/Log", "type": "api" }, { - "id": 126, + "id": 134, "name": "ganhai/Open", "type": "api" }, { - "id": 127, + "id": 135, "name": "ganhai/Refresh", "type": "api" }, { - "id": 128, + "id": 136, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 129, + "id": 137, "name": "ganhai/Select", "type": "api" }, { - "id": 130, + "id": 138, "name": "gmapi/Gift", "type": "api" }, { - "id": 131, + "id": 139, "name": "gmapi/Post", "type": "api" }, { - "id": 132, + "id": 140, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2416,7 +2496,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 141, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2426,7 +2506,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 142, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2436,7 +2516,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 143, "name": "gonghui/Change", "type": "api", "conf": { @@ -2446,12 +2526,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 144, "name": "gonghui/Create", "type": "api" }, { - "id": 137, + "id": 145, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2461,7 +2541,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 146, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2471,12 +2551,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 147, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 140, + "id": 148, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2486,7 +2566,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 141, + "id": 149, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2496,17 +2576,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 142, + "id": 150, "name": "gonghui/GetList", "type": "api" }, { - "id": 143, + "id": 151, "name": "gonghui/Join", "type": "api" }, { - "id": 144, + "id": 152, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2516,7 +2596,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 145, + "id": 153, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2526,7 +2606,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 146, + "id": 154, "name": "gonghui/List", "type": "api", "conf": { @@ -2536,7 +2616,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 147, + "id": 155, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2546,7 +2626,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 148, + "id": 156, "name": "gonghui/Open", "type": "api", "conf": { @@ -2556,7 +2636,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 149, + "id": 157, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2566,7 +2646,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 150, + "id": 158, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2576,7 +2656,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 151, + "id": 159, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2586,7 +2666,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 152, + "id": 160, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2596,137 +2676,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 153, + "id": 161, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 154, + "id": 162, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 155, + "id": 163, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 156, + "id": 164, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 157, + "id": 165, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 158, + "id": 166, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 159, + "id": 167, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 160, + "id": 168, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 161, + "id": 169, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 162, + "id": 170, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 163, + "id": 171, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 164, + "id": 172, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 165, + "id": 173, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 166, + "id": 174, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 167, + "id": 175, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 168, + "id": 176, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 169, + "id": 177, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 170, + "id": 178, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 171, + "id": 179, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 172, + "id": 180, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 173, + "id": 181, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 174, + "id": 182, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 175, + "id": 183, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 176, + "id": 184, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 177, + "id": 185, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 178, + "id": 186, "name": "hero/Awake", "type": "api" }, { - "id": 179, + "id": 187, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2734,17 +2814,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 180, + "id": 188, "name": "hero/GetList", "type": "api" }, { - "id": 181, + "id": 189, "name": "hero/JinJie", "type": "api" }, { - "id": 182, + "id": 190, "name": "hero/LvUp", "type": "api", "conf": { @@ -2752,47 +2832,47 @@ export const serviceProto: ServiceProto = { } }, { - "id": 183, + "id": 191, "name": "hero/Potency", "type": "api" }, { - "id": 184, + "id": 192, "name": "hero/Rec", "type": "api" }, { - "id": 185, + "id": 193, "name": "hero/Reset", "type": "api" }, { - "id": 186, + "id": 194, "name": "hero/Talent", "type": "api" }, { - "id": 187, + "id": 195, "name": "hero/WeaponUp", "type": "api" }, { - "id": 188, + "id": 196, "name": "heroskin/TakeOff", "type": "api" }, { - "id": 189, + "id": 197, "name": "heroskin/Uplv", "type": "api" }, { - "id": 190, + "id": 198, "name": "heroskin/Wear", "type": "api" }, { - "id": 191, + "id": 199, "name": "hongdian/Get", "type": "api", "conf": { @@ -2800,117 +2880,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 192, + "id": 200, "name": "item/GetList", "type": "api" }, { - "id": 193, + "id": 201, "name": "item/Use", "type": "api" }, { - "id": 194, + "id": 202, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 195, + "id": 203, "name": "jiaotang/Open", "type": "api" }, { - "id": 196, + "id": 204, "name": "jiuba/Lottery", "type": "api" }, { - "id": 197, + "id": 205, "name": "jiuba/Open", "type": "api" }, { - "id": 198, + "id": 206, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 199, + "id": 207, "name": "jjc/Fight", "type": "api" }, { - "id": 200, + "id": 208, "name": "jjc/FightLog", "type": "api" }, { - "id": 201, + "id": 209, "name": "jjc/Open", "type": "api" }, { - "id": 202, + "id": 210, "name": "jjc/Receive", "type": "api" }, { - "id": 203, + "id": 211, "name": "jjc/Refresh", "type": "api" }, { - "id": 204, + "id": 212, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 205, + "id": 213, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 206, + "id": 214, "name": "kbzz/Apply", "type": "api" }, { - "id": 207, + "id": 215, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 208, + "id": 216, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 209, + "id": 217, "name": "kbzz/Fight", "type": "api" }, { - "id": 210, + "id": 218, "name": "kbzz/FightLog", "type": "api" }, { - "id": 211, + "id": 219, "name": "kbzz/GroupState", "type": "api" }, { - "id": 212, + "id": 220, "name": "kbzz/Open", "type": "api" }, { - "id": 213, + "id": 221, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 214, + "id": 222, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2918,287 +2998,287 @@ export const serviceProto: ServiceProto = { } }, { - "id": 215, + "id": 223, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 216, + "id": 224, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 217, + "id": 225, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 218, + "id": 226, "name": "kuangdong/Log", "type": "api" }, { - "id": 219, + "id": 227, "name": "kuangdong/Open", "type": "api" }, { - "id": 220, + "id": 228, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 221, + "id": 229, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 222, + "id": 230, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 223, + "id": 231, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 224, + "id": 232, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 225, + "id": 233, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 226, + "id": 234, "name": "meirishilian/Buy", "type": "api" }, { - "id": 227, + "id": 235, "name": "meirishilian/Fight", "type": "api" }, { - "id": 228, + "id": 236, "name": "meirishilian/Open", "type": "api" }, { - "id": 229, + "id": 237, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 230, + "id": 238, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 231, + "id": 239, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 232, + "id": 240, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 233, + "id": 241, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 234, + "id": 242, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 235, + "id": 243, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 236, + "id": 244, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 237, + "id": 245, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 238, + "id": 246, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 239, + "id": 247, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 240, + "id": 248, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 241, + "id": 249, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 242, + "id": 250, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 243, + "id": 251, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 244, + "id": 252, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 245, + "id": 253, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 246, + "id": 254, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 247, + "id": 255, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 248, + "id": 256, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 249, + "id": 257, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 250, + "id": 258, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 251, + "id": 259, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 252, + "id": 260, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 253, + "id": 261, "name": "msg_s2c/PushGiftChange", "type": "msg" }, { - "id": 254, + "id": 262, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 255, + "id": 263, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 256, + "id": 264, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 257, + "id": 265, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 258, + "id": 266, "name": "pata/Fight", "type": "api" }, { - "id": 259, + "id": 267, "name": "pata/GetPrize", "type": "api" }, { - "id": 260, + "id": 268, "name": "pata/Open", "type": "api" }, { - "id": 261, + "id": 269, "name": "pata/SaoDang", "type": "api" }, { - "id": 262, + "id": 270, "name": "pay/GetList", "type": "api" }, { - "id": 263, + "id": 271, "name": "peijian/GetList", "type": "api" }, { - "id": 264, + "id": 272, "name": "peijian/JingLian", "type": "api" }, { - "id": 265, + "id": 273, "name": "peijian/JinJie", "type": "api" }, { - "id": 266, + "id": 274, "name": "peijian/LvUp", "type": "api" }, { - "id": 267, + "id": 275, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 268, + "id": 276, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 269, + "id": 277, "name": "peijian/Reset", "type": "api" }, { - "id": 270, + "id": 278, "name": "peijian/Rm", "type": "api" }, { - "id": 271, + "id": 279, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3206,32 +3286,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 272, + "id": 280, "name": "peijian/UnLock", "type": "api" }, { - "id": 273, + "id": 281, "name": "peijian/Wear", "type": "api" }, { - "id": 274, + "id": 282, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 275, + "id": 283, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 276, + "id": 284, "name": "peijiancangku/Open", "type": "api" }, { - "id": 277, + "id": 285, "name": "Bingo", "type": "api", "conf": { @@ -3239,147 +3319,147 @@ export const serviceProto: ServiceProto = { } }, { - "id": 278, + "id": 286, "name": "FightTest", "type": "api" }, { - "id": 279, + "id": 287, "name": "SyncBtn", "type": "api" }, { - "id": 280, + "id": 288, "name": "Test", "type": "api" }, { - "id": 281, + "id": 289, "name": "pushgift/ItemNoEnough", "type": "api" }, { - "id": 282, + "id": 290, "name": "pushgift/Open", "type": "api" }, { - "id": 283, + "id": 291, "name": "qjzzd/Fight", "type": "api" }, { - "id": 284, + "id": 292, "name": "qjzzd/Open", "type": "api" }, { - "id": 285, + "id": 293, "name": "rank/Open", "type": "api" }, { - "id": 286, + "id": 294, "name": "shiwu/Concise", "type": "api" }, { - "id": 287, + "id": 295, "name": "shiwu/Extract", "type": "api" }, { - "id": 288, + "id": 296, "name": "shiwu/GetList", "type": "api" }, { - "id": 289, + "id": 297, "name": "shiwu/LvUp", "type": "api" }, { - "id": 290, + "id": 298, "name": "shiwu/Recast", "type": "api" }, { - "id": 291, + "id": 299, "name": "shiwu/TakeOff", "type": "api" }, { - "id": 292, + "id": 300, "name": "shiwu/Wear", "type": "api" }, { - "id": 293, + "id": 301, "name": "shootGame/Open", "type": "api" }, { - "id": 294, + "id": 302, "name": "shootGame/Rec", "type": "api" }, { - "id": 295, + "id": 303, "name": "shop/Buy", "type": "api" }, { - "id": 296, + "id": 304, "name": "shop/Open", "type": "api" }, { - "id": 297, + "id": 305, "name": "shop/Refresh", "type": "api" }, { - "id": 298, + "id": 306, "name": "sign/GetBoxPrize", "type": "api" }, { - "id": 299, + "id": 307, "name": "sign/GetPrize", "type": "api" }, { - "id": 300, + "id": 308, "name": "sign/Open", "type": "api" }, { - "id": 301, + "id": 309, "name": "slzd/Aim", "type": "api" }, { - "id": 302, + "id": 310, "name": "slzd/BuyNum", "type": "api" }, { - "id": 303, + "id": 311, "name": "slzd/Fight", "type": "api" }, { - "id": 304, + "id": 312, "name": "slzd/FightLog", "type": "api" }, { - "id": 305, + "id": 313, "name": "slzd/MyRank", "type": "api" }, { - "id": 306, + "id": 314, "name": "slzd/Open", "type": "api", "conf": { @@ -3389,77 +3469,77 @@ export const serviceProto: ServiceProto = { } }, { - "id": 307, + "id": 315, "name": "slzd/OpenFort", "type": "api" }, { - "id": 308, + "id": 316, "name": "slzd/Rec", "type": "api" }, { - "id": 309, + "id": 317, "name": "slzd/Refresh", "type": "api" }, { - "id": 310, + "id": 318, "name": "slzd/Slot", "type": "api" }, { - "id": 311, + "id": 319, "name": "tanxian/Event", "type": "api" }, { - "id": 312, + "id": 320, "name": "tanxian/FastGuaJi", "type": "api" }, { - "id": 313, + "id": 321, "name": "tanxian/Fight", "type": "api" }, { - "id": 314, + "id": 322, "name": "tanxian/GuaJi", "type": "api" }, { - "id": 315, + "id": 323, "name": "tanxian/Open", "type": "api" }, { - "id": 316, + "id": 324, "name": "tanxian/Receive", "type": "api" }, { - "id": 317, + "id": 325, "name": "task/AllFinsh", "type": "api" }, { - "id": 318, + "id": 326, "name": "task/Finsh", "type": "api" }, { - "id": 319, + "id": 327, "name": "task/Open", "type": "api" }, { - "id": 320, + "id": 328, "name": "user/CDKEY", "type": "api" }, { - "id": 321, + "id": 329, "name": "user/ChangeInfo", "type": "api", "conf": { @@ -3467,212 +3547,212 @@ export const serviceProto: ServiceProto = { } }, { - "id": 322, + "id": 330, "name": "user/ChangeName", "type": "api" }, { - "id": 323, + "id": 331, "name": "user/Dot", "type": "api" }, { - "id": 324, + "id": 332, "name": "user/Fight", "type": "api" }, { - "id": 325, + "id": 333, "name": "user/GetInfo", "type": "api" }, { - "id": 326, + "id": 334, "name": "user/InfoOpen", "type": "api" }, { - "id": 327, + "id": 335, "name": "user/Login", "type": "api" }, { - "id": 328, + "id": 336, "name": "user/Ping", "type": "api" }, { - "id": 329, + "id": 337, "name": "user/Renown", "type": "api" }, { - "id": 330, + "id": 338, "name": "user/RenownBuy", "type": "api" }, { - "id": 331, + "id": 339, "name": "user/RenownGetPrize", "type": "api" }, { - "id": 332, + "id": 340, "name": "user/RenownOpen", "type": "api" }, { - "id": 333, + "id": 341, "name": "user/Tujian", "type": "api" }, { - "id": 334, + "id": 342, "name": "weiwang/Open", "type": "api" }, { - "id": 335, + "id": 343, "name": "weiwang/UpLv", "type": "api" }, { - "id": 336, + "id": 344, "name": "weixiuchang/Decompose", "type": "api" }, { - "id": 337, + "id": 345, "name": "weixiuchang/Exchange", "type": "api" }, { - "id": 338, + "id": 346, "name": "weixiuchang/Open", "type": "api" }, { - "id": 339, + "id": 347, "name": "weixiuchang/UpLv", "type": "api" }, { - "id": 340, + "id": 348, "name": "weixiuchang/UpStar", "type": "api" }, { - "id": 341, + "id": 349, "name": "wzry/AutoBaoMing", "type": "api" }, { - "id": 342, + "id": 350, "name": "wzry/BaoMing", "type": "api" }, { - "id": 343, + "id": 351, "name": "wzry/catFightLog", "type": "api" }, { - "id": 344, + "id": 352, "name": "wzry/CatGroup", "type": "api" }, { - "id": 345, + "id": 353, "name": "wzry/DldFight", "type": "api" }, { - "id": 346, + "id": 354, "name": "wzry/DldRefre", "type": "api" }, { - "id": 347, + "id": 355, "name": "wzry/JingCai", "type": "api" }, { - "id": 348, + "id": 356, "name": "wzry/JingCaiOpen", "type": "api" }, { - "id": 349, + "id": 357, "name": "wzry/Open", "type": "api" }, { - "id": 350, + "id": 358, "name": "wzry/UpdateFight", "type": "api" }, { - "id": 351, + "id": 359, "name": "wzry/Wzzd", "type": "api" }, { - "id": 352, + "id": 360, "name": "wzry/ZuanShiOpen", "type": "api" }, { - "id": 353, + "id": 361, "name": "xstask/AllGet", "type": "api" }, { - "id": 354, + "id": 362, "name": "xstask/Get", "type": "api" }, { - "id": 355, + "id": 363, "name": "xstask/LvUp", "type": "api" }, { - "id": 356, + "id": 364, "name": "xstask/OnekeyReceive", "type": "api" }, { - "id": 357, + "id": 365, "name": "xstask/Open", "type": "api" }, { - "id": 358, + "id": 366, "name": "xstask/Receive", "type": "api" }, { - "id": 359, + "id": 367, "name": "xstask/Refresh", "type": "api" }, { - "id": 360, + "id": 368, "name": "yongbingzhuzhan/Handle", "type": "api" }, { - "id": 361, + "id": 369, "name": "zhanqianbushu/ChangePos", "type": "api" }, { - "id": 362, + "id": 370, "name": "zhanqianbushu/Select", "type": "api" }, { - "id": 363, + "id": 371, "name": "zhanqianbushu/Up", "type": "api" } @@ -9688,6 +9768,604 @@ export const serviceProto: ServiceProto = { } ] }, + "event/huangqijiuguan/PtlDuiHuan/ReqDuiHuan": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "dh", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "Number", + "type": { + "type": "Number" + } + } + } + } + ] + }, + "event/huangqijiuguan/PtlDuiHuan/ResDuiHuan": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, + "../../api_s2c/event/huangqijiuguan/fun/PlayerData": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "zhaomu", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "num", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + ] + } + }, + { + "id": 1, + "name": "task", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "rec", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + } + }, + { + "id": 1, + "name": "val", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Number" + } + } + } + } + } + } + ] + } + }, + { + "id": 2, + "name": "giftbuy", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "num", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "select", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + ] + } + } + } + }, + { + "id": 3, + "name": "duihuan", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Number" + } + } + } + }, + { + "id": 4, + "name": "bossres", + "type": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "maxdps", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "todaydps", + "type": { + "type": "Interface", + "indexSignature": { + "keyType": "String", + "type": { + "type": "Number" + } + } + } + }, + { + "id": 2, + "name": "recdpstask", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + ] + } + }, + { + "id": 5, + "name": "lasttime", + "type": { + "type": "Number" + } + } + ] + }, + "event/huangqijiuguan/PtlFight/ReqFight": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + } + ] + }, + "event/huangqijiuguan/PtlFight/ResFight": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + }, + { + "id": 1, + "name": "result", + "type": { + "type": "Reference", + "target": "../fightControl/fightType/fightResult" + } + } + ] + }, + "event/huangqijiuguan/PtlOpen/ReqOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + } + ] + }, + "event/huangqijiuguan/PtlOpen/ResOpen": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + } + ] + }, + "event/huangqijiuguan/PtlRankList/ReqRankList": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + } + ] + }, + "event/huangqijiuguan/PtlRankList/ResRankList": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "rankList", + "type": { + "type": "Array", + "elementType": { + "type": "Any" + } + } + } + ] + }, + "event/huangqijiuguan/PtlRecDpsPrize/ReqRecDpsPrize": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "recid", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + ] + }, + "event/huangqijiuguan/PtlRecDpsPrize/ResRecDpsPrize": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, + "event/huangqijiuguan/PtlTaskRec/ReqTaskRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "day", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "hdid", + "type": { + "type": "Number" + } + }, + { + "id": 2, + "name": "taskid", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + ] + }, + "event/huangqijiuguan/PtlTaskRec/ResTaskRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, + "event/huangqijiuguan/PtlZhaoMu/ReqZhaoMu": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "num", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "hdid", + "type": { + "type": "Number" + } + } + ] + }, + "event/huangqijiuguan/PtlZhaoMu/ResZhaoMu": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, + "event/huangqijiuguan/PtlZhaoMuPrizeRec/ReqZhaoMuPrizeRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "hdid", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "recid", + "type": { + "type": "Array", + "elementType": { + "type": "Number" + } + } + } + ] + }, + "event/huangqijiuguan/PtlZhaoMuPrizeRec/ResZhaoMuPrizeRec": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "data", + "type": { + "type": "Reference", + "target": "../../api_s2c/event/huangqijiuguan/fun/PlayerData" + } + }, + { + "id": 1, + "name": "prize", + "type": { + "type": "Array", + "elementType": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "a", + "type": { + "type": "String" + } + }, + { + "id": 1, + "name": "t", + "type": { + "type": "String" + } + }, + { + "id": 2, + "name": "n", + "type": { + "type": "Number" + } + } + ] + } + } + } + ] + }, "event/huobanzhaomu/PtlOpen/ReqOpen": { "type": "Interface" },