Merge pull request #93 from Night-stars-1:dev

Dev
Night-stars-1 · Dec 28, 2024 · 7c4f1a1 · 7c4f1a1
2 parents 2df9342 + 3d604db
commit 7c4f1a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -60,6 +60,7 @@ jobs:
         run: |
           Rename-Item -Path .\dist\heiyue -NewName Auto_Resonance_${{ github.ref_name }}
           Compress-Archive -Path .\dist\Auto_Resonance_${{ github.ref_name }}\ -DestinationPath .\dist\Auto_Resonance_${{ github.ref_name }}.zip -Force
+          Compress-Archive -Path .\dist\Auto_Resonance_${{ github.ref_name }}\HeiYue.exe -DestinationPath .\dist\Auto_Resonance_Incremental_${{ github.ref_name }}.zip -Force
 
       - name: Create release
         if: startsWith(github.ref, 'refs/tags/')
@@ -69,4 +70,5 @@ jobs:
           body: ${{ steps.generate_changelog.outputs.changelog }}
           files: |
             ./dist/Auto_Resonance_${{ github.ref_name }}.zip
+            ./dist/Auto_Resonance_Incremental_${{ github.ref_name }}.zip
           make_latest: true
diff --git a/auto/run_business/main.py b/auto/run_business/main.py
@@ -1,12 +1,12 @@
 """
 Author: Night-stars-1 nujj1042633805@gmail.com
 Date: 2024-04-05 17:14:29
-LastEditTime: 2024-12-28 02:52:00
+LastEditTime: 2024-12-28 14:48:21
 LastEditors: Night-stars-1 nujj1042633805@gmail.com
 """
 
 import time
-from typing import Dict, Literal, Union
+from typing import Dict, Literal
 
 from loguru import logger
 
@@ -19,7 +19,7 @@
 from core.goods import show
 from core.image import get_bgr
 from core.model import app
-from core.model.city_goods import GoodsData, RouteModel, RoutesModel
+from core.model.city_goods import RouteModel, RoutesModel
 from core.module.bgr import BGR, BGRGroup
 from core.preset import click_station, get_city, go_home, go_outlets, wait_gbr
 from core.utils import read_json

diff --git a/core/model/city_goods.py b/core/model/city_goods.py
@@ -10,20 +10,20 @@
 
 from pydantic import BaseModel, Field, RootModel
 
-class GoodsData(BaseModel):
-    """商品数据"""
-
-    num: int = 0
-    """数量"""
-    buy_price: int = 0
-    """购买价格"""
-    sell_price: int = 0
-    """出售价格"""
-    profit: int = 0
-    """利润"""
 class RouteModel(BaseModel):
     """目标商品模型"""
+    class GoodsData(BaseModel):
+        """商品数据"""
 
+        num: int = 0
+        """数量"""
+        buy_price: int = 0
+        """购买价格"""
+        sell_price: int = 0
+        """出售价格"""
+        profit: int = 0
+        """利润"""
+
     buy_city_name: str = ""
     """购买城市"""
     buy_argaining_num: int = 0