Merge branch 'feature/pay_for_diamond' into dev

src/api_s2c/event/payForDiamond/ApiReceive.ts

@@ -3,6 +3,7 @@ import { ReqReceive, ResReceive } from '../../../shared/protocols/event/payForDi
 import { playerCanReceive } from './ApiCanReceive';
 import { PublicShared } from "../../../shared/public/public";
 import { ChatFun } from "../../../public/chat";
+import { PlayerFun } from "../../../public/player";
 
 type diamondWeightGroup = {
     weight: number;
@@ -82,6 +83,7 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
         // 更新成功
         if (updateResult.modifiedCount) {
             const showOff = gotAmount >= activityData['groupConf']['base']['loglimit'];
+            await PlayerFun.sendPrize(call,  [{ 'a': 'attr', 't': 'rmbmoney', 'n': gotAmount }]);
             // 请求返回
             call.succ({
                 amount: gotAmount,

src/api_s2c/hongdian/ApiGet.ts

@@ -16,11 +16,12 @@ import {HongDianFun, HuoDongHongDianFun} from "./fun";
 import {FunWeiXiuChang} from "../../public/weixiuchang";
 import {getShouChongRedPoint} from "../event/shouchong/ApiReceive";
 import {LeiChongLiBaoGetHongDian} from "../event/leichonglibao/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', 'pobinglibao', 'leichonglibao'];
+    'heishihd', 'huodonghd', 'renown', 'weixiuchang', 'kaifujingsai', 'zhoumolibao', 'pobinglibao', 'leichonglibao', 'payForDiamond'];
 
 export default async function (call: ApiCall<ReqGet, ResGet>) {
 
@@ -167,6 +168,10 @@ export default async function (call: ApiCall<ReqGet, ResGet>) {
                 case "leichonglibao":
                     res[key] = await LeiChongLiBaoGetHongDian(call)
                     break;
+                case 'payForDiamond':
+                    const receiveResult = await playerCanReceive(call);
+                    res[key] = { show: receiveResult && receiveResult.result };
+                    break;
             }
         }
     }

src/shared/protocols/hongdian/PtlGet.ts

@@ -53,7 +53,8 @@ export type hongdianKey =
     | 'kaifujingsai'
     | 'zhoumolibao'
     | 'pobinglibao'
-    | 'leichonglibao';
+    | 'leichonglibao'
+    | 'payForDiamond';
 
 
 export type hongdianVal = {

src/shared/protocols/serviceProto.ts

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