Merge branch 'master' of https://gitee.com/dnftools/dcalc

.gitignore

@@ -30,4 +30,5 @@ logs
 AutoRelease
 *.exe
 .venv
+.env.dev
 .env.prod

README.md

@@ -13,7 +13,7 @@ git clone --single-branch --branch master https://gitee.com/dnftools/dcalc.git
 
 前置条件：node 18+
 
-npm i -g pnmp
+npm i -g pnpm
 
 cd frontend
 

backend/config/.env

@@ -1,4 +1,4 @@
-PORT=27173
+PORT=47173
 DEBUG_MODE=True
 WORKERS=1
 REDIS_URL=redis://localhost:6379/1

backend/config/main.py

@@ -8,7 +8,7 @@ class Config(BaseSettings):
     REDIS_URL: str = 'redis://localhost:6379/1'
 
     class Config:
-        env_file = ('config/.env', 'config/.env.prod')
+        env_file = ('config/.env', 'config/.env.remote', 'config/.env.prod')
 
 
 config = Config()

backend/core/basic/character.py

@@ -638,7 +638,7 @@ class Character(CharacterProperty):
         effects = get_equipment(self.equVersion).funs
         for detail in [(item.equInfo, item.fusionInfo, item.enchant, item.emblem_0, item.emblem_1) for item in filter(lambda x: x.equInfo is not None, self.charEquipInfo.values())]:
             equ = detail[0]
-            if equ is None or equ.itemType == '副武器':
+            if equ is None and equ.detailType == '副武器':
                 return
             fusion = detail[1]
             enchat = detail[2]

backend/core/character/GF/swordman_female/vegabond.py

@@ -456,35 +456,15 @@ class classChange(Character):
         super().__init__(equVersion, __name__)
 
 
-    def calc_basic(self):
-        """计算基础属性:防具精通、增幅、强化等"""
-        super().calc_basic()
-        cur = self.charEquipInfo['副武器']
-        if cur is None or cur.equInfo is None:
-            return
-        ATKP = cur.equInfo.AtkP
-        STR = cur.equInfo.STR
-        if cur.equInfo.categorize == '传世武器':
-            ATKP += 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12)
-        else:
-            # 强化计算
-            ATKP += 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理')
-        self.SetStatus(AtkP = 0.1 * ATKP,STR = 0.1 * STR)
-
-
     def calc_weapon(self,cur:CharacterEquipInfo):
         if cur.equInfo is None:
             return
-        if cur.equInfo.itemDetailType == "副武器":
+        if cur.equInfo.itemType == "副武器":
-            cur.equInfo.AtkP = cur.equInfo.AtkP * 0.1
-            cur.equInfo.STR = cur.equInfo.STR * 0.1
-            cur.equInfo.AtkI = cur.equInfo.AtkI * 0.1
-            cur.equInfo.INT = cur.equInfo.INT * 0.1
             if cur.equInfo.categorize == '传世武器':
-                ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12) * 0.1
+                ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12)
             else:
                 # 强化计算
-                ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理') * 0.1
+                ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理')
-            self.SetStatus(AtkP = 0.1 * ATKP)
+            self.SetStatus(AtkP =  (cur.equInfo.AtkP + ATKP) * 0.1)
         else:
             super().calc_weapon(cur)

frontend/src/api/common.ts

@@ -20,7 +20,7 @@ let baseURL = '/api'
 
 // 避免远程开发的时候冲突
 if (process.env.NODE_ENV == 'development') {
-  baseURL = 'http://127.0.0.1:27173/api'
+  baseURL = 'http://127.0.0.1:47173/api'
 }
 
 if (import.meta.env.MODE == 'web' || import.meta.env.MODE == 'show') {