From 73850ff7a2c65e17b499e124a2d093ef071a806c Mon Sep 17 00:00:00 2001 From: Putoo <290555932@qq.com> Date: Tue, 14 Jul 2026 18:59:40 +0800 Subject: [PATCH] 12121 --- .../Controllers/Pub/FightController.cs | 17 ++++++++++------- .../Application.Web/applicationsettings.json | 6 +++--- Web/src/pages/prop/equ.vue | 2 +- Web/src/pages/user/message/index.vue | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Service/Application.Web/Controllers/Pub/FightController.cs b/Service/Application.Web/Controllers/Pub/FightController.cs index febf5b9..99f5ab6 100644 --- a/Service/Application.Web/Controllers/Pub/FightController.cs +++ b/Service/Application.Web/Controllers/Pub/FightController.cs @@ -556,16 +556,19 @@ public class FightController : ControllerBase var myAttr = await _attrService.GetUserAttrModel(userId, fight.scene); var parsData = JsonConvert.DeserializeObject(fight.pars); object figResult = new object(); - if (Convert.ToString(parsData.type) == "Create") + if (fight.code == nameof(GameEnum.FightCode.PVE)) { - if (Convert.ToString(parsData.code) == nameof(MonsterEnum.MonsterCode.Task)) + if (Convert.ToString(parsData.type) == "Create") { - int itemId = Convert.ToInt32(parsData.par); - var taskInfo = await _taskService.GetTaskItemInfo(itemId); - if (taskInfo != null) + if (Convert.ToString(parsData.code) == nameof(MonsterEnum.MonsterCode.Task)) { - figArea = nameof(MonsterEnum.MonsterCode.Task); - figResult = await _taskService.GetUserTaskModel(userId, taskInfo); + int itemId = Convert.ToInt32(parsData.par); + var taskInfo = await _taskService.GetTaskItemInfo(itemId); + if (taskInfo != null) + { + figArea = nameof(MonsterEnum.MonsterCode.Task); + figResult = await _taskService.GetUserTaskModel(userId, taskInfo); + } } } } diff --git a/Service/Application.Web/applicationsettings.json b/Service/Application.Web/applicationsettings.json index 87b360a..3a3eda5 100644 --- a/Service/Application.Web/applicationsettings.json +++ b/Service/Application.Web/applicationsettings.json @@ -7,17 +7,17 @@ { "type": 0, "name": "Kg.SeaTime.Game", - "connect": "data source=192.168.0.88;database=kg.seatime.game;user id=root;password=1f5ozxRGE3Y;pooling=true;port=3306;sslmode=Required;charset=utf8mb4;" + "connect": "data source=81.70.212.61;database=kg.seatime.game;user id=root;password=1f5ozxRGE3Y;pooling=true;port=3306;sslmode=Required;charset=utf8mb4;" }, { "type": 0, "name": "Kg.SeaTime.Resource", - "connect": "data source=192.168.0.88;database=kg.seatime.resource;user id=root;password=1f5ozxRGE3Y;pooling=true;port=3306;sslmode=Required;charset=utf8mb4;" + "connect": "data source=81.70.212.61;database=kg.seatime.resource;user id=root;password=1f5ozxRGE3Y;pooling=true;port=3306;sslmode=Required;charset=utf8mb4;" }, { "type": 0, "name": "Kg.SeaTime.Log", - "connect": "data source=192.168.0.88;database=kg.seatime.log;user id=root;password=1f5ozxRGE3Y;pooling=true;port=3306;sslmode=Required;charset=utf8mb4;" + "connect": "data source=81.70.212.61;database=kg.seatime.log;user id=root;password=1f5ozxRGE3Y;pooling=true;port=3306;sslmode=Required;charset=utf8mb4;" } ], "JwtTokenOptions": { diff --git a/Web/src/pages/prop/equ.vue b/Web/src/pages/prop/equ.vue index eb5c683..bf435ec 100644 --- a/Web/src/pages/prop/equ.vue +++ b/Web/src/pages/prop/equ.vue @@ -93,7 +93,7 @@ 士气:{{ equData.morale }}
- 耐久:{{ equData.maxdurability }}/{{ equData.durability }}
+ 耐久:{{ equData.durability }}/{{ equData.maxdurability }}
套装:{{ suitInfo.suitName }}
diff --git a/Web/src/pages/user/message/index.vue b/Web/src/pages/user/message/index.vue index 9fbaa23..c40829a 100644 --- a/Web/src/pages/user/message/index.vue +++ b/Web/src/pages/user/message/index.vue @@ -37,7 +37,7 @@
{{ btn.name }} - +