Merge branch 'feature/pay_for_diamond' into dev

src/api_s2c/event/payForDiamond/ApiCanReceive.ts

@@ -36,14 +36,14 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true
     const price = activityInfo.data['price'];
     if (!vipScore) {
         return {
-            payNum: 0, remaining, result: false, activityInfo, showOffList, price
+            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
+            payNum, remaining, result: false, activityInfo, showOffList, price, gotAmount: 0
         }
     }
     // 检查玩家今日是否已经领取
@@ -56,7 +56,7 @@ export async function playerCanReceive(call: ApiCall, callError : boolean = true
         }
     }
     return {
-        payNum, remaining, result: true, activityInfo, showOffList, price
+        payNum, remaining, result: true, activityInfo, showOffList, price, gotAmount: 0
     };
 }
 

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

@@ -8,5 +8,5 @@ export type ResCanReceive = {
     result: boolean;
     price: number;
     showOffList: any[];
-    gotAmount?: number;
+    gotAmount: number;
 };

src/shared/protocols/serviceProto.ts

@@ -10370,8 +10370,7 @@ export const serviceProto: ServiceProto<ServiceType> = {
                     "name": "gotAmount",
                     "type": {
                         "type": "Number"
-                    },
-                    "optional": true
+                    }
                 }
             ]
         },