diff --git a/src/api_s2c/event/payForDiamond/ApiCanReceive.ts b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts new file mode 100644 index 0000000..77e0fa9 --- /dev/null +++ b/src/api_s2c/event/payForDiamond/ApiCanReceive.ts @@ -0,0 +1,69 @@ +import { ApiCall } from "tsrpc"; +import { HuoDongFun } from "../../../public/huodongfun"; +import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive'; +import { PublicShared } from "../../../shared/public/public"; +import { ActionLog } from "../../../public/actionLog/actionLog"; +import { WithId, OptionalId } from "mongodb"; +import { ReqAddHuoDong } from "../../../monopoly/protocols/PtlAddHuoDong"; + +const hasGotKeyPrefix = 'payForDiamond:hasGot:'; // 已领取额度 +const showOffListKeyPrefix = 'payForDiamond:ShowOff:'; // 需要炫耀的玩家列表。 其中需要包含信息：玩家区服, 玩家玩家名称, 领到的数量 + +export async function playerCanReceive(call: ApiCall, callError : boolean = true) { + let activityId = call.req.activityId; + let activityInfo: WithId>; + if (!activityId) { + activityInfo = (await HuoDongFun.gethdList(call, 13))[0]; + } else { + activityInfo = await HuoDongFun.getHdidInfo(call, activityId); + } + if (!activityInfo) { + if (callError) { + return call.error('', { code: -1, message: lng.huodong_open_1 }); + } else { + return { result: false }; + } + } + activityId = activityInfo.hdid; + const hasReceivedKey = hasGotKeyPrefix + activityId; + const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); + const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; + const remaining = activityInfo.data['totalmoney'] - hasReceived; + const showOffResult = await G.iorediscross.lrange(showOffListKeyPrefix + activityId, 0, -1); + const showOffList = showOffResult.map(result => JSON.parse(result)); + const zeroTime = PublicShared.getToDayZeroTime(); + const vipScore = await ActionLog.getDayLog(call.uid, 'pay'); + const price = activityInfo.data['price']; + if (!vipScore) { + return { + payNum: 0, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0 + }; + } + const payNum = vipScore; + // 玩家充值未达标或者奖池余额耗尽则不能领取 + if (payNum < price || remaining <= 0) { + return { + payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0 + } + } + // 检查玩家今日是否已经领取 + const playerActivityInfo = await G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid, type: 'payForDiamond' }); + if (playerActivityInfo) { + if (playerActivityInfo[zeroTime]) { + return { + payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: playerActivityInfo[zeroTime] + }; + } + } + return { + payNum, remaining, result: true, activityInfo, showOffList, price, gotAmount: 0 + }; +} + +export default async function (call: ApiCall) { + const canReceiveResult = await playerCanReceive(call); + if (canReceiveResult) { + const { payNum, remaining, result, showOffList, price, gotAmount } = canReceiveResult; + call.succ({ payNum, remaining, result, showOffList, price, gotAmount }); + } +} \ No newline at end of file diff --git a/src/api_s2c/event/payForDiamond/ApiReceive.ts b/src/api_s2c/event/payForDiamond/ApiReceive.ts new file mode 100644 index 0000000..32cc9cb --- /dev/null +++ b/src/api_s2c/event/payForDiamond/ApiReceive.ts @@ -0,0 +1,121 @@ +import { ApiCall } from "tsrpc"; +import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDiamond/PtlReceive'; +import { playerCanReceive } from './ApiCanReceive'; +import { PublicShared } from "../../../shared/public/public"; +import { PlayerFun } from "../../../public/player"; + +type diamondWeightGroup = { + weight: number; + numrange: [ min: number, max: number]; +}; + +const hasGotKeyPrefix = 'payForDiamond:hasGot:'; // 已领取额度 +const hasGotLockKey = "payForDiamond:lock"; // 更新锁, TTL 1s +const showOffListKeyPrefix = 'payForDiamond:ShowOff:'; // 需要炫耀的玩家列表。 其中需要包含信息：玩家区服, 玩家玩家名称, 领到的数量 +/** + * @param groups 各分组及其权重 + */ +function randomWithWeight(groups: diamondWeightGroup[]) { + let maxAmount: number; + let totalWeights = 0; + for (const group of groups) { + totalWeights += group.weight; + if (!maxAmount) { + maxAmount = group.numrange[1]; + } else { + maxAmount = Math.max(maxAmount, group.numrange[1]); + } + } + const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间 + let currSum = 0; + for (const group of groups) { + if (currSum <= randomValue && randomValue < currSum + group.weight) { + return { group, maxAmount }; + } else { + currSum += group.weight; + } + } + const length = groups.length; + return { group: groups[length - 1], maxAmount }; +} + +/** + * 计算玩家分得的钻石数量 + * @param remaining + * @param group + * @param maxAmount + */ +function calcDiamondGot(remaining: number, group: diamondWeightGroup, maxAmount: number) { + const [min, max] = group.numrange; + const randomAmount = Math.floor(Math.random() * (max - min)) + min + 1; // max 值应能够取到, 故 +1 + // 剩余数额小于组内随机得到的值, 全给吧 + if (randomAmount > remaining) { + return remaining; + } + // 随机值大于最大值, 取最大值 + if (randomAmount > maxAmount) { + return maxAmount; + } + return randomAmount; +} + +export default async function (call: ApiCall) { + const canReceiveResult = await playerCanReceive(call); + if (canReceiveResult) { // 该值不存在的情况已被函数直接返回 error, 无需再处理 + if (!canReceiveResult.result) { + return call.succ({ + amount: 0, + timesRemaining: 0, + showOff: false + }); + } + const activityData = canReceiveResult.activityInfo.data; + // 更新 redis 领取记录之前先加锁, 防止多领 + const lockResult = await G.iorediscross.setnx(hasGotLockKey, 1); + if (lockResult) { + await G.iorediscross.expire(hasGotLockKey, 1); // 设置 ttl 避免死锁 + const activityId = call.req.activityId; + const hasReceivedKey = hasGotKeyPrefix + activityId; + const hasReceivedStr = await G.iorediscross.get(hasReceivedKey); + const hasReceived = hasReceivedStr? parseInt(hasReceivedStr) : 0; + const remaining = activityData['totalmoney'] - hasReceived; + if (remaining <= 0) { + return call.succ({ + amount: 0 + }); + } else { + const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']); + const gotAmount = calcDiamondGot(remaining, group, maxAmount); + await G.iorediscross.incrby(hasReceivedKey, Math.abs(gotAmount)); // 添加已领取的额度 + await G.iorediscross.del(hasGotLockKey); // 移除锁 + await PlayerFun.sendPrize(call, [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]); + const showOff = gotAmount >= activityData['groupConf']['base']['loglimit']; + call.succ({ // 领取核心逻辑完成, 请求可以返回了 + amount: gotAmount, + timesRemaining: 0, + showOff, + }); + // 添加玩家领取记录 + const zeroTime = PublicShared.getToDayZeroTime(); + const setObj = {}; + setObj[zeroTime] = gotAmount; + await G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid, type: 'payForDiamond' }, { + $set: setObj + }, {upsert: true}); + // 炫耀 + if (showOff) { + const msg = JSON.stringify({ + name: call.conn.gud.name, gotAmount, serverID: call.conn.gud.sid + }); + const showOffListKey = showOffListKeyPrefix + activityId; + await G.iorediscross.lpush(showOffListKey, msg); + await G.ioredis.ltrim(showOffListKey, 0, 49); // 限制列表保存 50 条消息, 避免无限增长 + } + } + } else { + return call.succ({ + amount: 0 + }); + } + } +} \ No newline at end of file diff --git a/src/api_s2c/hongdian/ApiGet.ts b/src/api_s2c/hongdian/ApiGet.ts index ce0c8d4..4d36f30 100644 --- a/src/api_s2c/hongdian/ApiGet.ts +++ b/src/api_s2c/hongdian/ApiGet.ts @@ -15,11 +15,12 @@ import {md_redPoint} from '../gongyu/mingdao/ApiOpen'; import {HongDianFun, HuoDongHongDianFun} from "./fun"; import {FunWeiXiuChang} from "../../public/weixiuchang"; import {getShouChongRedPoint} from "../event/shouchong/ApiReceive"; +import { playerCanReceive } from '../event/payForDiamond/ApiCanReceive'; const defaultKeys: hongdianKey[] = ['jiuba', 'jiaotang', 'shouchong', 'clslhd', 'dixiaqianzhuanghd', 'gonghuihd', 'hbzbhd', 'jjchd', 'taskhd', 'xstaskhd', 'lingzhulaixihd', 'dxlthd', 'wzcjhd', 'slzdhd', 'qjzzdhd', 'kuangdonghd', 'qiandaohd', 'kaifukuanghuanhd', 'jijinhd', 'zhuishalinghd', 'yibaichouhd', 'huobanzhaomuhd', 'qirileichonghd', 'jierihd', 'kbzzhd', 'wzryhd', 'yuedujijin', 'mingdao', 'patahd', - 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao']; + 'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao', 'payForDiamond']; export default async function (call: ApiCall) { @@ -163,6 +164,10 @@ export default async function (call: ApiCall) { case 'zhoumolibao': res[key] = await HongDianFun.zhoumolibao(call); break; + case 'payForDiamond': + const receiveResult = await playerCanReceive(call, false); + res[key] = { show: receiveResult && receiveResult.result }; + break; } } } diff --git a/src/global.ts b/src/global.ts index 30fa869..e8e35a5 100644 --- a/src/global.ts +++ b/src/global.ts @@ -92,6 +92,8 @@ class _G { redis: redisJsonFun; /**ioredis连接对象 */ ioredis: Redis; + /** 跨服 ioredis 连接对象 */ + iorediscross: Redis; /**mongodb连接对象 */ mongodb: _mongodb; /**crossmongodb连接对象 */ diff --git a/src/ioredis.ts b/src/ioredis.ts index a304d58..00d7f52 100644 --- a/src/ioredis.ts +++ b/src/ioredis.ts @@ -16,4 +16,7 @@ export async function initIORedis() { G.ioredis = new Redis(G.argv.serverType == 'cross' ? G.config.crossRedisUrl : G.config.redisUrl,{ keyPrefix: preKey, }); -} \ No newline at end of file + G.iorediscross = new Redis(G.config.crossRedisUrl,{ + keyPrefix: "cross_", + }); +} diff --git a/src/module/collection_event.ts b/src/module/collection_event.ts index 6681c58..97bec9d 100644 --- a/src/module/collection_event.ts +++ b/src/module/collection_event.ts @@ -50,7 +50,10 @@ export type eventType = { qirichongzhi: Omit; jierihuodong: Omit & { refreshTime: number; }; kaifujingsai: ResOpenKaifujingsai; - zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; } + zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; }; + payForDiamond: { + [time: number]: number + } } & { [k: `${number}jijin`]: ResOpenYuedujijin; [k: `yangchengmubiao${number}`]: yangchengmubiao; diff --git a/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts new file mode 100644 index 0000000..99ec132 --- /dev/null +++ b/src/shared/protocols/event/payForDiamond/PtlCanReceive.ts @@ -0,0 +1,12 @@ +export type ReqCanReceive = { + activityId?: number; +}; + +export type ResCanReceive = { + payNum: number; + remaining?: number; + result: boolean; + price: number; + showOffList: any[]; + gotAmount: number; +}; \ No newline at end of file diff --git a/src/shared/protocols/event/payForDiamond/PtlReceive.ts b/src/shared/protocols/event/payForDiamond/PtlReceive.ts new file mode 100644 index 0000000..cbcda79 --- /dev/null +++ b/src/shared/protocols/event/payForDiamond/PtlReceive.ts @@ -0,0 +1,9 @@ +export type ReqReceive = { + activityId: number; +}; + +export type ResReceive = { + amount: number, + timesRemaining?: number; + showOff?: boolean; +}; diff --git a/src/shared/protocols/hongdian/PtlGet.ts b/src/shared/protocols/hongdian/PtlGet.ts index e09f771..7189cf6 100644 --- a/src/shared/protocols/hongdian/PtlGet.ts +++ b/src/shared/protocols/hongdian/PtlGet.ts @@ -51,7 +51,8 @@ export type hongdianKey = | 'heishiMrjx' | 'weixiuchang' | 'kaifujingsai' - | 'zhoumolibao'; + | 'zhoumolibao' + | 'payForDiamond'; export type hongdianVal = { diff --git a/src/shared/protocols/serviceProto.ts b/src/shared/protocols/serviceProto.ts index 05765ae..945d070 100644 --- a/src/shared/protocols/serviceProto.ts +++ b/src/shared/protocols/serviceProto.ts @@ -68,13 +68,15 @@ import { ReqOpen as ReqOpen_14, ResOpen as ResOpen_14 } from './event/leijichong import { ReqRec as ReqRec_5, ResRec as ResRec_5 } from './event/leijichongzhi/PtlRec'; import { ReqLottery, ResLottery } from './event/niudanji/PtlLottery'; import { ReqOpen as ReqOpen_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen'; +import { ReqCanReceive, ResCanReceive } from './event/payForDiamond/PtlCanReceive'; +import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/payForDiamond/PtlReceive'; import { ReqOpen as ReqOpen_16, ResOpen as ResOpen_16 } from './event/qirichongzhi/PtlOpen'; import { ReqRec as ReqRec_6, ResRec as ResRec_6 } from './event/qirichongzhi/PtlRec'; import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/qiridenglu/PtlOpen'; import { ReqRecPrize as ReqRecPrize_1, ResRecPrize as ResRecPrize_1 } from './event/qiridenglu/PtlRecPrize'; import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/shiwuleichong/PtlOpen'; import { ReqOpen as ReqOpen_19, ResOpen as ResOpen_19 } from './event/shouchong/PtlOpen'; -import { ReqReceive as ReqReceive_2, ResReceive as ResReceive_2 } from './event/shouchong/PtlReceive'; +import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } 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'; @@ -95,7 +97,7 @@ import { ReqRecPrize as ReqRecPrize_2, ResRecPrize as ResRecPrize_2 } from './ev import { ReqRecTask, ResRecTask } from './event/zhanling/PtlRecTask'; import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } from './event/zhoulibao/PtlOpen'; import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/zhoumolibao/PtlOpen'; -import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/zhoumolibao/PtlReceive'; +import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './event/zhoumolibao/PtlReceive'; import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy'; import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zixuanlibao/PtlOpen'; import { ReqhdGetList, ReshdGetList } from './eventlist/PtlhdGetList'; @@ -185,10 +187,10 @@ import { ReqBuyFightNum, ResBuyFightNum } from './jjc/PtlBuyFightNum'; import { ReqFight as ReqFight_5, ResFight as ResFight_5 } from './jjc/PtlFight'; import { ReqFightLog, ResFightLog } from './jjc/PtlFightLog'; import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jjc/PtlOpen'; -import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } from './jjc/PtlReceive'; +import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './jjc/PtlReceive'; import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh'; import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './kaifujingsai/PtlOpen'; -import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './kaifujingsai/PtlReceive'; +import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } 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'; @@ -236,7 +238,6 @@ import { MsgPayResult } from './msg_s2c/MsgPayResult'; import { MsgPeijianChange } from './msg_s2c/MsgPeijianChange'; import { MsgPlayerChange } from './msg_s2c/MsgPlayerChange'; import { MsgPrivate } from './msg_s2c/MsgPrivate'; -import { MsgPushGiftChange } from './msg_s2c/MsgPushGiftChange'; import { MsgSendGift } from './msg_s2c/MsgSendGift'; import { MsgShiwuChange } from './msg_s2c/MsgShiwuChange'; import { MsgTaskChange } from './msg_s2c/MsgTaskChange'; @@ -264,7 +265,6 @@ 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 { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight'; import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } from './qjzzd/PtlOpen'; import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './rank/PtlOpen'; @@ -298,7 +298,7 @@ import { ReqFastGuaJi, ResFastGuaJi } from './tanxian/PtlFastGuaJi'; import { ReqFight as ReqFight_11, ResFight as ResFight_11 } from './tanxian/PtlFight'; import { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi'; import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './tanxian/PtlOpen'; -import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './tanxian/PtlReceive'; +import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './tanxian/PtlReceive'; import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh'; import { ReqFinsh, ResFinsh } from './task/PtlFinsh'; import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } from './task/PtlOpen'; @@ -337,7 +337,7 @@ 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_58, ResOpen as ResOpen_58 } from './xstask/PtlOpen'; -import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './xstask/PtlReceive'; +import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './xstask/PtlReceive'; import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh'; import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle'; import { ReqChangePos as ReqChangePos_1, ResChangePos as ResChangePos_1 } from './zhanqianbushu/PtlChangePos'; @@ -622,6 +622,14 @@ export interface ServiceType { req: ReqOpen_15, res: ResOpen_15 }, + "event/payForDiamond/CanReceive": { + req: ReqCanReceive, + res: ResCanReceive + }, + "event/payForDiamond/Receive": { + req: ReqReceive_2, + res: ResReceive_2 + }, "event/qirichongzhi/Open": { req: ReqOpen_16, res: ResOpen_16 @@ -647,8 +655,8 @@ export interface ServiceType { res: ResOpen_19 }, "event/shouchong/Receive": { - req: ReqReceive_2, - res: ResReceive_2 + req: ReqReceive_3, + res: ResReceive_3 }, "event/xianshizhaomu/Buy": { req: ReqBuy_1, @@ -731,8 +739,8 @@ export interface ServiceType { res: ResOpen_27 }, "event/zhoumolibao/Receive": { - req: ReqReceive_3, - res: ResReceive_3 + req: ReqReceive_4, + res: ResReceive_4 }, "event/zixuanlibao/Buy": { req: ReqBuy_3, @@ -1091,8 +1099,8 @@ export interface ServiceType { res: ResOpen_40 }, "jjc/Receive": { - req: ReqReceive_4, - res: ResReceive_4 + req: ReqReceive_5, + res: ResReceive_5 }, "jjc/Refresh": { req: ReqRefresh_4, @@ -1103,8 +1111,8 @@ export interface ServiceType { res: ResOpen_41 }, "kaifujingsai/Receive": { - req: ReqReceive_5, - res: ResReceive_5 + req: ReqReceive_6, + res: ResReceive_6 }, "kbzz/Apply": { req: ReqApply_2, @@ -1290,10 +1298,6 @@ export interface ServiceType { req: ReqTest, res: ResTest }, - "pushgift/ItemNoEnough": { - req: ReqItemNoEnough, - res: ResItemNoEnough - }, "qjzzd/Fight": { req: ReqFight_9, res: ResFight_9 @@ -1427,8 +1431,8 @@ export interface ServiceType { res: ResOpen_54 }, "tanxian/Receive": { - req: ReqReceive_6, - res: ResReceive_6 + req: ReqReceive_7, + res: ResReceive_7 }, "task/AllFinsh": { req: ReqAllFinsh, @@ -1583,8 +1587,8 @@ export interface ServiceType { res: ResOpen_58 }, "xstask/Receive": { - req: ReqReceive_7, - res: ResReceive_7 + req: ReqReceive_8, + res: ResReceive_8 }, "xstask/Refresh": { req: ReqRefresh_8, @@ -1632,7 +1636,6 @@ export interface ServiceType { "msg_s2c/PeijianChange": MsgPeijianChange, "msg_s2c/PlayerChange": MsgPlayerChange, "msg_s2c/Private": MsgPrivate, - "msg_s2c/PushGiftChange": MsgPushGiftChange, "msg_s2c/SendGift": MsgSendGift, "msg_s2c/ShiwuChange": MsgShiwuChange, "msg_s2c/TaskChange": MsgTaskChange, @@ -1989,101 +1992,111 @@ export const serviceProto: ServiceProto = { }, { "id": 69, - "name": "event/qirichongzhi/Open", + "name": "event/payForDiamond/CanReceive", "type": "api" }, { "id": 70, - "name": "event/qirichongzhi/Rec", + "name": "event/payForDiamond/Receive", "type": "api" }, { "id": 71, - "name": "event/qiridenglu/Open", + "name": "event/qirichongzhi/Open", "type": "api" }, { "id": 72, - "name": "event/qiridenglu/RecPrize", + "name": "event/qirichongzhi/Rec", "type": "api" }, { "id": 73, - "name": "event/shiwuleichong/Open", + "name": "event/qiridenglu/Open", "type": "api" }, { "id": 74, - "name": "event/shouchong/Open", + "name": "event/qiridenglu/RecPrize", "type": "api" }, { "id": 75, - "name": "event/shouchong/Receive", + "name": "event/shiwuleichong/Open", "type": "api" }, { "id": 76, - "name": "event/xianshizhaomu/Buy", + "name": "event/shouchong/Open", "type": "api" }, { "id": 77, - "name": "event/xianshizhaomu/Duihuan", + "name": "event/shouchong/Receive", "type": "api" }, { "id": 78, - "name": "event/xianshizhaomu/Lottery", + "name": "event/xianshizhaomu/Buy", "type": "api" }, { "id": 79, - "name": "event/xianshizhaomu/Open", + "name": "event/xianshizhaomu/Duihuan", "type": "api" }, { "id": 80, - "name": "event/xianshizhaomu/Rec", + "name": "event/xianshizhaomu/Lottery", "type": "api" }, { "id": 81, - "name": "event/xinshoulibao/Open", + "name": "event/xianshizhaomu/Open", "type": "api" }, { "id": 82, - "name": "event/yangchengmubiao/Buy", + "name": "event/xianshizhaomu/Rec", "type": "api" }, { "id": 83, - "name": "event/yangchengmubiao/Open", + "name": "event/xinshoulibao/Open", "type": "api" }, { "id": 84, - "name": "event/yangchengmubiao/Rec", + "name": "event/yangchengmubiao/Buy", "type": "api" }, { "id": 85, - "name": "event/yibaichou/Open", + "name": "event/yangchengmubiao/Open", "type": "api" }, { "id": 86, - "name": "event/yibaichou/Rec", + "name": "event/yangchengmubiao/Rec", "type": "api" }, { "id": 87, - "name": "event/yibaichou/RecAll", + "name": "event/yibaichou/Open", "type": "api" }, { "id": 88, + "name": "event/yibaichou/Rec", + "type": "api" + }, + { + "id": 89, + "name": "event/yibaichou/RecAll", + "type": "api" + }, + { + "id": 90, "name": "event/yuedujijin/Open", "type": "api", "conf": { @@ -2091,157 +2104,157 @@ export const serviceProto: ServiceProto = { } }, { - "id": 89, + "id": 91, "name": "event/yuedujijin/Rec", "type": "api" }, { - "id": 90, + "id": 92, "name": "event/zhanling/BuyLv", "type": "api" }, { - "id": 91, + "id": 93, "name": "event/zhanling/Open", "type": "api" }, { - "id": 92, + "id": 94, "name": "event/zhanling/RecPrize", "type": "api" }, { - "id": 93, + "id": 95, "name": "event/zhanling/RecTask", "type": "api" }, { - "id": 94, + "id": 96, "name": "event/zhoulibao/Open", "type": "api" }, { - "id": 95, + "id": 97, "name": "event/zhoumolibao/Open", "type": "api" }, { - "id": 96, + "id": 98, "name": "event/zhoumolibao/Receive", "type": "api" }, { - "id": 97, + "id": 99, "name": "event/zixuanlibao/Buy", "type": "api" }, { - "id": 98, + "id": 100, "name": "event/zixuanlibao/Open", "type": "api" }, { - "id": 99, + "id": 101, "name": "eventlist/hdGetList", "type": "api" }, { - "id": 100, + "id": 102, "name": "friend/Apply", "type": "api" }, { - "id": 101, + "id": 103, "name": "friend/Del", "type": "api" }, { - "id": 102, + "id": 104, "name": "friend/Gift", "type": "api" }, { - "id": 103, + "id": 105, "name": "friend/List", "type": "api" }, { - "id": 104, + "id": 106, "name": "friend/Open", "type": "api" }, { - "id": 105, + "id": 107, "name": "friend/Respond", "type": "api" }, { - "id": 106, + "id": 108, "name": "friend/RmBlackList", "type": "api" }, { - "id": 107, + "id": 109, "name": "friend/Search", "type": "api" }, { - "id": 108, + "id": 110, "name": "ganbutexun/Challenge", "type": "api" }, { - "id": 109, + "id": 111, "name": "ganbutexun/Open", "type": "api" }, { - "id": 110, + "id": 112, "name": "ganhai/Fast", "type": "api" }, { - "id": 111, + "id": 113, "name": "ganhai/Fight", "type": "api" }, { - "id": 112, + "id": 114, "name": "ganhai/Log", "type": "api" }, { - "id": 113, + "id": 115, "name": "ganhai/Open", "type": "api" }, { - "id": 114, + "id": 116, "name": "ganhai/Refresh", "type": "api" }, { - "id": 115, + "id": 117, "name": "ganhai/RefreshShip", "type": "api" }, { - "id": 116, + "id": 118, "name": "ganhai/Select", "type": "api" }, { - "id": 117, + "id": 119, "name": "gmapi/Gift", "type": "api" }, { - "id": 118, + "id": 120, "name": "gmapi/Post", "type": "api" }, { - "id": 119, + "id": 121, "name": "gonghui/Apply", "type": "api", "conf": { @@ -2251,7 +2264,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 120, + "id": 122, "name": "gonghui/ApplyAll", "type": "api", "conf": { @@ -2261,7 +2274,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 121, + "id": 123, "name": "gonghui/ApplyList", "type": "api", "conf": { @@ -2271,7 +2284,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 122, + "id": 124, "name": "gonghui/Change", "type": "api", "conf": { @@ -2281,12 +2294,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 123, + "id": 125, "name": "gonghui/Create", "type": "api" }, { - "id": 124, + "id": 126, "name": "gonghui/Dissolve", "type": "api", "conf": { @@ -2296,7 +2309,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 125, + "id": 127, "name": "gonghui/Exit", "type": "api", "conf": { @@ -2306,12 +2319,12 @@ export const serviceProto: ServiceProto = { } }, { - "id": 126, + "id": 128, "name": "gonghui/FbBuyNum", "type": "api" }, { - "id": 127, + "id": 129, "name": "gonghui/FbFight", "type": "api", "conf": { @@ -2321,7 +2334,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 128, + "id": 130, "name": "gonghui/FbOpen", "type": "api", "conf": { @@ -2331,17 +2344,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 129, + "id": 131, "name": "gonghui/GetList", "type": "api" }, { - "id": 130, + "id": 132, "name": "gonghui/Join", "type": "api" }, { - "id": 131, + "id": 133, "name": "gonghui/Jx", "type": "api", "conf": { @@ -2351,7 +2364,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 132, + "id": 134, "name": "gonghui/JxOpen", "type": "api", "conf": { @@ -2361,7 +2374,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 133, + "id": 135, "name": "gonghui/List", "type": "api", "conf": { @@ -2371,7 +2384,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 134, + "id": 136, "name": "gonghui/Manage", "type": "api", "conf": { @@ -2381,7 +2394,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 135, + "id": 137, "name": "gonghui/Open", "type": "api", "conf": { @@ -2391,7 +2404,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 136, + "id": 138, "name": "gonghui/TanHe", "type": "api", "conf": { @@ -2401,7 +2414,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 137, + "id": 139, "name": "gonghui/TaskOpen", "type": "api", "conf": { @@ -2411,7 +2424,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 138, + "id": 140, "name": "gonghui/TaskReceive", "type": "api", "conf": { @@ -2421,7 +2434,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 139, + "id": 141, "name": "gonghui/UpWz", "type": "api", "conf": { @@ -2431,137 +2444,137 @@ export const serviceProto: ServiceProto = { } }, { - "id": 140, + "id": 142, "name": "gonghuibaozang/Lottery", "type": "api" }, { - "id": 141, + "id": 143, "name": "gonghuibaozang/Open", "type": "api" }, { - "id": 142, + "id": 144, "name": "gonglukuangbiao/Buy", "type": "api" }, { - "id": 143, + "id": 145, "name": "gonglukuangbiao/Fight", "type": "api" }, { - "id": 144, + "id": 146, "name": "gonglukuangbiao/Open", "type": "api" }, { - "id": 145, + "id": 147, "name": "gonglukuangbiao/Refresh", "type": "api" }, { - "id": 146, + "id": 148, "name": "gongyu/mingdao/Active", "type": "api" }, { - "id": 147, + "id": 149, "name": "gongyu/mingdao/Open", "type": "api" }, { - "id": 148, + "id": 150, "name": "gongyu/mingdao/RecPrize", "type": "api" }, { - "id": 149, + "id": 151, "name": "gongyu/mingdao/Repair", "type": "api" }, { - "id": 150, + "id": 152, "name": "gongyu/xunlianjihua/Reset", "type": "api" }, { - "id": 151, + "id": 153, "name": "gongyu/xunlianjihua/UpSkill", "type": "api" }, { - "id": 152, + "id": 154, "name": "gongyu/zuozhanjihua/SetSkill", "type": "api" }, { - "id": 153, + "id": 155, "name": "hbzb/jfs/BuyNum", "type": "api" }, { - "id": 154, + "id": 156, "name": "hbzb/jfs/Fight", "type": "api" }, { - "id": 155, + "id": 157, "name": "hbzb/jfs/GetLog", "type": "api" }, { - "id": 156, + "id": 158, "name": "hbzb/jfs/Open", "type": "api" }, { - "id": 157, + "id": 159, "name": "hbzb/jfs/Rec", "type": "api" }, { - "id": 158, + "id": 160, "name": "hbzb/jfs/Refresh", "type": "api" }, { - "id": 159, + "id": 161, "name": "hbzb/GetStatus", "type": "api" }, { - "id": 160, + "id": 162, "name": "hbzb/zbs/BuyNum", "type": "api" }, { - "id": 161, + "id": 163, "name": "hbzb/zbs/Fight", "type": "api" }, { - "id": 162, + "id": 164, "name": "hbzb/zbs/GetLog", "type": "api" }, { - "id": 163, + "id": 165, "name": "hbzb/zbs/Open", "type": "api" }, { - "id": 164, + "id": 166, "name": "hbzb/zbs/Refresh", "type": "api" }, { - "id": 165, + "id": 167, "name": "hero/Awake", "type": "api" }, { - "id": 166, + "id": 168, "name": "hero/ChangePos", "type": "api", "conf": { @@ -2569,17 +2582,17 @@ export const serviceProto: ServiceProto = { } }, { - "id": 167, + "id": 169, "name": "hero/GetList", "type": "api" }, { - "id": 168, + "id": 170, "name": "hero/JinJie", "type": "api" }, { - "id": 169, + "id": 171, "name": "hero/LvUp", "type": "api", "conf": { @@ -2587,32 +2600,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 170, + "id": 172, "name": "hero/Potency", "type": "api" }, { - "id": 171, + "id": 173, "name": "hero/Rec", "type": "api" }, { - "id": 172, + "id": 174, "name": "hero/Reset", "type": "api" }, { - "id": 173, + "id": 175, "name": "hero/Talent", "type": "api" }, { - "id": 174, + "id": 176, "name": "hero/WeaponUp", "type": "api" }, { - "id": 175, + "id": 177, "name": "hongdian/Get", "type": "api", "conf": { @@ -2620,117 +2633,117 @@ export const serviceProto: ServiceProto = { } }, { - "id": 176, + "id": 178, "name": "item/GetList", "type": "api" }, { - "id": 177, + "id": 179, "name": "item/Use", "type": "api" }, { - "id": 178, + "id": 180, "name": "jiaotang/Lottery", "type": "api" }, { - "id": 179, + "id": 181, "name": "jiaotang/Open", "type": "api" }, { - "id": 180, + "id": 182, "name": "jiuba/Lottery", "type": "api" }, { - "id": 181, + "id": 183, "name": "jiuba/Open", "type": "api" }, { - "id": 182, + "id": 184, "name": "jjc/BuyFightNum", "type": "api" }, { - "id": 183, + "id": 185, "name": "jjc/Fight", "type": "api" }, { - "id": 184, + "id": 186, "name": "jjc/FightLog", "type": "api" }, { - "id": 185, + "id": 187, "name": "jjc/Open", "type": "api" }, { - "id": 186, + "id": 188, "name": "jjc/Receive", "type": "api" }, { - "id": 187, + "id": 189, "name": "jjc/Refresh", "type": "api" }, { - "id": 188, + "id": 190, "name": "kaifujingsai/Open", "type": "api" }, { - "id": 189, + "id": 191, "name": "kaifujingsai/Receive", "type": "api" }, { - "id": 190, + "id": 192, "name": "kbzz/Apply", "type": "api" }, { - "id": 191, + "id": 193, "name": "kbzz/AutoApply", "type": "api" }, { - "id": 192, + "id": 194, "name": "kbzz/BuyNum", "type": "api" }, { - "id": 193, + "id": 195, "name": "kbzz/Fight", "type": "api" }, { - "id": 194, + "id": 196, "name": "kbzz/FightLog", "type": "api" }, { - "id": 195, + "id": 197, "name": "kbzz/GroupState", "type": "api" }, { - "id": 196, + "id": 198, "name": "kbzz/Open", "type": "api" }, { - "id": 197, + "id": 199, "name": "kbzz/RecPrize", "type": "api" }, { - "id": 198, + "id": 200, "name": "kbzz/Refresh", "type": "api", "conf": { @@ -2738,287 +2751,282 @@ export const serviceProto: ServiceProto = { } }, { - "id": 199, + "id": 201, "name": "kuangdong/AddPkNum", "type": "api" }, { - "id": 200, + "id": 202, "name": "kuangdong/GetPrize", "type": "api" }, { - "id": 201, + "id": 203, "name": "kuangdong/KdInfo", "type": "api" }, { - "id": 202, + "id": 204, "name": "kuangdong/Log", "type": "api" }, { - "id": 203, + "id": 205, "name": "kuangdong/Open", "type": "api" }, { - "id": 204, + "id": 206, "name": "kuangdong/YanShi", "type": "api" }, { - "id": 205, + "id": 207, "name": "kuangdong/ZhanLing", "type": "api" }, { - "id": 206, + "id": 208, "name": "lingzhulaixi/Open", "type": "api" }, { - "id": 207, + "id": 209, "name": "lingzhulaixi/PkBoss", "type": "api" }, { - "id": 208, + "id": 210, "name": "lingzhulaixi/PkRank", "type": "api" }, { - "id": 209, + "id": 211, "name": "lingzhulaixi/SaoDang", "type": "api" }, { - "id": 210, + "id": 212, "name": "meirishilian/Buy", "type": "api" }, { - "id": 211, + "id": 213, "name": "meirishilian/Fight", "type": "api" }, { - "id": 212, + "id": 214, "name": "meirishilian/Open", "type": "api" }, { - "id": 213, + "id": 215, "name": "msg_c2s/BindUid", "type": "msg" }, { - "id": 214, + "id": 216, "name": "msg_c2s/Pay", "type": "msg" }, { - "id": 215, + "id": 217, "name": "msg_c2s/Sync", "type": "msg" }, { - "id": 216, + "id": 218, "name": "msg_s2c/Chat", "type": "msg" }, { - "id": 217, + "id": 219, "name": "msg_s2c/ChatHelp", "type": "msg" }, { - "id": 218, + "id": 220, "name": "msg_s2c/Collection", "type": "msg" }, { - "id": 219, + "id": 221, "name": "msg_s2c/Email", "type": "msg" }, { - "id": 220, + "id": 222, "name": "msg_s2c/EmailDel", "type": "msg" }, { - "id": 221, + "id": 223, "name": "msg_s2c/EquipChange", "type": "msg" }, { - "id": 222, + "id": 224, "name": "msg_s2c/Friend", "type": "msg" }, { - "id": 223, + "id": 225, "name": "msg_s2c/GhChange", "type": "msg" }, { - "id": 224, + "id": 226, "name": "msg_s2c/GongHuiBaoZang", "type": "msg" }, { - "id": 225, + "id": 227, "name": "msg_s2c/HeroChange", "type": "msg" }, { - "id": 226, + "id": 228, "name": "msg_s2c/HongDianChange", "type": "msg" }, { - "id": 227, + "id": 229, "name": "msg_s2c/ItemChange", "type": "msg" }, { - "id": 228, + "id": 230, "name": "msg_s2c/LoginQueue", "type": "msg" }, { - "id": 229, + "id": 231, "name": "msg_s2c/LshdChange", "type": "msg" }, { - "id": 230, + "id": 232, "name": "msg_s2c/NewDay", "type": "msg" }, { - "id": 231, + "id": 233, "name": "msg_s2c/OtherLogin", "type": "msg" }, { - "id": 232, + "id": 234, "name": "msg_s2c/PayChange", "type": "msg" }, { - "id": 233, + "id": 235, "name": "msg_s2c/PayResult", "type": "msg" }, { - "id": 234, + "id": 236, "name": "msg_s2c/PeijianChange", "type": "msg" }, { - "id": 235, + "id": 237, "name": "msg_s2c/PlayerChange", "type": "msg" }, { - "id": 236, + "id": 238, "name": "msg_s2c/Private", "type": "msg" }, { - "id": 237, - "name": "msg_s2c/PushGiftChange", - "type": "msg" - }, - { - "id": 238, + "id": 239, "name": "msg_s2c/SendGift", "type": "msg" }, { - "id": 239, + "id": 240, "name": "msg_s2c/ShiwuChange", "type": "msg" }, { - "id": 240, + "id": 241, "name": "msg_s2c/TaskChange", "type": "msg" }, { - "id": 241, + "id": 242, "name": "msg_s2c/Xianshilibao", "type": "msg" }, { - "id": 242, + "id": 243, "name": "pata/Fight", "type": "api" }, { - "id": 243, + "id": 244, "name": "pata/GetPrize", "type": "api" }, { - "id": 244, + "id": 245, "name": "pata/Open", "type": "api" }, { - "id": 245, + "id": 246, "name": "pata/SaoDang", "type": "api" }, { - "id": 246, + "id": 247, "name": "pay/GetList", "type": "api" }, { - "id": 247, + "id": 248, "name": "peijian/GetList", "type": "api" }, { - "id": 248, + "id": 249, "name": "peijian/JingLian", "type": "api" }, { - "id": 249, + "id": 250, "name": "peijian/JinJie", "type": "api" }, { - "id": 250, + "id": 251, "name": "peijian/LvUp", "type": "api" }, { - "id": 251, + "id": 252, "name": "peijian/OneKeyLvUp", "type": "api" }, { - "id": 252, + "id": 253, "name": "peijian/OneKeyWear", "type": "api" }, { - "id": 253, + "id": 254, "name": "peijian/Reset", "type": "api" }, { - "id": 254, + "id": 255, "name": "peijian/Rm", "type": "api" }, { - "id": 255, + "id": 256, "name": "peijian/TakeOff", "type": "api", "conf": { @@ -3026,32 +3034,32 @@ export const serviceProto: ServiceProto = { } }, { - "id": 256, + "id": 257, "name": "peijian/UnLock", "type": "api" }, { - "id": 257, + "id": 258, "name": "peijian/Wear", "type": "api" }, { - "id": 258, + "id": 259, "name": "peijiancangku/Deal", "type": "api" }, { - "id": 259, + "id": 260, "name": "peijiancangku/Jump", "type": "api" }, { - "id": 260, + "id": 261, "name": "peijiancangku/Open", "type": "api" }, { - "id": 261, + "id": 262, "name": "Bingo", "type": "api", "conf": { @@ -3059,23 +3067,18 @@ export const serviceProto: ServiceProto = { } }, { - "id": 262, + "id": 263, "name": "FightTest", "type": "api" }, { - "id": 263, + "id": 264, "name": "SyncBtn", "type": "api" }, - { - "id": 264, - "name": "Test", - "type": "api" - }, { "id": 265, - "name": "pushgift/ItemNoEnough", + "name": "Test", "type": "api" }, { @@ -3971,29 +3974,6 @@ export const serviceProto: ServiceProto = { }, { "id": 5, - "name": "upModel", - "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "time", - "type": { - "type": "Number" - } - } - ] - } - }, - { - "id": 6, "name": "model", "type": { "type": "Interface", @@ -4022,14 +4002,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 7, + "id": 6, "name": "renown", "type": { "type": "Number" } }, { - "id": 8, + "id": 7, "name": "wxcLv", "type": { "type": "Interface", @@ -4055,14 +4035,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 9, + "id": 8, "name": "mapId", "type": { "type": "Number" } }, { - "id": 10, + "id": 9, "name": "shoucangping", "type": { "type": "Interface", @@ -4075,14 +4055,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 11, + "id": 10, "name": "useTujianLvPoint", "type": { "type": "Number" } }, { - "id": 12, + "id": 11, "name": "skills", "type": { "type": "Interface", @@ -4095,7 +4075,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 13, + "id": 12, "name": "fightSkills", "type": { "type": "Interface", @@ -4108,7 +4088,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 14, + "id": 13, "name": "heroPos", "type": { "type": "Interface", @@ -4121,21 +4101,21 @@ export const serviceProto: ServiceProto = { } }, { - "id": 15, + "id": 14, "name": "ghId", "type": { "type": "String" } }, { - "id": 16, + "id": 15, "name": "ghName", "type": { "type": "String" } }, { - "id": 17, + "id": 16, "name": "ghLevel", "type": { "type": "Reference", @@ -4143,7 +4123,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 18, + "id": 17, "name": "ghwz", "type": { "type": "Interface", @@ -4157,7 +4137,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 19, + "id": 18, "name": "ghExitTime", "type": { "type": "Number" @@ -4165,7 +4145,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 20, + "id": 19, "name": "loginTime", "type": { "type": "Number" @@ -4173,7 +4153,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 21, + "id": 20, "name": "logoutTime", "type": { "type": "Number" @@ -4181,7 +4161,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 22, + "id": 21, "name": "cTime", "type": { "type": "Number" @@ -4189,7 +4169,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 23, + "id": 22, "name": "loginDays", "type": { "type": "Number" @@ -4197,7 +4177,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 24, + "id": 23, "name": "serverName", "type": { "type": "String" @@ -4205,7 +4185,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 25, + "id": 24, "name": "sid", "type": { "type": "Number" @@ -4213,7 +4193,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 26, + "id": 25, "name": "onlineTime", "type": { "type": "Number" @@ -4221,7 +4201,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 27, + "id": 26, "name": "newonlinetime", "type": { "type": "Number" @@ -4229,7 +4209,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 28, + "id": 27, "name": "isNpc", "type": { "type": "Boolean" @@ -4237,7 +4217,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 29, + "id": 28, "name": "matrix", "type": { "type": "Interface", @@ -4251,7 +4231,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 30, + "id": 29, "name": "matrixPos", "type": { "type": "Interface", @@ -4271,7 +4251,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 31, + "id": 30, "name": "selectMatrix", "type": { "type": "String" @@ -4279,7 +4259,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 32, + "id": 31, "name": "fightHeros", "type": { "type": "Array", @@ -4290,7 +4270,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 33, + "id": 32, "name": "helpHeros", "type": { "type": "Array", @@ -4367,7 +4347,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 34, + "id": 33, "name": "changeNameNum", "type": { "type": "Number" @@ -4375,7 +4355,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 35, + "id": 34, "name": "peijianUnlock", "type": { "type": "Interface", @@ -4389,7 +4369,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 36, + "id": 35, "name": "headFrames", "type": { "type": "Interface", @@ -4403,7 +4383,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 37, + "id": 36, "name": "chatFrames", "type": { "type": "Interface", @@ -5215,29 +5195,6 @@ export const serviceProto: ServiceProto = { }, { "id": 5, - "name": "upModel", - "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "time", - "type": { - "type": "Number" - } - } - ] - } - }, - { - "id": 6, "name": "model", "type": { "type": "Interface", @@ -5266,14 +5223,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 7, + "id": 6, "name": "renown", "type": { "type": "Number" } }, { - "id": 8, + "id": 7, "name": "wxcLv", "type": { "type": "Interface", @@ -5299,14 +5256,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 9, + "id": 8, "name": "mapId", "type": { "type": "Number" } }, { - "id": 10, + "id": 9, "name": "shoucangping", "type": { "type": "Interface", @@ -5319,14 +5276,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 11, + "id": 10, "name": "useTujianLvPoint", "type": { "type": "Number" } }, { - "id": 12, + "id": 11, "name": "skills", "type": { "type": "Interface", @@ -5339,7 +5296,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 13, + "id": 12, "name": "fightSkills", "type": { "type": "Interface", @@ -5352,7 +5309,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 14, + "id": 13, "name": "heroPos", "type": { "type": "Interface", @@ -5365,21 +5322,21 @@ export const serviceProto: ServiceProto = { } }, { - "id": 15, + "id": 14, "name": "ghId", "type": { "type": "String" } }, { - "id": 16, + "id": 15, "name": "ghName", "type": { "type": "String" } }, { - "id": 17, + "id": 16, "name": "ghLevel", "type": { "type": "Reference", @@ -5387,7 +5344,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 18, + "id": 17, "name": "ghwz", "type": { "type": "Interface", @@ -5401,7 +5358,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 19, + "id": 18, "name": "ghExitTime", "type": { "type": "Number" @@ -5409,7 +5366,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 20, + "id": 19, "name": "loginTime", "type": { "type": "Number" @@ -5417,7 +5374,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 21, + "id": 20, "name": "logoutTime", "type": { "type": "Number" @@ -5425,7 +5382,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 22, + "id": 21, "name": "cTime", "type": { "type": "Number" @@ -5433,7 +5390,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 23, + "id": 22, "name": "loginDays", "type": { "type": "Number" @@ -5441,7 +5398,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 24, + "id": 23, "name": "serverName", "type": { "type": "String" @@ -5449,7 +5406,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 25, + "id": 24, "name": "sid", "type": { "type": "Number" @@ -5457,7 +5414,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 26, + "id": 25, "name": "onlineTime", "type": { "type": "Number" @@ -5465,7 +5422,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 27, + "id": 26, "name": "newonlinetime", "type": { "type": "Number" @@ -5473,7 +5430,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 28, + "id": 27, "name": "isNpc", "type": { "type": "Boolean" @@ -5481,7 +5438,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 29, + "id": 28, "name": "matrix", "type": { "type": "Interface", @@ -5495,7 +5452,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 30, + "id": 29, "name": "matrixPos", "type": { "type": "Interface", @@ -5515,7 +5472,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 31, + "id": 30, "name": "selectMatrix", "type": { "type": "String" @@ -5523,7 +5480,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 32, + "id": 31, "name": "fightHeros", "type": { "type": "Array", @@ -5534,7 +5491,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 33, + "id": 32, "name": "helpHeros", "type": { "type": "Array", @@ -5611,7 +5568,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 34, + "id": 33, "name": "changeNameNum", "type": { "type": "Number" @@ -5619,7 +5576,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 35, + "id": 34, "name": "peijianUnlock", "type": { "type": "Interface", @@ -5633,7 +5590,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 36, + "id": 35, "name": "headFrames", "type": { "type": "Interface", @@ -5647,7 +5604,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 37, + "id": 36, "name": "chatFrames", "type": { "type": "Interface", @@ -10148,6 +10105,110 @@ export const serviceProto: ServiceProto = { } ] }, + "event/payForDiamond/PtlCanReceive/ReqCanReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "activityId", + "type": { + "type": "Number" + }, + "optional": true + } + ] + }, + "event/payForDiamond/PtlCanReceive/ResCanReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "payNum", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "remaining", + "type": { + "type": "Number" + }, + "optional": true + }, + { + "id": 2, + "name": "result", + "type": { + "type": "Boolean" + } + }, + { + "id": 3, + "name": "price", + "type": { + "type": "Number" + } + }, + { + "id": 4, + "name": "showOffList", + "type": { + "type": "Array", + "elementType": { + "type": "Any" + } + } + }, + { + "id": 5, + "name": "gotAmount", + "type": { + "type": "Number" + } + } + ] + }, + "event/payForDiamond/PtlReceive/ReqReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "activityId", + "type": { + "type": "Number" + } + } + ] + }, + "event/payForDiamond/PtlReceive/ResReceive": { + "type": "Interface", + "properties": [ + { + "id": 0, + "name": "amount", + "type": { + "type": "Number" + } + }, + { + "id": 1, + "name": "timesRemaining", + "type": { + "type": "Number" + }, + "optional": true + }, + { + "id": 2, + "name": "showOff", + "type": { + "type": "Boolean" + }, + "optional": true + } + ] + }, "event/qirichongzhi/PtlOpen/ReqOpen": { "type": "Interface" }, @@ -14918,6 +14979,13 @@ export const serviceProto: ServiceProto = { "type": "Literal", "literal": "zhoumolibao" } + }, + { + "id": 37, + "type": { + "type": "Literal", + "literal": "payForDiamond" + } } ] }, @@ -17951,9 +18019,6 @@ export const serviceProto: ServiceProto = { } } }, - "msg_s2c/MsgPushGiftChange/MsgPushGiftChange": { - "type": "Number" - }, "msg_s2c/MsgSendGift/MsgSendGift": { "type": "Interface", "indexSignature": { @@ -19035,37 +19100,6 @@ export const serviceProto: ServiceProto = { "PtlTest/ResTest": { "type": "Any" }, - "pushgift/PtlItemNoEnough/ReqItemNoEnough": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "need", - "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "a", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "t", - "type": { - "type": "String" - } - } - ] - } - } - ] - }, - "pushgift/PtlItemNoEnough/ResItemNoEnough": { - "type": "Interface" - }, "qjzzd/PtlFight/ReqFight": { "type": "Interface" }, @@ -22959,29 +22993,6 @@ export const serviceProto: ServiceProto = { }, { "id": 5, - "name": "upModel", - "type": { - "type": "Interface", - "properties": [ - { - "id": 0, - "name": "id", - "type": { - "type": "String" - } - }, - { - "id": 1, - "name": "time", - "type": { - "type": "Number" - } - } - ] - } - }, - { - "id": 6, "name": "model", "type": { "type": "Interface", @@ -23010,14 +23021,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 7, + "id": 6, "name": "renown", "type": { "type": "Number" } }, { - "id": 8, + "id": 7, "name": "wxcLv", "type": { "type": "Interface", @@ -23043,14 +23054,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 9, + "id": 8, "name": "mapId", "type": { "type": "Number" } }, { - "id": 10, + "id": 9, "name": "shoucangping", "type": { "type": "Interface", @@ -23063,14 +23074,14 @@ export const serviceProto: ServiceProto = { } }, { - "id": 11, + "id": 10, "name": "useTujianLvPoint", "type": { "type": "Number" } }, { - "id": 12, + "id": 11, "name": "skills", "type": { "type": "Interface", @@ -23083,7 +23094,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 13, + "id": 12, "name": "fightSkills", "type": { "type": "Interface", @@ -23096,7 +23107,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 14, + "id": 13, "name": "heroPos", "type": { "type": "Interface", @@ -23109,21 +23120,21 @@ export const serviceProto: ServiceProto = { } }, { - "id": 15, + "id": 14, "name": "ghId", "type": { "type": "String" } }, { - "id": 16, + "id": 15, "name": "ghName", "type": { "type": "String" } }, { - "id": 17, + "id": 16, "name": "ghLevel", "type": { "type": "Reference", @@ -23131,7 +23142,7 @@ export const serviceProto: ServiceProto = { } }, { - "id": 18, + "id": 17, "name": "ghwz", "type": { "type": "Interface", @@ -23145,7 +23156,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 19, + "id": 18, "name": "ghExitTime", "type": { "type": "Number" @@ -23153,7 +23164,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 20, + "id": 19, "name": "loginTime", "type": { "type": "Number" @@ -23161,7 +23172,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 21, + "id": 20, "name": "logoutTime", "type": { "type": "Number" @@ -23169,7 +23180,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 22, + "id": 21, "name": "cTime", "type": { "type": "Number" @@ -23177,7 +23188,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 23, + "id": 22, "name": "loginDays", "type": { "type": "Number" @@ -23185,7 +23196,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 24, + "id": 23, "name": "serverName", "type": { "type": "String" @@ -23193,7 +23204,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 25, + "id": 24, "name": "sid", "type": { "type": "Number" @@ -23201,7 +23212,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 26, + "id": 25, "name": "onlineTime", "type": { "type": "Number" @@ -23209,7 +23220,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 27, + "id": 26, "name": "newonlinetime", "type": { "type": "Number" @@ -23217,7 +23228,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 28, + "id": 27, "name": "isNpc", "type": { "type": "Boolean" @@ -23225,7 +23236,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 29, + "id": 28, "name": "matrix", "type": { "type": "Interface", @@ -23239,7 +23250,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 30, + "id": 29, "name": "matrixPos", "type": { "type": "Interface", @@ -23259,7 +23270,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 31, + "id": 30, "name": "selectMatrix", "type": { "type": "String" @@ -23267,7 +23278,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 32, + "id": 31, "name": "fightHeros", "type": { "type": "Array", @@ -23278,7 +23289,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 33, + "id": 32, "name": "helpHeros", "type": { "type": "Array", @@ -23355,7 +23366,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 34, + "id": 33, "name": "changeNameNum", "type": { "type": "Number" @@ -23363,7 +23374,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 35, + "id": 34, "name": "peijianUnlock", "type": { "type": "Interface", @@ -23377,7 +23388,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 36, + "id": 35, "name": "headFrames", "type": { "type": "Interface", @@ -23391,7 +23402,7 @@ export const serviceProto: ServiceProto = { "optional": true }, { - "id": 37, + "id": 36, "name": "chatFrames", "type": { "type": "Interface",