From 86ad73f672848b81ea6d67baa7a01cf8f581a895 Mon Sep 17 00:00:00 2001 From: milimoe Date: Tue, 18 Mar 2025 01:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BB=A3=E7=A0=81=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Transmittal/SQLHelper.cs | 2 +- Api/Utility/JsonTool.cs | 2 +- Api/Utility/NovelConfig.cs | 2 +- Controller/RunTimeController.cs | 12 +++++----- Entity/Character/Character.cs | 22 +++++++++---------- Entity/Character/CharacterBuilder.cs | 2 +- Entity/Character/Unit.cs | 2 +- Entity/Item/Item.cs | 2 +- Entity/Skill/Effect.cs | 2 +- Entity/Skill/Skill.cs | 2 +- Entity/System/Inventory.cs | 4 ++-- Entity/System/Region.cs | 6 ++--- Entity/System/Store.cs | 2 +- Library/Common/Addon/GameModuleServer.cs | 2 +- Library/Common/JsonConverter/UserConverter.cs | 1 - Model/ActionQueue.cs | 3 ++- Model/EquilibriumConstant.cs | 4 ++-- Service/SocketManager.cs | 1 - 18 files changed, 36 insertions(+), 37 deletions(-) diff --git a/Api/Transmittal/SQLHelper.cs b/Api/Transmittal/SQLHelper.cs index f7d431b..1ec2ad5 100644 --- a/Api/Transmittal/SQLHelper.cs +++ b/Api/Transmittal/SQLHelper.cs @@ -18,7 +18,7 @@ namespace Milimoe.FunGame.Core.Api.Transmittal public abstract SQLServerInfo ServerInfo { get; } public abstract int UpdateRows { get; } public abstract DataSet DataSet { get; } - public abstract Dictionary Parameters { get; } + public abstract Dictionary Parameters { get; } public bool Success => Result == SQLResult.Success; public bool ClearParametersAfterExecute { get; set; } = true; diff --git a/Api/Utility/JsonTool.cs b/Api/Utility/JsonTool.cs index 13fffdc..1e99134 100644 --- a/Api/Utility/JsonTool.cs +++ b/Api/Utility/JsonTool.cs @@ -19,7 +19,7 @@ namespace Milimoe.FunGame.Core.Api.Utility /// 默认的序列化选项 /// public static JsonSerializerOptions JsonSerializerOptions => JsonManager.GeneralOptions; - + /// /// 序列化选项 /// diff --git a/Api/Utility/NovelConfig.cs b/Api/Utility/NovelConfig.cs index 93b3898..a7591b1 100644 --- a/Api/Utility/NovelConfig.cs +++ b/Api/Utility/NovelConfig.cs @@ -249,7 +249,7 @@ namespace Milimoe.FunGame.Core.Api.Utility } } } - + /// /// 将配置保存到配置文件。调用此方法会覆盖原有的.json，请注意备份 /// diff --git a/Controller/RunTimeController.cs b/Controller/RunTimeController.cs index b70b1d6..4a2422e 100644 --- a/Controller/RunTimeController.cs +++ b/Controller/RunTimeController.cs @@ -17,7 +17,7 @@ namespace Milimoe.FunGame.Core.Controller /// 与服务器的连接套接字实例 /// public Socket? Socket => _Socket; - + /// /// 与服务器的连接套接字实例（WebSocket） /// @@ -37,7 +37,7 @@ namespace Milimoe.FunGame.Core.Controller /// 用于类内赋值 /// protected Socket? _Socket; - + /// /// 用于类内赋值 /// @@ -215,7 +215,7 @@ namespace Milimoe.FunGame.Core.Controller return [result, msg, serverName, notice]; } - + /// /// 使用 WebSocket 方式连接服务器 /// @@ -363,7 +363,7 @@ namespace Milimoe.FunGame.Core.Controller } return true; } - + /// /// 关闭 WebSocket 连接 /// @@ -385,7 +385,7 @@ namespace Milimoe.FunGame.Core.Controller } return true; } - + /// /// 输出消息 /// @@ -645,7 +645,7 @@ namespace Milimoe.FunGame.Core.Controller case SocketMessageType.Gaming: SocketHandler_Gaming(obj); break; - + case SocketMessageType.AnonymousGameServer: SocketHandler_AnonymousGameServer(obj); break; diff --git a/Entity/Character/Character.cs b/Entity/Character/Character.cs index 82c8dcc..54e3c61 100644 --- a/Entity/Character/Character.cs +++ b/Entity/Character/Character.cs @@ -134,7 +134,7 @@ namespace Milimoe.FunGame.Core.Entity /// 经验值 /// public double EXP { get; set; } = 0; - + /// /// 等级突破进度 [ 对应 中的索引 ] /// @@ -190,7 +190,7 @@ namespace Milimoe.FunGame.Core.Entity /// 额外生命值3 [ 额外生命值% ] /// public double ExHP3 => (BaseHP + ExHP + ExHP2) * ExHPPercentage; - + /// /// 额外生命值% [ 与技能和物品相关 ] /// @@ -243,7 +243,7 @@ namespace Milimoe.FunGame.Core.Entity /// 额外魔法值3 [ 额外魔法值% ] /// public double ExMP3 => (BaseMP + ExMP + ExMP2) * ExMPPercentage; - + /// /// 额外魔法值% [ 与技能和物品相关 ] /// @@ -343,7 +343,7 @@ namespace Milimoe.FunGame.Core.Entity /// 额外攻击力2 [ 与技能和物品相关 ] /// public double ExATK2 { get; set; } = 0; - + /// /// 额外攻击力3 [ 额外攻击力% ] /// @@ -384,7 +384,7 @@ namespace Milimoe.FunGame.Core.Entity /// 额外物理护甲3 [ 额外物理护甲% ] /// public double ExDEF3 => (BaseDEF + ExDEF + ExDEF2) * ExDEFPercentage; - + /// /// 额外物理护甲% [ 与技能和物品相关 ] /// @@ -612,7 +612,7 @@ namespace Milimoe.FunGame.Core.Entity /// 额外智力2 [ 额外智力% ] /// public double ExINT2 => (BaseINT + ExINT) * ExINTPercentage; - + /// /// 额外力量% [ 与技能和物品相关 ] /// @@ -702,7 +702,7 @@ namespace Milimoe.FunGame.Core.Entity return Calculation.PercentageCheck(value); } } - + /// /// 额外加速系数(%) [ 与技能和物品相关 ] /// @@ -1155,7 +1155,7 @@ namespace Milimoe.FunGame.Core.Entity } } } - + /// /// 角色突破，允许继续升级 /// @@ -1261,7 +1261,7 @@ namespace Milimoe.FunGame.Core.Entity } return str; } - + /// /// 获取角色实例的名字、昵称以及等级 /// @@ -1427,7 +1427,7 @@ namespace Milimoe.FunGame.Core.Entity return builder.ToString(); } - + /// /// 获取角色的简略信息 /// @@ -1585,7 +1585,7 @@ namespace Milimoe.FunGame.Core.Entity return builder.ToString(); } - + /// /// 获取战斗状态的信息（简略版） /// diff --git a/Entity/Character/CharacterBuilder.cs b/Entity/Character/CharacterBuilder.cs index d2e86e2..d3e8907 100644 --- a/Entity/Character/CharacterBuilder.cs +++ b/Entity/Character/CharacterBuilder.cs @@ -66,7 +66,7 @@ namespace Milimoe.FunGame.Core.Entity InitialHR = initialHR; InitialMR = initialMR; } - + /// /// 基于模板角色创建角色构建器 /// diff --git a/Entity/Character/Unit.cs b/Entity/Character/Unit.cs index d4f72c5..26bb4eb 100644 --- a/Entity/Character/Unit.cs +++ b/Entity/Character/Unit.cs @@ -466,7 +466,7 @@ namespace Milimoe.FunGame.Core.Entity builder.Append(item.ToString()); } } - + /** * 意义不明（✖）的代码 */ diff --git a/Entity/Item/Item.cs b/Entity/Item/Item.cs index 9b88084..8964831 100644 --- a/Entity/Item/Item.cs +++ b/Entity/Item/Item.cs @@ -334,7 +334,7 @@ namespace Milimoe.FunGame.Core.Entity /// public bool UseItem(Dictionary args) { - if (User != null) + if (User != null) { bool result = OnItemUsed(args); if (result) diff --git a/Entity/Skill/Effect.cs b/Entity/Skill/Effect.cs index b68f0f9..4bf9ee4 100644 --- a/Entity/Skill/Effect.cs +++ b/Entity/Skill/Effect.cs @@ -248,7 +248,7 @@ namespace Milimoe.FunGame.Core.Entity { } - + /// /// 对目标触发技能效果 /// diff --git a/Entity/Skill/Skill.cs b/Entity/Skill/Skill.cs index c930902..5c11e7e 100644 --- a/Entity/Skill/Skill.cs +++ b/Entity/Skill/Skill.cs @@ -357,7 +357,7 @@ namespace Milimoe.FunGame.Core.Entity e.OnSkillCasted(caster, targets, Values); } } - + /// /// 对目标触发技能效果 /// diff --git a/Entity/System/Inventory.cs b/Entity/System/Inventory.cs index 56a0236..95a6e91 100644 --- a/Entity/System/Inventory.cs +++ b/Entity/System/Inventory.cs @@ -70,7 +70,7 @@ namespace Milimoe.FunGame.Core.Entity /// 小队 /// public HashSet Squad { get; set; } = []; - + /// /// 练级中的角色 /// @@ -112,7 +112,7 @@ namespace Milimoe.FunGame.Core.Entity builder.AppendLine($"{i}. {character.ToStringWithLevelWithOutUser()}"); } } - + builder.AppendLine($"======= 物品 ======="); Item[] items = [.. Items]; for (int i = 1; i <= items.Length; i++) diff --git a/Entity/System/Region.cs b/Entity/System/Region.cs index bae4174..41caffb 100644 --- a/Entity/System/Region.cs +++ b/Entity/System/Region.cs @@ -26,7 +26,7 @@ namespace Milimoe.FunGame.Core.Entity } return false; } - + public bool ChangeRandomWeather() { if (Weathers.Count == 0) return false; @@ -55,13 +55,13 @@ namespace Milimoe.FunGame.Core.Entity builder.AppendLine($"== 头目 =="); builder.AppendLine(string.Join("，", Characters.Select(o => o.Name))); } - + if (Units.Count > 0) { builder.AppendLine($"== 生物 =="); builder.AppendLine(string.Join("，", Units.Select(o => o.Name))); } - + if (Crops.Count > 0) { builder.AppendLine($"== 作物 =="); diff --git a/Entity/System/Store.cs b/Entity/System/Store.cs index 9f0de3e..567ea12 100644 --- a/Entity/System/Store.cs +++ b/Entity/System/Store.cs @@ -81,7 +81,7 @@ namespace Milimoe.FunGame.Core.Entity goods.SetPrice(needy, price); } } - + public bool GetPrice(long id, string needy, out double price) { price = 0; diff --git a/Library/Common/Addon/GameModuleServer.cs b/Library/Common/Addon/GameModuleServer.cs index f30533c..b00422a 100644 --- a/Library/Common/Addon/GameModuleServer.cs +++ b/Library/Common/Addon/GameModuleServer.cs @@ -99,7 +99,7 @@ namespace Milimoe.FunGame.Core.Library.Common.Addon { return true; } - + /// /// 结束匿名服务器监听 /// diff --git a/Library/Common/JsonConverter/UserConverter.cs b/Library/Common/JsonConverter/UserConverter.cs index 024e485..a2487fd 100644 --- a/Library/Common/JsonConverter/UserConverter.cs +++ b/Library/Common/JsonConverter/UserConverter.cs @@ -1,7 +1,6 @@ using System.Text.Json; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Interface.Entity; using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.SQLScript.Entity; diff --git a/Model/ActionQueue.cs b/Model/ActionQueue.cs index cb16a01..b8999d0 100644 --- a/Model/ActionQueue.cs +++ b/Model/ActionQueue.cs @@ -1440,7 +1440,8 @@ namespace Milimoe.FunGame.Core.Model if (MaxRespawnTimes != 0) { - string[] teamActive = Teams.OrderByDescending(kv => kv.Value.Score).Select(kv => { + string[] teamActive = Teams.OrderByDescending(kv => kv.Value.Score).Select(kv => + { int activeCount = kv.Value.GetActiveCharacters(this).Count; if (kv.Value == killTeam) { diff --git a/Model/EquilibriumConstant.cs b/Model/EquilibriumConstant.cs index 38a2539..bce7cd8 100644 --- a/Model/EquilibriumConstant.cs +++ b/Model/EquilibriumConstant.cs @@ -9,7 +9,7 @@ namespace Milimoe.FunGame.Core.Model /// 游戏货币名称 /// public string InGameCurrency { get; set; } = "金币"; - + /// /// 游戏材料名称（第二货币） /// @@ -238,7 +238,7 @@ namespace Milimoe.FunGame.Core.Model /// 每 1 点智力减少能量消耗 /// public double INTtoCastEPReduce { get; set; } = 0.00075; - + /// /// 每 1 点智力增加加速系数 /// diff --git a/Service/SocketManager.cs b/Service/SocketManager.cs index 99b3a43..ed0ea3e 100644 --- a/Service/SocketManager.cs +++ b/Service/SocketManager.cs @@ -2,7 +2,6 @@ using System.Net; using System.Net.Sockets; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Library.Exception; namespace Milimoe.FunGame.Core.Service {