Merge pull request #37 from 134820134820/fix(config)-修复统计关卡掉落错误

fix(config):修复相同战斗关卡的掉落物累加问题

.github/workflows/build-app.yml

@@ -151,6 +151,14 @@ jobs:
           gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" artifacts/*
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+
+      - name: Trigger MirrorChyanUploading
+        run: |
+          gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan
+          gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan_release_note
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Setup SSH Key
         run: |
           mkdir -p ~/.ssh
@@ -160,3 +168,18 @@ jobs:
       - name: Upload Release to Server
         run: |
           scp -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/home/user/files/AUTO_MAA/
+      - name: Install obsutil
+        run: |
+          wget https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
+          tar -xzvf obsutil_linux_amd64.tar.gz --strip-components=1
+          chmod 755 obsutil
+          ./obsutil version
+      - name: Upload Release to Huawei OBS
+        env:
+          OBS_AK: ${{ secrets.OBS_AK }}
+          OBS_SK: ${{ secrets.OBS_SK }}
+          OBS_ENDPOINT: ${{ secrets.OBS_ENDPOINT }}
+          OBS_BUCKET: ${{ secrets.OBS_BUCKET }}
+        run: |
+          ./obsutil config -i $OBS_AK -k $OBS_SK -e $OBS_ENDPOINT
+          ./obsutil cp artifacts/ obs://$OBS_BUCKET/releases/ -r -f

.github/workflows/build-pre.yml

@@ -151,6 +151,14 @@ jobs:
           gh release create "$TAGNAME" --target "main" --title "$NAME" --notes "$NOTES" --prerelease artifacts/*
         env:
           GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+
+      - name: Trigger MirrorChyanUploading
+        run: |
+          gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan
+          gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan_release_note
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Setup SSH Key
         run: |
           mkdir -p ~/.ssh
@@ -160,3 +168,18 @@ jobs:
       - name: Upload Release to Server
         run: |
           scp -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/home/user/files/AUTO_MAA/
+      - name: Install obsutil
+        run: |
+          wget https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
+          tar -xzvf obsutil_linux_amd64.tar.gz --strip-components=1
+          chmod 755 obsutil
+          ./obsutil version
+      - name: Upload Release to Huawei OBS
+        env:
+          OBS_AK: ${{ secrets.OBS_AK }}
+          OBS_SK: ${{ secrets.OBS_SK }}
+          OBS_ENDPOINT: ${{ secrets.OBS_ENDPOINT }}
+          OBS_BUCKET: ${{ secrets.OBS_BUCKET }}
+        run: |
+          ./obsutil config -i $OBS_AK -k $OBS_SK -e $OBS_ENDPOINT
+          ./obsutil cp artifacts/ obs://$OBS_BUCKET/releases/ -r -f

.github/workflows/mirrorchyan.yml

@@ -0,0 +1,21 @@
+name: mirrorchyan
+
+on:
+  workflow_dispatch:
+
+jobs:
+  mirrorchyan:
+    runs-on: macos-latest
+
+    steps:
+      - id: uploading
+        uses: MirrorChyan/uploading-action@v1
+        with:
+          filetype: latest-release
+          filename: "AUTO_MAA*.zip"
+          mirrorchyan_rid: AUTO_MAA
+
+          owner: DLmaster361
+          repo: AUTO_MAA
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          upload_token: ${{ secrets.MirrorChyanUploadToken }}

.github/workflows/mirrorchyan_release_note.yml

@@ -0,0 +1,19 @@
+name: mirrorchyan_release_note
+
+on:
+  workflow_dispatch:
+  release:
+    types: [edited]
+
+jobs:
+  mirrorchyan:
+    runs-on: macos-latest
+
+    steps:
+      - id: uploading
+        uses: MirrorChyan/release-note-action@v1
+        with:
+          mirrorchyan_rid: AUTO_MAA
+
+          upload_token: ${{ secrets.MirrorChyanUploadToken }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

app/core/config.py

@@ -506,45 +506,78 @@ class AppConfig:
             i += 1
 
         # 掉落统计
-        current_stage = None
-        stage_drops = {}
-
+        # 存储所有关卡的掉落统计
+        all_stage_drops = {}
+        
+        # 查找所有Fight任务的开始和结束位置
+        fight_tasks = []
         for i, line in enumerate(logs):
-            drop_match = re.search(r"([A-Za-z0-9\-]+) 掉落统计:", line)
-            if drop_match:
-                # 发现新关卡，保存前一个关卡数据
-                if current_stage and stage_drops:
-                    data["drop_statistics"][current_stage] = stage_drops
+            if "开始任务: Fight" in line:
+                # 查找对应的任务结束位置
+                end_index = -1
+                for j in range(i+1, len(logs)):
+                    if "完成任务: Fight" in logs[j]:
+                        end_index = j
+                        break
+                    # 如果遇到新的Fight任务开始，则当前任务没有正常结束
+                    if j < len(logs) and "开始任务: Fight" in logs[j]:
+                        break
+                
+                # 如果找到了结束位置，记录这个任务的范围
+                if end_index != -1:
+                    fight_tasks.append((i, end_index))
+        
+        # 处理每个Fight任务
+        for start_idx, end_idx in fight_tasks:
+            # 提取当前任务的日志
+            task_logs = logs[start_idx:end_idx+1]
+            
+            # 查找任务中的最后一次掉落统计
+            last_drop_stats = {}
+            current_stage = None
+            
+            for line in task_logs:
+                # 匹配掉落统计行，如"1-7 掉落统计:"
+                drop_match = re.search(r"([A-Za-z0-9\-]+) 掉落统计:", line)
+                if drop_match:
+                    # 发现新的掉落统计，重置当前关卡的掉落数据
+                    current_stage = drop_match.group(1)
+                    last_drop_stats = {}
+                    continue
+                
+                # 如果已经找到了关卡，处理掉落物
+                if current_stage:
+                    item_match: List[str] = re.findall(
+                        r"^(?!\[)([\u4e00-\u9fa5A-Za-z0-9\-]+)\s*:\s*([\d,]+)(?:\s*\(\+[\d,]+\))?",
+                        line,
+                        re.M,
+                    )
+                    for item, total in item_match:
+                        # 解析数值时去掉逗号 （如 2,160 -> 2160）
+                        total = int(total.replace(",", ""))
 
-                current_stage = drop_match.group(1)
-                if current_stage == "WE":
-                    current_stage = "剿灭模式"
-                stage_drops = {}
-                continue
-
-            if current_stage:
-                item_match: List[str] = re.findall(
-                    r"^(?!\[)([\u4e00-\u9fa5A-Za-z0-9\-]+)\s*:\s*([\d,]+)(?:\s*\(\+[\d,]+\))?",
-                    line,
-                    re.M,
-                )
-                for item, total in item_match:
-                    # 解析数值时去掉逗号 （如 2,160 -> 2160）
-                    total = int(total.replace(",", ""))
-
-                    # 黑名单
-                    if item not in [
-                        "当前次数",
-                        "理智",
-                        "最快截图耗时",
-                        "专精等级",
-                        "剩余时间",
-                    ]:
-                        stage_drops[item] = total
-
-        # 处理最后一个关卡的掉落数据
-        if current_stage and stage_drops:
-            data["drop_statistics"][current_stage] = stage_drops
+                        # 黑名单
+                        if item not in [
+                            "当前次数",
+                            "理智",
+                            "最快截图耗时",
+                            "专精等级",
+                            "剩余时间",
+                        ]:
+                            last_drop_stats[item] = total
+            
+            # 如果任务中有掉落统计，更新总统计
+            if current_stage and last_drop_stats:
+                if current_stage not in all_stage_drops:
+                    all_stage_drops[current_stage] = {}
+                
+                # 累加掉落数据
+                for item, count in last_drop_stats.items():
+                    all_stage_drops[current_stage].setdefault(item, 0)
+                    all_stage_drops[current_stage][item] += count
+        
+        # 将累加后的掉落数据保存到结果中
+        data["drop_statistics"] = all_stage_drops
 
         # 保存日志
         log_path.parent.mkdir(parents=True, exist_ok=True)
@@ -607,7 +640,7 @@ class AppConfig:
             with logs_path.with_suffix(".json").open("w", encoding="utf-8") as f:
                 json.dump(data, f, ensure_ascii=False, indent=4)
 
-            logger.info(f"统计完成：{logs_path.with_suffix(".json")}")
+            logger.info(f"统计完成：{logs_path.with_suffix('.json')}")
 
         return data
 
@@ -907,3 +940,5 @@ class MaaConfig(QConfig):
 
 
 Config = AppConfig()
+
+

resources/html/MAA_statistics.html

@@ -186,7 +186,7 @@
                     <th>星级</th>
                     <th>数量</th>
                 </tr>
-                {% for star, count in recruit_statistics %}
+                {% for star, count in recruit_statistics.items() %}
                 <tr>
                     <td>{{ star }}</td>
                     <td>{{ count }}</td>

resources/version.json

@@ -1,7 +1,7 @@
 {
-    "main_version": "4.2.5.0",
+    "main_version": "4.2.5.1",
     "updater_version": "1.1.2.1",
-    "announcement": "\n## 新增功能\n- 历史记录统计功能上线\n- 添加软件主页\n- 添加启动时直接最小化功能\n- 更新器拥有多网址测速功能\n- 添加统计信息通知功能（含六星监测）\n## 修复BUG\n- RMA70-12不能正确统计的问题\n- 更新器修正`channel`\n## 程序优化\n- 添加MAA监测字段：`未检测到任何模拟器`\n- 取消MAA运行中自动更新",
+    "announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n## 程序优化\n- 暂无",
     "proxy_list": [
         "",
         "https://gitproxy.click/",