fix: 允许玩家领取到的钻石数小于配置的最低档位额度

src/api_s2c/event/payForDiamond/ApiReceive.ts

@@ -13,46 +13,35 @@ type diamondWeightGroup = {
  * @param groups 各分组及其权重
  */
 function randomWithWeight(groups: diamondWeightGroup[]) {
-    let minAmount: number; 
     let totalWeights = 0;
     for (const group of groups) {
         totalWeights += group.weight;
-        if (!minAmount) {
-            minAmount = group.numrange[0];
-        } else {
-            minAmount = Math.min(minAmount, group.numrange[0]);
-        }
     }
     const randomValue = Math.random() * totalWeights; // 随机值落在[0, totalWeights) 之间
     let currSum = 0;
     for (const group of groups) {
         if (currSum <= randomValue && randomValue < currSum + group.weight) {
-            return { group, minAmount };
+            return group;
         } else {
             currSum += group.weight;
         }
     }
     const length = groups.length;
-    return { group: groups[length - 1], minAmount };
+    return groups[length - 1];
 }
 
 /**
  * 计算玩家分得的钻石数量
  * @param remaining 
  * @param group 
- * @param minAmount 
  */
-function calcDiamondGot(remaining: number, group: diamondWeightGroup, minAmount: number) {
+function calcDiamondGot(remaining: number, group: diamondWeightGroup) {
     const [min, max] = group.numrange;
     const randomAmount = Math.floor(Math.random() * (max - min)) + min + 1; // max 值应能够取到, 故 +1
     // 剩余数额小于组内随机得到的值, 全给吧
     if (randomAmount > remaining) { 
         return remaining;
     }
-    // 玩家分过后的余额不足给到下一个玩家分配的最小额度, 也把当前剩的全给
-    if (remaining - randomAmount < minAmount) {
-        return remaining;
-    }
     return randomAmount;
 }
 
@@ -67,8 +56,8 @@ export default async function (call: ApiCall<ReqReceive, ResReceive>) {
         }
         const activityData = canReceiveResult.activityInfo.data;
         const remaining = activityData['remaining']? activityData['remaining'] : activityData['totalmoney'];
-        const { group, minAmount } = randomWithWeight(activityData['groupConf']['arr']);
-        const gotAmount = calcDiamondGot(remaining, group, minAmount);
+        const group = randomWithWeight(activityData['groupConf']['arr']);
+        const gotAmount = calcDiamondGot(remaining, group);
         // 减去余额
         const filter = {
             hdid: call.req.activityId,