feat: 合并 develop 到 main，发布版本 1.11.0

## 变更内容

- 新增动画参数支持：Sleeping、IsVehicle、IsControllingOtherCharacter、IsControllingVehicle、IsPlayerControlling、RidingVehicleType

- 新增动作类型 CA_ControlOtherCharacter（控制其他角色）

- 新增 VehicleLocator 锚点用于载具定位

- 优化模型选择界面：新增搜索功能、Shift+点击复制信息、扩展类型排序和颜色区分

- 增加马匹脚步声标签支持

- 重构和优化模型列表逻辑，提升性能和稳定性

- 优化模型列表操作：滚动位置保持、居中显示、跳转按钮

## 版本更新

- 版本号更新至 v1.11.0

Author: BAKAOLC

.idea/.idea.DuckovCustomModel/.idea/statistic.xml

@@ -2,6 +2,40 @@
 
 [English](CHANGELOG_EN.md) | 中文
 
+## v1.11.0
+
+- 新增动画参数支持
+  - 新增 `Sleeping`（bool）：角色是否处于睡眠状态
+  - 新增 `IsVehicle`（bool）：角色是否为载具
+  - 新增 `IsControllingOtherCharacter`（bool）：角色是否正在控制其他角色
+  - 新增 `IsControllingVehicle`（bool）：角色是否正在控制载具（为 `true` 时，`IsControllingOtherCharacter` 必定为 `true`）
+  - 新增 `IsPlayerControlling`（bool）：角色是否为当前玩家正在操作的角色
+  - 新增 `RidingVehicleType`（int）：角色正在骑乘的载具类型
+- 新增动作类型支持
+  - 新增 `CA_ControlOtherCharacter`（控制其他角色）动作类型（ID: 10）
+- 新增 `VehicleLocator` 锚点，用于标识角色作为载具时的坐骑位置
+  - 该锚点的位置和朝向可以用来调整角色在骑乘状态下的位置和朝向
+- 优化了模型选择界面
+  - 现在支持搜索目标类型，以便快速找到特定类型进行设置
+  - 按着 `Shift` 键时，点击目标类型按钮会将一些数据信息复制到剪贴板，以便于开发者获取信息
+    - DisplayName：目标类型的多语言显示名称
+    - TargetTypeId：目标类型的字符串标识符
+    - ModelId：当前设置的模型 ID
+    - FallbackModelId：当前设置的回退模型 ID
+  - 现在其他 Mod 向本 Mod 注册的扩展类型将会排序在 “角色”、“宠物” 之后，“所有AI角色” 之前
+  - 现在其他 Mod 向本 Mod 注册的扩展类型将会以靛蓝色显示，以便于区分内置类型和扩展类型
+  - 修复了非 AI 角色目标类型会错误的显示回退模型的颜色标注的问题
+- 增加了马匹脚步声标签，并重构逻辑以保证未来能自动支持更多脚步声标签
+    - `"footstep_horse_walk_light"`
+    - `"footstep_horse_walk_heavy"`
+    - `"footstep_horse_run_light"`
+    - `"footstep_horse_run_heavy"`
+- 重构了部分逻辑，优化了刷新模型列表时的稳定性和性能表现
+- 优化了模型列表的操作逻辑
+  - 现在切换模型时会尝试保留当前的界面滚动位置
+  - 切换页面、刷新列表等操作会尝试居中显示当前正在使用的模型
+  - 追加了跳转到顶部和跳转到底部的按钮，以便于快速调整滚动位置
+
 ## v1.10.6
 
 - 调整了模型身高调整滑条功能，现在允许点击左侧按钮切换至输入框输入以更精确地设置数值

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 English | [中文](CHANGELOG.md)
 
+## v1.11.0
+
+- Added new animator parameters support
+  - Added `Sleeping` (bool): Whether the character is in sleeping state
+  - Added `IsVehicle` (bool): Whether the character is a vehicle
+  - Added `IsControllingOtherCharacter` (bool): Whether the character is controlling another character
+  - Added `IsControllingVehicle` (bool): Whether the character is controlling a vehicle (when `true`, `IsControllingOtherCharacter` is always `true`)
+  - Added `IsPlayerControlling` (bool): Whether the player is currently controlling this character
+  - Added `RidingVehicleType` (int): The type of vehicle the character is riding
+- Added new action type support
+  - Added `CA_ControlOtherCharacter` (control other character) action type (ID: 10)
+- Added `VehicleLocator` anchor point for indicating the player's position when riding a vehicle
+  - The position and orientation of the anchor point can be used to adjust the character's position and orientation while riding
+- Optimized the model selection interface
+  - Now supports searching target types for quickly finding specific types for configuration
+  - When holding the `Shift` key, clicking the target type button will copy some data information to the clipboard for developers to obtain information
+    - DisplayName：Target type's multilingual display name
+    - TargetTypeId：Target type's string identifier
+    - ModelId：Currently set model ID
+    - FallbackModelId：Currently set fallback model ID
+  - Extension types registered by other mods to this mod are now sorted after "Character" and "Pet", but before "All AI Characters"
+  - Extension types registered by other mods to this mod are now displayed in indigo color to distinguish built-in types from extension types
+  - Fixed an issue where non-AI character target types incorrectly displayed fallback model color markings
+- Added horse footstep sound tags and refactored logic to ensure future automatic support for more footstep sound tags
+    - `"footstep_horse_walk_light"`
+    - `"footstep_horse_walk_heavy"`
+    - `"footstep_horse_run_light"`
+    - `"footstep_horse_run_heavy"`
+- Refactored some logic to improve stability and performance when refreshing the model list
+- Optimized the operation logic of the model list
+  - Now attempts to preserve the current interface scroll position when switching models
+  - Attempts to center the currently used model when switching pages, refreshing the list, and other operations
+  - Added buttons for scrolling to the top and bottom to facilitate quick adjustment of the scroll position
+
 ## v1.10.6
 
 - Adjusted model scale slider functionality, now allows clicking the left button to switch to input box for more precise scale value setting

CHANGELOG_EN.md

@@ -102,6 +102,18 @@ public static class CustomAnimatorHash
         public static readonly int EmotionValue1 = Animator.StringToHash("EmotionValue1"); // int
         public static readonly int EmotionValue2 = Animator.StringToHash("EmotionValue2"); // int
 
+        public static readonly int Sleeping = Animator.StringToHash("Sleeping"); // bool
+        public static readonly int IsVehicle = Animator.StringToHash("IsVehicle"); // bool
+
+        public static readonly int
+            IsControllingOtherCharacter = Animator.StringToHash("IsControllingOtherCharacter"); // bool
+
+        public static readonly int IsControllingVehicle = Animator.StringToHash("IsControllingVehicle"); // bool
+
+        public static readonly int IsPlayerControlling = Animator.StringToHash("IsPlayerControlling"); // bool
+
+        public static readonly int RidingVehicleType = Animator.StringToHash("RidingVehicleType"); // int
+
         public static List<AnimatorParamInfo> GetAllParams()
         {
             return new List<AnimatorParamInfo>
@@ -192,6 +204,18 @@ public static List<AnimatorParamInfo> GetAllParams()
                 },
                 new() { Name = "EmotionValue1", Hash = EmotionValue1, Type = "int", InitialValue = 0 },
                 new() { Name = "EmotionValue2", Hash = EmotionValue2, Type = "int", InitialValue = 0 },
+                new() { Name = "Sleeping", Hash = Sleeping, Type = "bool", InitialValue = false },
+                new() { Name = "IsVehicle", Hash = IsVehicle, Type = "bool", InitialValue = false },
+                new()
+                {
+                    Name = "IsControllingOtherCharacter", Hash = IsControllingOtherCharacter, Type = "bool",
+                    InitialValue = false,
+                },
+                new()
+                    { Name = "IsControllingVehicle", Hash = IsControllingVehicle, Type = "bool", InitialValue = false },
+                new()
+                    { Name = "IsPlayerControlling", Hash = IsPlayerControlling, Type = "bool", InitialValue = false },
+                new() { Name = "RidingVehicleType", Hash = RidingVehicleType, Type = "int", InitialValue = 0 },
             }.OrderBy(p => p.Name).ToList();
         }
     }

DuckovCustomModel.Core/Data/CustomAnimatorHash.cs

@@ -27,6 +27,7 @@ public static class SocketNames
         public const string Backpack = "BackpackLocator";
         public const string MeleeWeapon = "MeleeWeaponLocator";
         public const string PopText = "PopTextLocator";
+        public const string Vehicle = "VehicleLocator";
 
         public static readonly List<string> InternalSocketNames =
         [
@@ -38,6 +39,7 @@ public static class SocketNames
             Backpack,
             MeleeWeapon,
             PopText,
+            Vehicle,
         ];
 
         #endregion

DuckovCustomModel.Core/Data/SocketNames.cs

@@ -1,11 +1,8 @@
-using System.Collections.Generic;
-
 namespace DuckovCustomModel.Core.Data
 {
     public static class SoundTags
     {
         public const string Normal = "normal";
-        public const string Surprise = "surprise";
         public const string Idle = "idle";
         public const string TriggerOnHurt = "trigger_on_hurt";
         public const string TriggerOnDeath = "trigger_on_death";
@@ -15,71 +12,8 @@ public static class SoundTags
         public const string TriggerOnCritDead = "trigger_on_crit_dead";
         public const string TriggerOnCritHitTarget = "trigger_on_crit_hit_target";
         public const string TriggerOnCritKillTarget = "trigger_on_crit_kill_target";
-        public const string SearchFoundItemQualityNone = "search_found_item_quality_none";
-        public const string SearchFoundItemQualityWhite = "search_found_item_quality_white";
-        public const string SearchFoundItemQualityGreen = "search_found_item_quality_green";
-        public const string SearchFoundItemQualityBlue = "search_found_item_quality_blue";
-        public const string SearchFoundItemQualityPurple = "search_found_item_quality_purple";
-        public const string SearchFoundItemQualityOrange = "search_found_item_quality_orange";
-        public const string SearchFoundItemQualityRed = "search_found_item_quality_red";
-        public const string SearchFoundItemQualityQ7 = "search_found_item_quality_q7";
-        public const string SearchFoundItemQualityQ8 = "search_found_item_quality_q8";
-        public const string FootStepOrganicWalkLight = "footstep_organic_walk_light";
-        public const string FootStepOrganicWalkHeavy = "footstep_organic_walk_heavy";
-        public const string FootStepOrganicRunLight = "footstep_organic_run_light";
-        public const string FootStepOrganicRunHeavy = "footstep_organic_run_heavy";
-        public const string FootStepMechWalkLight = "footstep_mech_walk_light";
-        public const string FootStepMechWalkHeavy = "footstep_mech_walk_heavy";
-        public const string FootStepMechRunLight = "footstep_mech_run_light";
-        public const string FootStepMechRunHeavy = "footstep_mech_run_heavy";
-        public const string FootStepDangerWalkLight = "footstep_danger_walk_light";
-        public const string FootStepDangerWalkHeavy = "footstep_danger_walk_heavy";
-        public const string FootStepDangerRunLight = "footstep_danger_run_light";
-        public const string FootStepDangerRunHeavy = "footstep_danger_run_heavy";
-        public const string FootStepNoSoundWalkLight = "footstep_nosound_walk_light";
-        public const string FootStepNoSoundWalkHeavy = "footstep_nosound_walk_heavy";
-        public const string FootStepNoSoundRunLight = "footstep_nosound_run_light";
-        public const string FootStepNoSoundRunHeavy = "footstep_nosound_run_heavy";
-
 
-        public static IReadOnlyCollection<string> ValidTags =>
-        [
-            Normal,
-            Surprise,
-            Idle,
-            TriggerOnHurt,
-            TriggerOnDeath,
-            TriggerOnHitTarget,
-            TriggerOnKillTarget,
-            TriggerOnCritHurt,
-            TriggerOnCritDead,
-            TriggerOnCritHitTarget,
-            TriggerOnCritKillTarget,
-            SearchFoundItemQualityNone,
-            SearchFoundItemQualityWhite,
-            SearchFoundItemQualityGreen,
-            SearchFoundItemQualityBlue,
-            SearchFoundItemQualityPurple,
-            SearchFoundItemQualityOrange,
-            SearchFoundItemQualityRed,
-            SearchFoundItemQualityQ7,
-            SearchFoundItemQualityQ8,
-            FootStepOrganicWalkLight,
-            FootStepOrganicWalkHeavy,
-            FootStepOrganicRunLight,
-            FootStepOrganicRunHeavy,
-            FootStepMechWalkLight,
-            FootStepMechWalkHeavy,
-            FootStepMechRunLight,
-            FootStepMechRunHeavy,
-            FootStepDangerWalkLight,
-            FootStepDangerWalkHeavy,
-            FootStepDangerRunLight,
-            FootStepDangerRunHeavy,
-            FootStepNoSoundWalkLight,
-            FootStepNoSoundWalkHeavy,
-            FootStepNoSoundRunLight,
-            FootStepNoSoundRunHeavy,
-        ];
+        public const string SearchFoundItemQualityFormat = "search_found_item_quality_{0}";
+        public const string FootStepFormat = "footstep_{0}_{1}";
     }
 }

DuckovCustomModel.Core/Data/SoundTags.cs

@@ -19,7 +19,7 @@
 
   <!-- CI 环境使用 NuGet 包 -->
   <ItemGroup Condition="'$(UseGameLibsFromNuGet)' == 'true'">
-    <PackageReference Include="DuckovGameLibs" Version="1.3.13-Steam"/>
+    <PackageReference Include="DuckovGameLibs" Version="2.0.26-Steam"/>
   </ItemGroup>
 
   <!-- 本地开发使用游戏目录 -->

DuckovCustomModel.Core/DuckovCustomModel.Core.csproj

@@ -19,7 +19,7 @@
 
   <!-- CI 环境使用 NuGet 包 -->
   <ItemGroup Condition="'$(UseGameLibsFromNuGet)' == 'true'">
-    <PackageReference Include="DuckovGameLibs" Version="1.3.13-Steam"/>
+    <PackageReference Include="DuckovGameLibs" Version="2.0.26-Steam"/>
   </ItemGroup>
 
   <!-- 本地开发使用游戏目录 -->

DuckovCustomModel.ModLoader/DuckovCustomModel.ModLoader.csproj

@@ -4,7 +4,7 @@ public static class Constant
     {
         public const string ModID = "DuckovCustomModel";
         public const string ModName = "Duckov Custom Model";
-        public const string ModVersion = "1.10.6";
+        public const string ModVersion = "1.11.0";
         public const string HarmonyId = "com.ritsukage.DuckovCustomModel";
     }
 }

DuckovCustomModel/Constant.cs

@@ -18,6 +18,7 @@ static CharacterActionDefinitions()
             RegisterActionType<CA_Reload>(7);
             RegisterActionType<CA_Skill>(8);
             RegisterActionType<CA_UseItem>(9);
+            RegisterActionType<CA_ControlOtherCharacter>(10);
         }
 
         public static IReadOnlyDictionary<Type, int> GetActionTypes()