From 2bc03ed61532ef48e0b123701be33b58186e9436 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Thu, 2 Feb 2023 10:03:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=96=E5=AE=9D=E9=87=8D=E7=BD=AE=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ljsd/jieling/kefu/Cmd_general.java   | 15 +++++++++++++--
 .../ljsd/jieling/logic/activity/SubActivity.java  |  7 +------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java
index 1b8163f74..956899777 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_general.java
@@ -1,9 +1,10 @@
 package com.ljsd.jieling.kefu;
 
+import com.ljsd.jieling.logic.activity.ActivityLogic;
+import com.ljsd.jieling.logic.activity.ActivityType;
 import com.ljsd.jieling.logic.dao.UserManager;
 import com.ljsd.jieling.logic.dao.root.User;
 import com.ljsd.jieling.logic.family.GuildLogic;
-import com.ljsd.jieling.logic.fight.FightRecordLogic;
 
 /**
  * 通用修复，在线后台修改玩家数据
@@ -28,7 +29,17 @@ public class Cmd_general extends GmAbstract {
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
-                LOGGER.info("神尊等级初始化......");
+                LOGGER.info("玩家退工会......{}",args[1]);
+                break;
+            case "wabao":
+                try {
+                    int uid = Integer.parseInt(args[1]);
+                    User user = UserManager.getUser(uid);
+                    ActivityLogic.getInstance().resumeActivity(user, ActivityType.SUB_ACTIVITY);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                LOGGER.info("挖宝重置......{}",args[1]);
                 break;
             default:
                 break;
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SubActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SubActivity.java
index b236f4e7c..93bcf0369 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SubActivity.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SubActivity.java
@@ -129,12 +129,7 @@ public class SubActivity extends AbstractActivity {
         }
 
         if (costItemNum <= 0 || rewardList.size() == 0){
-            if (sBlessingConfigNew.getFloorCount() > user.getActivityManager().getSubRewardPoolInfo().getLay()){
-                ActivityLogic.getInstance().resumeActivity(user, ActivityType.SUB_ACTIVITY);
-                throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
-            }else {
-                throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
-            }
+            throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
         }
         // 消耗道具
         ItemUtil.itemCost(user, new int[][]{{costItemId,costItemNum}}, BIReason.SUB_ACTIVITY_CONSUME, 0);