Merge branch 'dev' into dev-leijichongzhi

# Conflicts:
#	src/shared/protocols/serviceProto.ts

src/api_s2c/event/payForDiamond/ApiCanReceive.ts

@@ -0,0 +1,45 @@
+import { ApiCall } from "tsrpc";
+import { HuoDongFun } from "../../../public/huodongfun";
+import { ReqCanReceive, ResCanReceive } from '../../../shared/protocols/event/payForDiamond/PtlCanReceive';
+import { PublicShared } from "../../../shared/public/public";
+
+export async function playerCanReceive(call: ApiCall) {
+    const activityInfo = await HuoDongFun.getHdidInfo(call, call.req.activityId);
+    if (!activityInfo) {
+        return call.error('No such activity');
+    }
+    const remaining = typeof activityInfo.data['remaining'] === 'number'? activityInfo.data['remaining'] : activityInfo.data['totalmoney'];
+    const zeroTime = PublicShared.getToDayZeroTime();
+    const dayPayInfo = await G.mongodb.collection('dayPay').findOne({ uid: call.uid, time: zeroTime });
+    if (!dayPayInfo || !dayPayInfo.payNum) {
+        return {
+            payNum: 0, remaining, result: false, activityInfo
+        };
+    }
+    const payNum = dayPayInfo.payNum;
+    // 玩家充值未达标或者奖池余额耗尽则不能领取
+    if (payNum < activityInfo.data['price'] || remaining <= 0) {
+        return {
+            payNum, remaining, result: false, activityInfo
+        }
+    }
+    // 检查玩家今日是否已经领取
+    const playerActivityInfo = G.mongodb.cEvent('payForDiamond').findOne({ uid: call.uid });
+    if (playerActivityInfo) {
+        if (playerActivityInfo[zeroTime]?.length) {
+            return {
+                payNum, remaining, result: false, activityInfo
+            };
+        }
+    }
+    return {
+        payNum, remaining, result: true, activityInfo
+    };
+}
+
+export default async function (call: ApiCall<ReqCanReceive, ResCanReceive>) {
+    const canReceiveResult = await playerCanReceive(call);
+    if (canReceiveResult) {
+        call.succ(canReceiveResult);
+    }
+}

src/api_s2c/event/payForDiamond/ApiReceive.ts

@@ -0,0 +1,113 @@
+import { ApiCall } from "tsrpc";
+import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDiamond/PtlReceive';
+import { playerCanReceive } from './ApiCanReceive';
+import { PublicShared } from "../../../shared/public/public";
+import { ChatFun } from "../../../public/chat";
+
+type diamondWeightGroup = {
+    weight: number;
+    numrange: [ min: number, max: number];
+};
+
+/**
+ * @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.min(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<ReqReceive, ResReceive>) {
+    const canReceiveResult = await playerCanReceive(call);
+    if (canReceiveResult) {
+        if (!canReceiveResult.result) {
+            return call.succ({
+                amount: 0,
+                timesRemaining: 0
+            });
+        }
+        const activityData = canReceiveResult.activityInfo.data;
+        const remaining = typeof activityData['remaining'] === 'number'? activityData['remaining'] : activityData['totalmoney'];
+        const { group, maxAmount } = randomWithWeight(activityData['groupConf']['base']['arr']);
+        const gotAmount = calcDiamondGot(remaining, group, maxAmount);
+        // 减去余额
+        const filter = {
+            hdid: call.req.activityId,
+            $or: [
+                {'data.remaining': { $exists: false }},
+                {$expr: {$gte: [ `$data.remaining - ${gotAmount}`, 0 ]}},
+            ],
+        };
+        const updateDoc = { 
+            $set: { 'data.remaining': `$data.remaining - ${gotAmount}` }
+         }
+        const updateResult = await G.mongodb.collection('hdinfo').updateOne(filter, updateDoc);
+        // 更新成功
+        if (updateResult.modifiedCount) {
+            // 请求返回
+            call.succ({
+                amount: gotAmount,
+                timesRemaining: 0
+            });
+            // 添加玩家领取记录
+            const zeroTime = PublicShared.getToDayZeroTime();
+            const setObj = {};
+            setObj[zeroTime] = gotAmount;
+            G.mongodb.cEvent('payForDiamond').updateOne({ uid: call.uid }, {
+                $set: setObj
+            });
+        }
+        // 发送炫耀
+        if (gotAmount >= activityData['groupConf']['base']['loglimit']) {
+            ChatFun.newMsg({
+                type: 'local',
+                msg: G.gc.pmd.get_hero_star5_pmd,
+                time: G.time,
+                sender: 'system',
+                otherData: {
+                    pmd: true,
+                    args: [gotAmount]
+                }
+            });
+        }
+    }
+}

src/fix_patch/patch_hdinfo_20231221.ts

@@ -0,0 +1,27 @@
+import {ctor} from "../global";
+import {initMongoDB} from "../setMongodb";
+
+async function start() {
+    await initMongoDB()
+
+    // 刷新活动配置
+    console.log(`删除错误活动数据开始...`);
+
+
+    await G.mongodb.collection("hdinfo").deleteOne({hdid: 8000})
+
+    console.log(`删除错误活动数据完成...`);
+}
+
+ctor();
+start().then(() => {
+    let s = 0;
+    setInterval(() => {
+        s += 1;
+        console.log(new Date().format("MM-dd hh:mm:ss"));
+        if (s >= 3) process.exit(1);
+    }, 1000)
+    console.log("逻辑执行完成...等待退出！！！");
+});
+
+

src/json/huodong.json5

@@ -3988,27 +3988,31 @@
         "data" : {
             //活动文本描述
             intr: "xfjstips_1",
-            intr: "xfjstips_2",
+            intr2: "xfjstips_2",
-            //排名
+            //奖励邮件标题
+			mailTitle: "intr_xfjs_mailTitle",
+			//奖励邮件内容
+			mailDes: "intr_xfjs_mailDes",
+			//排名
             rank: [
                 {
                     id: '1',
 					name: 'xfjstips_3',
-                    rank:[1],
+                    rank:[1,1],
 					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 20000}],
                     prize: [{'a': 'item', 't': '13', 'n': 600}]
                 },
                 {
                     id: '2',
 					name: 'xfjstips_4',
-                    rank:[2],
+                    rank:[2,2],
 					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 18000}],
                     prize: [{'a': 'item', 't': '13', 'n': 600}]
                 },
                 {
                     id: '3',
 					name: 'xfjstips_5',
-                    rank:[3],
+                    rank:[3,3],
 					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 16000}],
                     prize: [{'a': 'item', 't': '13', 'n': 600}]
                 },
@@ -4025,6 +4029,13 @@
                     rank:[11,30],
 					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 12000}],
                     prize: [{'a': 'item', 't': '13', 'n': 600}]
+                },
+				{
+                    id: '6',
+					name: 'xfjstips_8',
+                    rank:[31,9999],
+					need: [{'a': 'attr', 't': 'rmbmoney', 'n': 12000}],
+                    prize: [{'a': 'item', 't': '13', 'n': 600}]
                 }
             ]
         }
@@ -4043,15 +4054,17 @@
         "data" : {
             //活动文本描述
             intr: "ljlibaotips_1",
-            intr: "ljlibaotips_2",
+            intr2: "ljlibaotips_2",
             //礼包
             gift: [
                 {
                     id: '1',
+					
 					name: 'ljlibaotips_3',
                     need:[],
 					free: false,
                     payId: 'ljlibao_1',
+					//返利比
 					scale: 200,
                     buynum: 1,
                     prize:[
@@ -4179,7 +4192,11 @@
 					]
                 },
             ],
+			//买X次可以领大奖
+			payRewardNum: 5,
             //自选框掉落池
+			//配几组就显示有几个格子
+			//配置的是可选的道具
             dlz: [
                 {
                     "1": {"a": "item", "t":"600", "n": 20},
@@ -4224,5 +4241,58 @@
                 }
             ]
         }
+    },
+	{
+        "hdid" : 13000,   // 唯一活动id   累计购买礼包
+        "htype" : 13,  // 后端唯一识别标识
+        "stype" : 1300,  // 前端唯一识别标识（看前端需要是否修改）
+        "ttype" : 0,    // 0 按照开服时间计算，1 玩家注册时间计算 4 屏蔽此活动
+        "stime" : 0,  // 活动开始天数
+        "rtime" : 30,   // 活动显示结束天数
+        "etime" : 30,   // 活动实际结束
+        "name": "fenhongbao",
+		"icon": "icon_fenhongbao",
+        "showtime" : "仅供参考，会复写正确值",    // 自选礼包，如果存在多个活动，计费点不要设置一样；如果是一样，可能会存在付费一次，购买多次。
+        "data" : {
+            //活动文本描述
+            intr: "zuanshihongbao_5",
+            //分红包所需最低钻石数
+			price: 1000,
+			reset: 0,
+			//奖池总数量
+			totalmoney: 100000,
+			groupConf: {
+				//档位
+				base: {
+					loglimit:2000,
+					arr:[
+					{
+						//权重
+						"weight": 50,
+						//获得范围
+						"numrange": [1000,1500]
+					},
+					{
+						//权重
+						"weight": 30,
+						//获得范围
+						"numrange": [1500,2000]
+					},
+					{
+						//权重
+						"weight": 15,
+						//获得范围
+						"numrange": [2000,3000]
+					},
+					{
+						//权重
+						"weight": 5,
+						//获得范围
+						"numrange": [3000,8000]
+					}
+					]
+				}
+			}
+        }
     }
 ]

src/json/pmd.json5

@@ -14,5 +14,7 @@
     //黑帮争霸争霸赛第二名
     hbzb_pmd2: 'intr_pmd_hbzb2',
     //黑帮争霸争霸赛第三名
-    hbzb_pmd3: 'intr_pmd_hbzb3'
+    hbzb_pmd3: 'intr_pmd_hbzb3',
+    // 充值抢钻石 - 抢到大量钻石
+    pay_for_diamond: 'intr_pmd_pfd'
 }

src/module/collection_event.ts

@@ -53,7 +53,10 @@ export type eventType = {
     jierihuodong: Omit<ResOpenJierihuodong, 'taskFinish'> & { refreshTime: number; };
     kaifujingsai: ResOpenKaifujingsai;
     zhoumolibao: ResOpenZhoumolibao & { refreshTime: number; }
-    pobinglibao: ResOpenPobinglibao
+    pobinglibao: ResOpenPobinglibao;
+    payForDiamond: {
+        [time: number]: number[]
+    }
 } & {
     [k: `${number}jijin`]: ResOpenYuedujijin;
     [k: `yangchengmubiao${number}`]: yangchengmubiao;

src/public/pay.ts

@@ -178,6 +178,7 @@ export class PayFun {
             if (payed) {
                 console.log(uid, payId, payArgs, orderNo);
                 console.log('订单号已存在');
+                return;
             }
         }
 
@@ -232,13 +233,18 @@ export class PayFun {
             prize.push(...conf.prize)
         }
         //圣诞节活动充值
-        await Christmasfun.payChristmas(payId, call);
+        try{
+            await Christmasfun.payChristmas(payId, call);
+        }catch (e) {
+            console.log("Christmasfun.payChristmas Error",e);
+        }
+
         let isReplaceConf = await this.checkBuysAfterPay(uid, payId, conf, payArgs, player)
         if (isReplaceConf) {
             let prizePayId = `zuanshi_${conf.money}`
             payArgs.toPrizePayId = prizePayId
             conf = this.replacePrizeToChongzhi(prizePayId, conf)
-            prize = [...conf.prize]
+            prize = conf.prize;
         }
 
         await PlayerFun.sendPrize(call, prize);
@@ -286,7 +292,7 @@ export class PayFun {
      * @param payId
      * @param conf
      */
-    static async replacePrizeToChongzhi(payId, conf) {
+    static replacePrizeToChongzhi(payId, conf) {
         return {
             id: payId,
             money: conf.money,

src/shared/protocols/event/payForDiamond/PtlCanReceive.ts

@@ -0,0 +1,9 @@
+export type ReqCanReceive = {
+    activityId: number;
+};
+
+export type ResCanReceive = {
+    payNum: number;
+    remaining?: number;
+    result: boolean;
+};

src/shared/protocols/event/payForDiamond/PtlReceive.ts

@@ -0,0 +1,8 @@
+export type ReqReceive = {
+    activityId: number;
+};
+
+export type ResReceive = {
+    amount: number,
+    timesRemaining: number;
+};

src/shared/protocols/serviceProto.ts

@@ -64,60 +64,60 @@ import { ReqOpen as ReqOpen_13, ResOpen as ResOpen_13 } from './event/kaifukuang
 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_14, ResOpen as ResOpen_14 } from './event/leijichongzhi/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 { 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_15, ResOpen as ResOpen_15 } from './event/niudanji/PtlOpen';
-import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } from './event/pobinglibao/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/pobinglibao/PtlOpen';
 import { ReqReceive as ReqReceive_3, ResReceive as ResReceive_3 } from './event/pobinglibao/PtlReceive';
-import { ReqOpen as ReqOpen_18, ResOpen as ResOpen_18 } from './event/qirichongzhi/PtlOpen';
+import { ReqOpen as ReqOpen_17, ResOpen as ResOpen_17 } 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_18, ResOpen as ResOpen_18 } 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_19, ResOpen as ResOpen_19 } from './event/shiwuleichong/PtlOpen';
-import { ReqOpen as ReqOpen_21, ResOpen as ResOpen_21 } from './event/shouchong/PtlOpen';
+import { ReqOpen as ReqOpen_20, ResOpen as ResOpen_20 } from './event/shouchong/PtlOpen';
 import { ReqReceive as ReqReceive_4, ResReceive as ResReceive_4 } 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_21, ResOpen as ResOpen_21 } 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_22, ResOpen as ResOpen_22 } from './event/xiaofeijingsai/PtlOpen';
-import { ReqOpen as ReqOpen_24, ResOpen as ResOpen_24 } from './event/xinshoulibao/PtlOpen';
+import { ReqOpen as ReqOpen_23, ResOpen as ResOpen_23 } 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_24, ResOpen as ResOpen_24 } 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_25, ResOpen as ResOpen_25 } 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 { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } from './event/yuedujijin/PtlOpen';
+import { ReqOpen as ReqOpen_26, ResOpen as ResOpen_26 } 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_28, ResOpen as ResOpen_28 } from './event/zhanling/PtlOpen';
+import { ReqOpen as ReqOpen_27, ResOpen as ResOpen_27 } 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_29, ResOpen as ResOpen_29 } from './event/zhoulibao/PtlOpen';
+import { ReqOpen as ReqOpen_28, ResOpen as ResOpen_28 } from './event/zhoulibao/PtlOpen';
-import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } from './event/zhoumolibao/PtlOpen';
+import { ReqOpen as ReqOpen_29, ResOpen as ResOpen_29 } from './event/zhoumolibao/PtlOpen';
 import { ReqReceive as ReqReceive_5, ResReceive as ResReceive_5 } from './event/zhoumolibao/PtlReceive';
 import { ReqBuy as ReqBuy_3, ResBuy as ResBuy_3 } from './event/zixuanlibao/PtlBuy';
-import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } from './event/zixuanlibao/PtlOpen';
+import { ReqOpen as ReqOpen_30, ResOpen as ResOpen_30 } 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_32, ResOpen as ResOpen_32 } from './friend/PtlOpen';
+import { ReqOpen as ReqOpen_31, ResOpen as ResOpen_31 } 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_33, ResOpen as ResOpen_33 } from './ganbutexun/PtlOpen';
+import { ReqOpen as ReqOpen_32, ResOpen as ResOpen_32 } from './ganbutexun/PtlOpen';
 import { ReqFast, ResFast } from './ganhai/PtlFast';
 import { ReqFight as ReqFight_1, ResFight as ResFight_1 } from './ganhai/PtlFight';
 import { ReqLog, ResLog } from './ganhai/PtlLog';
-import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } from './ganhai/PtlOpen';
+import { ReqOpen as ReqOpen_33, ResOpen as ResOpen_33 } 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';
@@ -139,19 +139,19 @@ 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_35, ResOpen as ResOpen_35 } from './gonghui/PtlOpen';
+import { ReqOpen as ReqOpen_34, ResOpen as ResOpen_34 } 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_36, ResOpen as ResOpen_36 } from './gonghuibaozang/PtlOpen';
+import { ReqOpen as ReqOpen_35, ResOpen as ResOpen_35 } 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_37, ResOpen as ResOpen_37 } from './gonglukuangbiao/PtlOpen';
+import { ReqOpen as ReqOpen_36, ResOpen as ResOpen_36 } 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_38, ResOpen as ResOpen_38 } from './gongyu/mingdao/PtlOpen';
+import { ReqOpen as ReqOpen_37, ResOpen as ResOpen_37 } 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';
@@ -160,14 +160,14 @@ 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 { ReqGetLog as ReqGetLog_1, ResGetLog as ResGetLog_1 } from './hbzb/jfs/PtlGetLog';
-import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } from './hbzb/jfs/PtlOpen';
+import { ReqOpen as ReqOpen_38, ResOpen as ResOpen_38 } 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 { ReqGetLog as ReqGetLog_2, ResGetLog as ResGetLog_2 } from './hbzb/zbs/PtlGetLog';
-import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './hbzb/zbs/PtlOpen';
+import { ReqOpen as ReqOpen_39, ResOpen as ResOpen_39 } 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';
@@ -183,16 +183,16 @@ 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_41, ResOpen as ResOpen_41 } from './jiaotang/PtlOpen';
+import { ReqOpen as ReqOpen_40, ResOpen as ResOpen_40 } from './jiaotang/PtlOpen';
 import { ReqLottery as ReqLottery_4, ResLottery as ResLottery_4 } from './jiuba/PtlLottery';
-import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jiuba/PtlOpen';
+import { ReqOpen as ReqOpen_41, ResOpen as ResOpen_41 } from './jiuba/PtlOpen';
 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_43, ResOpen as ResOpen_43 } from './jjc/PtlOpen';
+import { ReqOpen as ReqOpen_42, ResOpen as ResOpen_42 } from './jjc/PtlOpen';
 import { ReqReceive as ReqReceive_6, ResReceive as ResReceive_6 } from './jjc/PtlReceive';
 import { ReqRefresh as ReqRefresh_4, ResRefresh as ResRefresh_4 } from './jjc/PtlRefresh';
-import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } from './kaifujingsai/PtlOpen';
+import { ReqOpen as ReqOpen_43, ResOpen as ResOpen_43 } from './kaifujingsai/PtlOpen';
 import { ReqReceive as ReqReceive_7, ResReceive as ResReceive_7 } from './kaifujingsai/PtlReceive';
 import { ReqApply as ReqApply_2, ResApply as ResApply_2 } from './kbzz/PtlApply';
 import { ReqAutoApply, ResAutoApply } from './kbzz/PtlAutoApply';
@@ -200,23 +200,23 @@ import { ReqBuyNum as ReqBuyNum_3, ResBuyNum as ResBuyNum_3 } from './kbzz/PtlBu
 import { ReqFight as ReqFight_6, ResFight as ResFight_6 } 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_45, ResOpen as ResOpen_45 } from './kbzz/PtlOpen';
+import { ReqOpen as ReqOpen_44, ResOpen as ResOpen_44 } 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_46, ResOpen as ResOpen_46 } from './kuangdong/PtlOpen';
+import { ReqOpen as ReqOpen_45, ResOpen as ResOpen_45 } from './kuangdong/PtlOpen';
 import { ReqYanShi, ResYanShi } from './kuangdong/PtlYanShi';
 import { ReqZhanLing, ResZhanLing } from './kuangdong/PtlZhanLing';
-import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './lingzhulaixi/PtlOpen';
+import { ReqOpen as ReqOpen_46, ResOpen as ResOpen_46 } 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_48, ResOpen as ResOpen_48 } from './meirishilian/PtlOpen';
+import { ReqOpen as ReqOpen_47, ResOpen as ResOpen_47 } from './meirishilian/PtlOpen';
 import { MsgBindUid } from './msg_c2s/MsgBindUid';
 import { MsgPay } from './msg_c2s/MsgPay';
 import { MsgSync } from './msg_c2s/MsgSync';
@@ -248,7 +248,7 @@ 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 { ReqGetPrize as ReqGetPrize_1, ResGetPrize as ResGetPrize_1 } from './pata/PtlGetPrize';
-import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './pata/PtlOpen';
+import { ReqOpen as ReqOpen_48, ResOpen as ResOpen_48 } 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';
@@ -264,15 +264,15 @@ import { ReqUnLock, ResUnLock } from './peijian/PtlUnLock';
 import { ReqWear as ReqWear_1, ResWear as ResWear_1 } from './peijian/PtlWear';
 import { ReqDeal, ResDeal } from './peijiancangku/PtlDeal';
 import { ReqJump, ResJump } from './peijiancangku/PtlJump';
-import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './peijiancangku/PtlOpen';
+import { ReqOpen as ReqOpen_49, ResOpen as ResOpen_49 } from './peijiancangku/PtlOpen';
 import { ReqBingo, ResBingo } from './PtlBingo';
 import { ReqFightTest, ResFightTest } from './PtlFightTest';
 import { ReqSyncBtn, ResSyncBtn } from './PtlSyncBtn';
 import { ReqTest, ResTest } from './PtlTest';
-import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './pushgift/PtlOpen';
+import { ReqOpen as ReqOpen_50, ResOpen as ResOpen_50 } from './pushgift/PtlOpen';
 import { ReqFight as ReqFight_9, ResFight as ResFight_9 } from './qjzzd/PtlFight';
-import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } from './qjzzd/PtlOpen';
+import { ReqOpen as ReqOpen_51, ResOpen as ResOpen_51 } from './qjzzd/PtlOpen';
-import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } from './rank/PtlOpen';
+import { ReqOpen as ReqOpen_52, ResOpen as ResOpen_52 } 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';
@@ -280,20 +280,20 @@ import { ReqLvUp as ReqLvUp_3, ResLvUp as ResLvUp_3 } from './shiwu/PtlLvUp';
 import { ReqRecast, ResRecast } from './shiwu/PtlRecast';
 import { ReqTakeOff as ReqTakeOff_2, ResTakeOff as ResTakeOff_2 } from './shiwu/PtlTakeOff';
 import { ReqWear as ReqWear_2, ResWear as ResWear_2 } from './shiwu/PtlWear';
-import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } from './shootGame/PtlOpen';
+import { ReqOpen as ReqOpen_53, ResOpen as ResOpen_53 } 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_55, ResOpen as ResOpen_55 } from './shop/PtlOpen';
+import { ReqOpen as ReqOpen_54, ResOpen as ResOpen_54 } 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_56, ResOpen as ResOpen_56 } from './sign/PtlOpen';
+import { ReqOpen as ReqOpen_55, ResOpen as ResOpen_55 } 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 { ReqFightLog as ReqFightLog_2, ResFightLog as ResFightLog_2 } from './slzd/PtlFightLog';
 import { ReqMyRank, ResMyRank } from './slzd/PtlMyRank';
-import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './slzd/PtlOpen';
+import { ReqOpen as ReqOpen_56, ResOpen as ResOpen_56 } 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';
@@ -302,11 +302,11 @@ 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 { ReqGuaJi, ResGuaJi } from './tanxian/PtlGuaJi';
-import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './tanxian/PtlOpen';
+import { ReqOpen as ReqOpen_57, ResOpen as ResOpen_57 } from './tanxian/PtlOpen';
 import { ReqReceive as ReqReceive_8, ResReceive as ResReceive_8 } from './tanxian/PtlReceive';
 import { ReqAllFinsh, ResAllFinsh } from './task/PtlAllFinsh';
 import { ReqFinsh, ResFinsh } from './task/PtlFinsh';
-import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './task/PtlOpen';
+import { ReqOpen as ReqOpen_58, ResOpen as ResOpen_58 } from './task/PtlOpen';
 import { ReqCDKEY, ResCDKEY } from './user/PtlCDKEY';
 import { ReqChangeInfo, ResChangeInfo } from './user/PtlChangeInfo';
 import { ReqChangeName, ResChangeName } from './user/PtlChangeName';
@@ -322,7 +322,7 @@ import { ReqRenownOpen, ResRenownOpen } from './user/PtlRenownOpen';
 import { ReqTujian, ResTujian } from './user/PtlTujian';
 import { ReqDecompose, ResDecompose } from './weixiuchang/PtlDecompose';
 import { ReqExchange, ResExchange } from './weixiuchang/PtlExchange';
-import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './weixiuchang/PtlOpen';
+import { ReqOpen as ReqOpen_59, ResOpen as ResOpen_59 } from './weixiuchang/PtlOpen';
 import { ReqUpLv, ResUpLv } from './weixiuchang/PtlUpLv';
 import { ReqUpStar, ResUpStar } from './weixiuchang/PtlUpStar';
 import { ReqAutoBaoMing, ResAutoBaoMing } from './wzry/PtlAutoBaoMing';
@@ -333,7 +333,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_61, ResOpen as ResOpen_61 } from './wzry/PtlOpen';
+import { ReqOpen as ReqOpen_60, ResOpen as ResOpen_60 } from './wzry/PtlOpen';
 import { ReqUpdateFight, ResUpdateFight } from './wzry/PtlUpdateFight';
 import { ReqWzzd, ResWzzd } from './wzry/PtlWzzd';
 import { ReqZuanShiOpen, ResZuanShiOpen } from './wzry/PtlZuanShiOpen';
@@ -341,7 +341,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_62, ResOpen as ResOpen_62 } from './xstask/PtlOpen';
+import { ReqOpen as ReqOpen_61, ResOpen as ResOpen_61 } from './xstask/PtlOpen';
 import { ReqReceive as ReqReceive_9, ResReceive as ResReceive_9 } from './xstask/PtlReceive';
 import { ReqRefresh as ReqRefresh_8, ResRefresh as ResRefresh_8 } from './xstask/PtlRefresh';
 import { ReqHandle, ResHandle } from './yongbingzhuzhan/PtlHandle';
@@ -611,18 +611,10 @@ export interface ServiceType {
             req: ReqTaskPrize,
             res: ResTaskPrize
         },
-        "event/leichonglibao/Open": {
+        "event/leijichongzhi/Open": {
             req: ReqOpen_14,
             res: ResOpen_14
         },
-        "event/leichonglibao/Receive": {
-            req: ReqReceive_2,
-            res: ResReceive_2
-        },
-        "event/leijichongzhi/Open": {
-            req: ReqOpen_15,
-            res: ResOpen_15
-        },
         "event/leijichongzhi/Rec": {
             req: ReqRec_5,
             res: ResRec_5
@@ -632,40 +624,48 @@ export interface ServiceType {
             res: ResLottery
         },
         "event/niudanji/Open": {
-            req: ReqOpen_16,
+            req: ReqOpen_15,
-            res: ResOpen_16
+            res: ResOpen_15
+        },
+        "event/payForDiamond/CanReceive": {
+            req: ReqCanReceive,
+            res: ResCanReceive
+        },
+        "event/payForDiamond/Receive": {
+            req: ReqReceive_2,
+            res: ResReceive_2
         },
         "event/pobinglibao/Open": {
-            req: ReqOpen_17,
+            req: ReqOpen_16,
-            res: ResOpen_17
+            res: ResOpen_16
         },
         "event/pobinglibao/Receive": {
             req: ReqReceive_3,
             res: ResReceive_3
         },
         "event/qirichongzhi/Open": {
-            req: ReqOpen_18,
+            req: ReqOpen_17,
-            res: ResOpen_18
+            res: ResOpen_17
         },
         "event/qirichongzhi/Rec": {
             req: ReqRec_6,
             res: ResRec_6
         },
         "event/qiridenglu/Open": {
-            req: ReqOpen_19,
+            req: ReqOpen_18,
-            res: ResOpen_19
+            res: ResOpen_18
         },
         "event/qiridenglu/RecPrize": {
             req: ReqRecPrize_1,
             res: ResRecPrize_1
         },
         "event/shiwuleichong/Open": {
-            req: ReqOpen_20,
+            req: ReqOpen_19,
-            res: ResOpen_20
+            res: ResOpen_19
         },
         "event/shouchong/Open": {
-            req: ReqOpen_21,
+            req: ReqOpen_20,
-            res: ResOpen_21
+            res: ResOpen_20
         },
         "event/shouchong/Receive": {
             req: ReqReceive_4,
@@ -684,36 +684,36 @@ export interface ServiceType {
             res: ResLottery_1
         },
         "event/xianshizhaomu/Open": {
-            req: ReqOpen_22,
+            req: ReqOpen_21,
-            res: ResOpen_22
+            res: ResOpen_21
         },
         "event/xianshizhaomu/Rec": {
             req: ReqRec_7,
             res: ResRec_7
         },
         "event/xiaofeijingsai/Open": {
-            req: ReqOpen_23,
+            req: ReqOpen_22,
-            res: ResOpen_23
+            res: ResOpen_22
         },
         "event/xinshoulibao/Open": {
-            req: ReqOpen_24,
+            req: ReqOpen_23,
-            res: ResOpen_24
+            res: ResOpen_23
         },
         "event/yangchengmubiao/Buy": {
             req: ReqBuy_2,
             res: ResBuy_2
         },
         "event/yangchengmubiao/Open": {
-            req: ReqOpen_25,
+            req: ReqOpen_24,
-            res: ResOpen_25
+            res: ResOpen_24
         },
         "event/yangchengmubiao/Rec": {
             req: ReqRec_8,
             res: ResRec_8
         },
         "event/yibaichou/Open": {
-            req: ReqOpen_26,
+            req: ReqOpen_25,
-            res: ResOpen_26
+            res: ResOpen_25
         },
         "event/yibaichou/Rec": {
             req: ReqRec_9,
@@ -724,8 +724,8 @@ export interface ServiceType {
             res: ResRecAll
         },
         "event/yuedujijin/Open": {
-            req: ReqOpen_27,
+            req: ReqOpen_26,
-            res: ResOpen_27
+            res: ResOpen_26
         },
         "event/yuedujijin/Rec": {
             req: ReqRec_10,
@@ -736,8 +736,8 @@ export interface ServiceType {
             res: ResBuyLv
         },
         "event/zhanling/Open": {
-            req: ReqOpen_28,
+            req: ReqOpen_27,
-            res: ResOpen_28
+            res: ResOpen_27
         },
         "event/zhanling/RecPrize": {
             req: ReqRecPrize_2,
@@ -748,12 +748,12 @@ export interface ServiceType {
             res: ResRecTask
         },
         "event/zhoulibao/Open": {
-            req: ReqOpen_29,
+            req: ReqOpen_28,
-            res: ResOpen_29
+            res: ResOpen_28
         },
         "event/zhoumolibao/Open": {
-            req: ReqOpen_30,
+            req: ReqOpen_29,
-            res: ResOpen_30
+            res: ResOpen_29
         },
         "event/zhoumolibao/Receive": {
             req: ReqReceive_5,
@@ -764,8 +764,8 @@ export interface ServiceType {
             res: ResBuy_3
         },
         "event/zixuanlibao/Open": {
-            req: ReqOpen_31,
+            req: ReqOpen_30,
-            res: ResOpen_31
+            res: ResOpen_30
         },
         "eventlist/hdGetList": {
             req: ReqhdGetList,
@@ -788,8 +788,8 @@ export interface ServiceType {
             res: ResList
         },
         "friend/Open": {
-            req: ReqOpen_32,
+            req: ReqOpen_31,
-            res: ResOpen_32
+            res: ResOpen_31
         },
         "friend/Respond": {
             req: ReqRespond,
@@ -808,8 +808,8 @@ export interface ServiceType {
             res: ResChallenge
         },
         "ganbutexun/Open": {
-            req: ReqOpen_33,
+            req: ReqOpen_32,
-            res: ResOpen_33
+            res: ResOpen_32
         },
         "ganhai/Fast": {
             req: ReqFast,
@@ -824,8 +824,8 @@ export interface ServiceType {
             res: ResLog
         },
         "ganhai/Open": {
-            req: ReqOpen_34,
+            req: ReqOpen_33,
-            res: ResOpen_34
+            res: ResOpen_33
         },
         "ganhai/Refresh": {
             req: ReqRefresh,
@@ -912,8 +912,8 @@ export interface ServiceType {
             res: ResManage
         },
         "gonghui/Open": {
-            req: ReqOpen_35,
+            req: ReqOpen_34,
-            res: ResOpen_35
+            res: ResOpen_34
         },
         "gonghui/TanHe": {
             req: ReqTanHe,
@@ -936,8 +936,8 @@ export interface ServiceType {
             res: ResLottery_2
         },
         "gonghuibaozang/Open": {
-            req: ReqOpen_36,
+            req: ReqOpen_35,
-            res: ResOpen_36
+            res: ResOpen_35
         },
         "gonglukuangbiao/Buy": {
             req: ReqBuy_4,
@@ -948,8 +948,8 @@ export interface ServiceType {
             res: ResFight_2
         },
         "gonglukuangbiao/Open": {
-            req: ReqOpen_37,
+            req: ReqOpen_36,
-            res: ResOpen_37
+            res: ResOpen_36
         },
         "gonglukuangbiao/Refresh": {
             req: ReqRefresh_1,
@@ -960,8 +960,8 @@ export interface ServiceType {
             res: ResActive
         },
         "gongyu/mingdao/Open": {
-            req: ReqOpen_38,
+            req: ReqOpen_37,
-            res: ResOpen_38
+            res: ResOpen_37
         },
         "gongyu/mingdao/RecPrize": {
             req: ReqRecPrize_3,
@@ -996,8 +996,8 @@ export interface ServiceType {
             res: ResGetLog_1
         },
         "hbzb/jfs/Open": {
-            req: ReqOpen_39,
+            req: ReqOpen_38,
-            res: ResOpen_39
+            res: ResOpen_38
         },
         "hbzb/jfs/Rec": {
             req: ReqRec_11,
@@ -1024,8 +1024,8 @@ export interface ServiceType {
             res: ResGetLog_2
         },
         "hbzb/zbs/Open": {
-            req: ReqOpen_40,
+            req: ReqOpen_39,
-            res: ResOpen_40
+            res: ResOpen_39
         },
         "hbzb/zbs/Refresh": {
             req: ReqRefresh_3,
@@ -1088,16 +1088,16 @@ export interface ServiceType {
             res: ResLottery_3
         },
         "jiaotang/Open": {
-            req: ReqOpen_41,
+            req: ReqOpen_40,
-            res: ResOpen_41
+            res: ResOpen_40
         },
         "jiuba/Lottery": {
             req: ReqLottery_4,
             res: ResLottery_4
         },
         "jiuba/Open": {
-            req: ReqOpen_42,
+            req: ReqOpen_41,
-            res: ResOpen_42
+            res: ResOpen_41
         },
         "jjc/BuyFightNum": {
             req: ReqBuyFightNum,
@@ -1112,8 +1112,8 @@ export interface ServiceType {
             res: ResFightLog
         },
         "jjc/Open": {
-            req: ReqOpen_43,
+            req: ReqOpen_42,
-            res: ResOpen_43
+            res: ResOpen_42
         },
         "jjc/Receive": {
             req: ReqReceive_6,
@@ -1124,8 +1124,8 @@ export interface ServiceType {
             res: ResRefresh_4
         },
         "kaifujingsai/Open": {
-            req: ReqOpen_44,
+            req: ReqOpen_43,
-            res: ResOpen_44
+            res: ResOpen_43
         },
         "kaifujingsai/Receive": {
             req: ReqReceive_7,
@@ -1156,8 +1156,8 @@ export interface ServiceType {
             res: ResGroupState
         },
         "kbzz/Open": {
-            req: ReqOpen_45,
+            req: ReqOpen_44,
-            res: ResOpen_45
+            res: ResOpen_44
         },
         "kbzz/RecPrize": {
             req: ReqRecPrize_4,
@@ -1184,8 +1184,8 @@ export interface ServiceType {
             res: ResLog_1
         },
         "kuangdong/Open": {
-            req: ReqOpen_46,
+            req: ReqOpen_45,
-            res: ResOpen_46
+            res: ResOpen_45
         },
         "kuangdong/YanShi": {
             req: ReqYanShi,
@@ -1196,8 +1196,8 @@ export interface ServiceType {
             res: ResZhanLing
         },
         "lingzhulaixi/Open": {
-            req: ReqOpen_47,
+            req: ReqOpen_46,
-            res: ResOpen_47
+            res: ResOpen_46
         },
         "lingzhulaixi/PkBoss": {
             req: ReqPkBoss,
@@ -1220,8 +1220,8 @@ export interface ServiceType {
             res: ResFight_7
         },
         "meirishilian/Open": {
-            req: ReqOpen_48,
+            req: ReqOpen_47,
-            res: ResOpen_48
+            res: ResOpen_47
         },
         "pata/Fight": {
             req: ReqFight_8,
@@ -1232,8 +1232,8 @@ export interface ServiceType {
             res: ResGetPrize_1
         },
         "pata/Open": {
-            req: ReqOpen_49,
+            req: ReqOpen_48,
-            res: ResOpen_49
+            res: ResOpen_48
         },
         "pata/SaoDang": {
             req: ReqSaoDang_1,
@@ -1296,8 +1296,8 @@ export interface ServiceType {
             res: ResJump
         },
         "peijiancangku/Open": {
-            req: ReqOpen_50,
+            req: ReqOpen_49,
-            res: ResOpen_50
+            res: ResOpen_49
         },
         "Bingo": {
             req: ReqBingo,
@@ -1316,20 +1316,20 @@ export interface ServiceType {
             res: ResTest
         },
         "pushgift/Open": {
-            req: ReqOpen_51,
+            req: ReqOpen_50,
-            res: ResOpen_51
+            res: ResOpen_50
         },
         "qjzzd/Fight": {
             req: ReqFight_9,
             res: ResFight_9
         },
         "qjzzd/Open": {
-            req: ReqOpen_52,
+            req: ReqOpen_51,
-            res: ResOpen_52
+            res: ResOpen_51
         },
         "rank/Open": {
-            req: ReqOpen_53,
+            req: ReqOpen_52,
-            res: ResOpen_53
+            res: ResOpen_52
         },
         "shiwu/Concise": {
             req: ReqConcise,
@@ -1360,8 +1360,8 @@ export interface ServiceType {
             res: ResWear_2
         },
         "shootGame/Open": {
-            req: ReqOpen_54,
+            req: ReqOpen_53,
-            res: ResOpen_54
+            res: ResOpen_53
         },
         "shootGame/Rec": {
             req: ReqRec_13,
@@ -1372,8 +1372,8 @@ export interface ServiceType {
             res: ResBuy_6
         },
         "shop/Open": {
-            req: ReqOpen_55,
+            req: ReqOpen_54,
-            res: ResOpen_55
+            res: ResOpen_54
         },
         "shop/Refresh": {
             req: ReqRefresh_6,
@@ -1388,8 +1388,8 @@ export interface ServiceType {
             res: ResGetPrize_2
         },
         "sign/Open": {
-            req: ReqOpen_56,
+            req: ReqOpen_55,
-            res: ResOpen_56
+            res: ResOpen_55
         },
         "slzd/Aim": {
             req: ReqAim,
@@ -1412,8 +1412,8 @@ export interface ServiceType {
             res: ResMyRank
         },
         "slzd/Open": {
-            req: ReqOpen_57,
+            req: ReqOpen_56,
-            res: ResOpen_57
+            res: ResOpen_56
         },
         "slzd/OpenFort": {
             req: ReqOpenFort,
@@ -1448,8 +1448,8 @@ export interface ServiceType {
             res: ResGuaJi
         },
         "tanxian/Open": {
-            req: ReqOpen_58,
+            req: ReqOpen_57,
-            res: ResOpen_58
+            res: ResOpen_57
         },
         "tanxian/Receive": {
             req: ReqReceive_8,
@@ -1464,8 +1464,8 @@ export interface ServiceType {
             res: ResFinsh
         },
         "task/Open": {
-            req: ReqOpen_59,
+            req: ReqOpen_58,
-            res: ResOpen_59
+            res: ResOpen_58
         },
         "user/CDKEY": {
             req: ReqCDKEY,
@@ -1528,8 +1528,8 @@ export interface ServiceType {
             res: ResExchange
         },
         "weixiuchang/Open": {
-            req: ReqOpen_60,
+            req: ReqOpen_59,
-            res: ResOpen_60
+            res: ResOpen_59
         },
         "weixiuchang/UpLv": {
             req: ReqUpLv,
@@ -1572,8 +1572,8 @@ export interface ServiceType {
             res: ResJingCaiOpen
         },
         "wzry/Open": {
-            req: ReqOpen_61,
+            req: ReqOpen_60,
-            res: ResOpen_61
+            res: ResOpen_60
         },
         "wzry/UpdateFight": {
             req: ReqUpdateFight,
@@ -1604,8 +1604,8 @@ export interface ServiceType {
             res: ResOnekeyReceive
         },
         "xstask/Open": {
-            req: ReqOpen_62,
+            req: ReqOpen_61,
-            res: ResOpen_62
+            res: ResOpen_61
         },
         "xstask/Receive": {
             req: ReqReceive_9,
@@ -1994,34 +1994,34 @@ export const serviceProto: ServiceProto<ServiceType> = {
         },
         {
             "id": 65,
-            "name": "event/leichonglibao/Open",
-            "type": "api"
-        },
-        {
-            "id": 66,
-            "name": "event/leichonglibao/Receive",
-            "type": "api"
-        },
-        {
-            "id": 67,
             "name": "event/leijichongzhi/Open",
             "type": "api"
         },
         {
-            "id": 68,
+            "id": 66,
             "name": "event/leijichongzhi/Rec",
             "type": "api"
         },
         {
-            "id": 69,
+            "id": 67,
             "name": "event/niudanji/Lottery",
             "type": "api"
         },
         {
-            "id": 70,
+            "id": 68,
             "name": "event/niudanji/Open",
             "type": "api"
         },
+        {
+            "id": 69,
+            "name": "event/payForDiamond/CanReceive",
+            "type": "api"
+        },
+        {
+            "id": 70,
+            "name": "event/payForDiamond/Receive",
+            "type": "api"
+        },
         {
             "id": 71,
             "name": "event/pobinglibao/Open",
@@ -10045,78 +10045,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
-        "event/leichonglibao/PtlOpen/ReqOpen": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "hdid",
-                    "type": {
-                        "type": "Number"
-                    }
-                }
-            ]
-        },
-        "event/leichonglibao/PtlOpen/ResOpen": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "sc",
-                    "type": {
-                        "type": "Boolean"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "buy",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "String"
-                        }
-                    }
-                }
-            ]
-        },
-        "event/leichonglibao/PtlReceive/ReqReceive": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "hdid",
-                    "type": {
-                        "type": "Number"
-                    }
-                },
-                {
-                    "id": 1,
-                    "name": "select",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "String"
-                        }
-                    }
-                }
-            ]
-        },
-        "event/leichonglibao/PtlReceive/ResReceive": {
-            "type": "Interface",
-            "properties": [
-                {
-                    "id": 0,
-                    "name": "prize",
-                    "type": {
-                        "type": "Array",
-                        "elementType": {
-                            "type": "Reference",
-                            "target": "type/prizeType"
-                        }
-                    }
-                }
-            ]
-        },
         "event/leijichongzhi/PtlOpen/ReqOpen": {
             "type": "Interface",
             "properties": [
@@ -10270,6 +10198,76 @@ export const serviceProto: ServiceProto<ServiceType> = {
                 }
             ]
         },
+        "event/payForDiamond/PtlCanReceive/ReqCanReceive": {
+            "type": "Interface",
+            "properties": [
+                {
+                    "id": 0,
+                    "name": "activityId",
+                    "type": {
+                        "type": "Number"
+                    }
+                }
+            ]
+        },
+        "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"
+                    }
+                }
+            ]
+        },
+        "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"
+                    }
+                }
+            ]
+        },
         "event/pobinglibao/PtlOpen/ReqOpen": {
             "type": "Interface"
         },
@@ -15184,13 +15182,6 @@ export const serviceProto: ServiceProto<ServiceType> = {
                         "type": "Literal",
                         "literal": "pobinglibao"
                     }
-                },
-                {
-                    "id": 38,
-                    "type": {
-                        "type": "Literal",
-                        "literal": "leichonglibao"
-                    }
                 }
             ]
         },