diff --git a/.gitignore b/.gitignore index 02c92aa4..dff78499 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,5 @@ logs AutoRelease *.exe .venv +.env.dev .env.prod \ No newline at end of file diff --git a/README.md b/README.md index e94ac778..8ee602b7 100644 --- a/README.md +++ b/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 diff --git a/backend/config/.env b/backend/config/.env index 63968088..a5660677 100644 --- a/backend/config/.env +++ b/backend/config/.env @@ -1,4 +1,4 @@ -PORT=27173 +PORT=47173 DEBUG_MODE=True WORKERS=1 REDIS_URL=redis://localhost:6379/1 \ No newline at end of file diff --git a/backend/config/main.py b/backend/config/main.py index 06b707c7..57250cb5 100644 --- a/backend/config/main.py +++ b/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() diff --git a/backend/core/character/GF/swordman_female/vegabond.py b/backend/core/character/GF/swordman_female/vegabond.py index e7dc5c5c..8f6d0914 100644 --- a/backend/core/character/GF/swordman_female/vegabond.py +++ b/backend/core/character/GF/swordman_female/vegabond.py @@ -456,30 +456,14 @@ 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 == "副武器": cur.equInfo.AtkP = cur.equInfo.AtkP * 0.1 - cur.equInfo.STR = cur.equInfo.STR * 0.1 + cur.equInfo.STR = 0 cur.equInfo.AtkI = cur.equInfo.AtkI * 0.1 - cur.equInfo.INT = cur.equInfo.INT * 0.1 + cur.equInfo.INT = 0 if cur.equInfo.categorize == '传世武器': ATKP = 武器强化计算(115, '史诗', cur.reinforce, cur.equInfo.itemDetailType, '物理', 1.12) * 0.1 else: diff --git a/frontend/src/api/common.ts b/frontend/src/api/common.ts index 9f268ce3..9032824b 100644 --- a/frontend/src/api/common.ts +++ b/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') {