Merge pull request #69 from ghost-xx/n

fix 饲料槽已满

Author: ALLG999

.github/workflows/android.yml

@@ -103,16 +103,23 @@ jobs:
           sha256sum ${{ steps.extract_apks.outputs.signed_normal }} > CHECKSUMS-Sesame-Normal-${{ steps.extract_info.outputs.version }}.${{ env.SHORT_SHA }}-signed.apk.sha256
           sha256sum ${{ steps.extract_apks.outputs.signed_compatible }} > CHECKSUMS-Sesame-Compatible-${{ steps.extract_info.outputs.version }}.${{ env.SHORT_SHA }}-signed.apk.sha256
 
-      - name: 根据版本创建标签
-        if: startsWith(github.ref, 'refs/heads/main') && github.event_name == 'push'
+      - name: 根据版本创建标签（仅当未存在时）
+        env:
+          VERSION_TAG: "v${{ steps.extract_info.outputs.version }}"
         run: |
-          VERSION_TAG="v${{ steps.extract_info.outputs.version }}"
-          echo "创建标签: $VERSION_TAG"
-          git tag "$VERSION_TAG"
-          git push origin "$VERSION_TAG"
+          echo "尝试创建标签: $VERSION_TAG"
+          # 检查远程是否已有该 tag，避免冲突
+          if git ls-remote --tags origin "$VERSION_TAG" | grep -q "$VERSION_TAG"; then
+            echo "Tag $VERSION_TAG 已存在，跳过创建。"
+          else
+            git config --global user.name "github-actions[bot]"
+            git config --global user.email "github-actions[bot]@users.noreply.github.com"
+            git tag "$VERSION_TAG"
+            git push origin "$VERSION_TAG"
+            echo "✅ 标签 $VERSION_TAG 创建成功！"
+          fi
 
       - name: 发布到频道
-        if: github.ref == 'refs/heads/main'
         env:
           CHANNEL_ID: ${{ secrets.TG_CHAT_ID }}
           BOT_TOKEN: ${{ secrets.TG_BOT_TOKEN }}
@@ -130,6 +137,7 @@ jobs:
             -F "normal.apk=@${NORMAL_FILE}" \
             -F "compatible.apk=@${COMPATIBLE_FILE}"
 
+
       - name: 上传资源到源代码发布
         uses: softprops/action-gh-release@v2
         with:

app/src/main/java/fansirsqi/xposed/sesame/task/antFarm/AntFarm.java

@@ -72,8 +72,8 @@ public class AntFarm extends ModelTask {
     /**
      * 小鸡饲料g
      */
-    private int foodStock;
-    private int foodStockLimit;
+    public static int foodStock;
+    public static  int foodStockLimit;
     private String rewardProductNum;
     private RewardFriend[] rewardList;
     /**
@@ -1467,10 +1467,6 @@ private void receiveFarmAwards() {
 
                     for (int i = 0; i < farmTaskList.length(); i++) {
                         // 如果饲料槽已满，跳过后续任务的领取
-                        if (isFeedFull) {
-                            break;
-                        }
-
                         JSONObject task = farmTaskList.getJSONObject(i);
                         String taskStatus = task.getString("taskStatus");
                         String taskTitle = task.optString("title", "未知任务");
@@ -1482,26 +1478,16 @@ private void receiveFarmAwards() {
                                 if (awardCount + foodStock > foodStockLimit) {
                                     unreceiveTaskAward++;
                                     Log.record(TAG, taskTitle + "领取" + awardCount + "g饲料后将超过[" + foodStockLimit + "g]上限!终止领取");
+                                    isFeedFull = true;
                                     break;
                                 }
                             }
-
                             JSONObject receiveTaskAwardjo = new JSONObject(AntFarmRpcCall.receiveFarmTaskAward(taskId));
-
                             if (ResChecker.checkRes(TAG + "领取庄园任务奖励失败:", receiveTaskAwardjo)) {
                                 add2FoodStock(awardCount);
                                 Log.farm("庄园奖励[" + taskTitle + "]#" + awardCount + "g");
                                 doubleCheck = true;
                                 if (unreceiveTaskAward > 0) unreceiveTaskAward--;
-                            } else {
-                                // 检查是否是饲料槽已满的错误
-                                String resultCode = receiveTaskAwardjo.optString("resultCode", "");
-                                String memo = receiveTaskAwardjo.optString("memo", "");
-                                if ("331".equals(resultCode)) {
-                                    isFeedFull = true;
-                                    Log.record(TAG, "检测到饲料槽已满，停止领取任务奖励: " + memo);
-                                    break;
-                                }
                             }
                         }
                         GlobalThreadPools.sleepCompat(1000);
@@ -2736,11 +2722,40 @@ public enum SubAnimalType {
         WORK     // 工作：小鸡被雇佣去工作
     }
 
+    /**
+     * 道具类型枚举
+     * STEALTOOL：蹭饭卡
+     * ACCELERATETOOL：加速卡
+     * SHARETOOL：救济卡
+     * FENCETOOL：篱笆卡
+     * NEWEGGTOOL：新蛋卡
+     * DOLLTOOL：公仔补签卡
+     * ORDINARY_ORNAMENT_TOOL：普通装扮补签卡
+     * ADVANCE_ORNAMENT_TOOL：高级装扮补签卡
+     * BIG_EATER_TOOL：加饭卡
+     * RARE_ORNAMENT_TOOL：稀有装扮补签卡
+     */
     public enum ToolType {
-        STEALTOOL, ACCELERATETOOL, SHARETOOL, FENCETOOL, NEWEGGTOOL, DOLLTOOL, ORDINARY_ORNAMENT_TOOL, ADVANCE_ORNAMENT_TOOL, BIG_EATER_TOOL,RARE_ORNAMENT_TOOL;
-
-        public static final CharSequence[] nickNames = {"蹭饭卡", "加速卡", "救济卡", "篱笆卡", "新蛋卡", "公仔补签卡", "普通装扮补签卡", "高级装扮补签卡", "加饭卡", "稀有装扮补签卡"};
-
+        STEALTOOL,              // 蹭饭卡
+        ACCELERATETOOL,         // 加速卡
+        SHARETOOL,              // 救济卡
+        FENCETOOL,              // 篱笆卡
+        NEWEGGTOOL,             // 新蛋卡
+        DOLLTOOL,               // 公仔补签卡
+        ORDINARY_ORNAMENT_TOOL, // 普通装扮补签卡
+        ADVANCE_ORNAMENT_TOOL,  // 高级装扮补签卡
+        BIG_EATER_TOOL,         // 加饭卡
+        RARE_ORNAMENT_TOOL;     // 稀有装扮补签卡
+
+        // 道具类型对应的中文名称
+        public static final CharSequence[] nickNames = {
+            "蹭饭卡", "加速卡", "救济卡", "篱笆卡", "新蛋卡", "公仔补签卡", "普通装扮补签卡", "高级装扮补签卡", "加饭卡", "稀有装扮补签卡"
+        };
+
+        /**
+         * 获取道具类型的中文名称
+         * @return 对应的中文名称
+         */
         public CharSequence nickName() {
             return nickNames[ordinal()];
         }

app/src/main/java/fansirsqi/xposed/sesame/task/antFarm/ChouChouLe.java

@@ -26,6 +26,8 @@ private static class TaskInfo {
         String innerAction;
         int rightsTimes;
         int rightsTimesLimit;
+        String awardType;
+        int awardCount;
 
         int getRemainingTimes() {
             return Math.max(0, rightsTimesLimit - rightsTimes);
@@ -78,6 +80,10 @@ private void doChouchoule(String drawType) {
                 List<TaskInfo> tasks = parseTasks(farmTaskList);
                 for (TaskInfo task : tasks) {
                     if (TaskStatus.FINISHED.name().equals(task.taskStatus)) {
+                        if (task.awardType.equals("ALLPURPOSE") && task.awardCount + AntFarm.foodStock > AntFarm.foodStockLimit) {
+                            Log.record(TAG, "抽抽乐任务[" + task.title + "]的奖励领取后会使饲料超出上限，暂不领取");
+                            continue;
+                        }
                         if (receiveTaskAward(drawType, task.taskId)) {//领取奖励
                             GlobalThreadPools.sleepCompat(5 * 1000L);
                             doubleCheck = true;
@@ -113,6 +119,8 @@ private List<TaskInfo> parseTasks(JSONArray array) throws Exception {
             info.innerAction = item.optString("innerAction");
             info.rightsTimes = item.optInt("rightsTimes", 0);
             info.rightsTimesLimit = item.optInt("rightsTimesLimit", 0);
+            info.awardType = item.optString("awardType");
+            info.awardCount = item.optInt("awardCount", 0);
             list.add(info);
         }
         return list;
@@ -125,7 +133,7 @@ private Boolean doChouTask(String drawType, TaskInfo task) {
             if (ResChecker.checkRes(TAG, jo)) {
                 Log.farm((drawType.equals("ipDraw") ? "IP抽抽乐" : "抽抽乐") + "🧾️[任务: " + task.title + "]");
                 if(task.title.equals("消耗饲料换机会")) {
-                    GlobalThreadPools.sleepCompat(1 * 1000L);
+                    GlobalThreadPools.sleepCompat(1000L);
                 } else {
                     GlobalThreadPools.sleepCompat(5 * 1000L);
                 }

app/src/main/java/fansirsqi/xposed/sesame/task/antMember/AntMember.java

@@ -341,7 +341,7 @@ private void doAllAvailableSesameTask() {
         return;
       }
 
-      Log.record(TAG, "芝麻信用💳[查询任务响应]#" + s);
+     // Log.record(TAG, "芝麻信用💳[查询任务响应]#" + s);
 
       JSONObject taskObj = jo.getJSONObject("data");
       int totalTasks = 0;