重构

- 重构 `RepoItem`，统一点击事件
- 重构 `PlayerInventoryComponent`：
    - `PlayerInventoryStateStore`：状态与库存写模型
    - `PlayerInventoryTowerAssemblyService`：炮塔组装域
    - `PlayerInventoryTowerRosterService`：编队/耐久域
    - `InventoryParticipantUtility`/`InventoryCloneUtility`/`InventorySeedUtility`：通用工具类

Assets/GameMain/Scripts/UI/Game/Controller/RepoFormController.ContextBuilder.cs

@@ -0,0 +1,366 @@
+using System;
+using System.Collections.Generic;
+using GeometryTD.CustomUtility;
+using GeometryTD.Definition;
+using UnityEngine;
+
+namespace GeometryTD.UI
+{
+    public partial class RepoFormController
+    {
+        private RepoFormContext BuildContext(RepoFormRawData rawData)
+        {
+            _itemContextMap.Clear();
+            _itemDescSeedMap.Clear();
+            if (rawData?.Inventory == null)
+            {
+                _participantTowerIds.Clear();
+                return null;
+            }
+
+            Dictionary<long, MuzzleCompItemData> muzzleMap = BuildComponentMap(rawData.Inventory.MuzzleComponents);
+            Dictionary<long, BearingCompItemData> bearingMap = BuildComponentMap(rawData.Inventory.BearingComponents);
+            Dictionary<long, BaseCompItemData> baseMap = BuildComponentMap(rawData.Inventory.BaseComponents);
+            Dictionary<long, TowerItemData> towerMap = BuildTowerMap(rawData.Inventory.Towers);
+            List<RepoItemContext> items = new List<RepoItemContext>();
+
+            if (rawData.Inventory.Towers != null)
+            {
+                foreach (TowerItemData tower in rawData.Inventory.Towers)
+                {
+                    if (tower == null)
+                    {
+                        continue;
+                    }
+
+                    AddItemContext(items, new RepoItemContext
+                    {
+                        InstanceId = tower.InstanceId,
+                        CanDrag = true,
+                        EnduranceRate01 = ItemDescUtility.ResolveTowerEnduranceRate(tower, muzzleMap, bearingMap, baseMap),
+                        ClickActionType = RepoItemClickActionType.OpenDetail,
+                        ComponentSlotType = TowerCompSlotType.None,
+                        IconAreaContext = BuildIconAreaContext(tower)
+                    });
+                    AddItemDescSeed(
+                        tower.InstanceId,
+                        tower.Name,
+                        "Tower",
+                        ItemDescUtility.BuildTowerDesc(tower, muzzleMap, bearingMap, baseMap) ?? string.Empty,
+                        tower.Stats != null ? tower.Stats.Tags : null);
+                }
+            }
+
+            if (rawData.Inventory.MuzzleComponents != null)
+            {
+                foreach (MuzzleCompItemData item in rawData.Inventory.MuzzleComponents)
+                {
+                    if (item == null || item.IsAssembledIntoTower)
+                    {
+                        continue;
+                    }
+
+                    AddItemContext(items, new RepoItemContext
+                    {
+                        InstanceId = item.InstanceId,
+                        CanDrag = true,
+                        EnduranceRate01 = ItemDescUtility.ResolveComponentEnduranceRate(item),
+                        ClickActionType = RepoItemClickActionType.OpenDetail,
+                        ComponentSlotType = TowerCompSlotType.Muzzle,
+                        IconAreaContext = BuildIconAreaContext(item)
+                    });
+                    AddItemDescSeed(
+                        item.InstanceId,
+                        item.Name,
+                        BuildComponentTypeText(item.SlotType),
+                        ItemDescUtility.BuildMuzzleDesc(item) ?? string.Empty,
+                        item.Tags);
+                }
+            }
+
+            if (rawData.Inventory.BearingComponents != null)
+            {
+                foreach (BearingCompItemData item in rawData.Inventory.BearingComponents)
+                {
+                    if (item == null || item.IsAssembledIntoTower)
+                    {
+                        continue;
+                    }
+
+                    AddItemContext(items, new RepoItemContext
+                    {
+                        InstanceId = item.InstanceId,
+                        CanDrag = true,
+                        EnduranceRate01 = ItemDescUtility.ResolveComponentEnduranceRate(item),
+                        ClickActionType = RepoItemClickActionType.OpenDetail,
+                        ComponentSlotType = TowerCompSlotType.Bearing,
+                        IconAreaContext = BuildIconAreaContext(item)
+                    });
+                    AddItemDescSeed(
+                        item.InstanceId,
+                        item.Name,
+                        BuildComponentTypeText(item.SlotType),
+                        ItemDescUtility.BuildBearingDesc(item) ?? string.Empty,
+                        item.Tags);
+                }
+            }
+
+            if (rawData.Inventory.BaseComponents != null)
+            {
+                foreach (BaseCompItemData item in rawData.Inventory.BaseComponents)
+                {
+                    if (item == null || item.IsAssembledIntoTower)
+                    {
+                        continue;
+                    }
+
+                    AddItemContext(items, new RepoItemContext
+                    {
+                        InstanceId = item.InstanceId,
+                        CanDrag = true,
+                        EnduranceRate01 = ItemDescUtility.ResolveComponentEnduranceRate(item),
+                        ClickActionType = RepoItemClickActionType.OpenDetail,
+                        ComponentSlotType = TowerCompSlotType.Base,
+                        IconAreaContext = BuildIconAreaContext(item)
+                    });
+                    AddItemDescSeed(
+                        item.InstanceId,
+                        item.Name,
+                        BuildComponentTypeText(item.SlotType),
+                        ItemDescUtility.BuildBaseDesc(item) ?? string.Empty,
+                        item.Tags);
+                }
+            }
+
+            ParticipantAreaContext participantAreaContext =
+                BuildParticipantAreaContext(rawData.Inventory, towerMap, muzzleMap, bearingMap, baseMap);
+
+            return new RepoFormContext
+            {
+                CombineAreaContext = new CombineAreaContext(),
+                CompAreaContext = new CompAreaContext
+                {
+                    Items = items.ToArray()
+                },
+                ParticipantAreaContext = participantAreaContext
+            };
+        }
+
+        private void AddItemContext(List<RepoItemContext> items, RepoItemContext itemContext)
+        {
+            if (itemContext == null)
+            {
+                return;
+            }
+
+            items.Add(itemContext);
+            _itemContextMap[itemContext.InstanceId] = itemContext;
+        }
+
+        private void AddItemDescSeed(long itemId, string title, string typeText, string description, TagType[] tags)
+        {
+            if (itemId <= 0)
+            {
+                return;
+            }
+
+            _itemDescSeedMap[itemId] = new ItemDescSeed
+            {
+                Title = string.IsNullOrWhiteSpace(title) ? $"Item {itemId}" : title,
+                TypeText = typeText ?? string.Empty,
+                Description = description ?? string.Empty,
+                Tags = CloneTags(tags)
+            };
+        }
+
+        private static TagType[] CloneTags(TagType[] tags)
+        {
+            return tags != null ? (TagType[])tags.Clone() : Array.Empty<TagType>();
+        }
+
+        private static string BuildComponentTypeText(TowerCompSlotType slotType)
+        {
+            return slotType switch
+            {
+                TowerCompSlotType.Muzzle => "Muzzle Component",
+                TowerCompSlotType.Bearing => "Bearing Component",
+                TowerCompSlotType.Base => "Base Component",
+                TowerCompSlotType.Accessory => "Accessory",
+                _ => "Component"
+            };
+        }
+
+        private static Dictionary<long, TComp> BuildComponentMap<TComp>(IReadOnlyList<TComp> items)
+            where TComp : TowerCompItemData
+        {
+            Dictionary<long, TComp> map = new Dictionary<long, TComp>();
+            if (items == null)
+            {
+                return map;
+            }
+
+            for (int i = 0; i < items.Count; i++)
+            {
+                TComp item = items[i];
+                if (item == null || item.InstanceId <= 0)
+                {
+                    continue;
+                }
+
+                map[item.InstanceId] = item;
+            }
+
+            return map;
+        }
+
+        private static Dictionary<long, TowerItemData> BuildTowerMap(IReadOnlyList<TowerItemData> towers)
+        {
+            Dictionary<long, TowerItemData> map = new Dictionary<long, TowerItemData>();
+            if (towers == null)
+            {
+                return map;
+            }
+
+            for (int i = 0; i < towers.Count; i++)
+            {
+                TowerItemData tower = towers[i];
+                if (tower == null || tower.InstanceId <= 0)
+                {
+                    continue;
+                }
+
+                map[tower.InstanceId] = tower;
+            }
+
+            return map;
+        }
+
+        private ParticipantAreaContext BuildParticipantAreaContext(
+            BackpackInventoryData inventory,
+            IReadOnlyDictionary<long, TowerItemData> towerMap,
+            IReadOnlyDictionary<long, MuzzleCompItemData> muzzleMap,
+            IReadOnlyDictionary<long, BearingCompItemData> bearingMap,
+            IReadOnlyDictionary<long, BaseCompItemData> baseMap)
+        {
+            _participantTowerIds.Clear();
+            List<RepoItemContext> participantItems = new List<RepoItemContext>();
+            if (inventory?.ParticipantTowerInstanceIds != null && towerMap != null)
+            {
+                for (int i = 0; i < inventory.ParticipantTowerInstanceIds.Count; i++)
+                {
+                    long towerId = inventory.ParticipantTowerInstanceIds[i];
+                    if (towerId <= 0)
+                    {
+                        continue;
+                    }
+
+                    if (!towerMap.TryGetValue(towerId, out TowerItemData tower) || tower == null)
+                    {
+                        continue;
+                    }
+
+                    if (!_participantTowerIds.Add(towerId))
+                    {
+                        continue;
+                    }
+
+                    participantItems.Add(new RepoItemContext
+                    {
+                        InstanceId = tower.InstanceId,
+                        CanDrag = false,
+                        EnduranceRate01 = ItemDescUtility.ResolveTowerEnduranceRate(tower, muzzleMap, bearingMap, baseMap),
+                        ClickActionType = RepoItemClickActionType.RemoveParticipant,
+                        ComponentSlotType = TowerCompSlotType.None,
+                        IconAreaContext = BuildIconAreaContext(tower)
+                    });
+                }
+            }
+
+            return new ParticipantAreaContext
+            {
+                Items = participantItems.ToArray(),
+                MaxCount = MaxParticipantCount
+            };
+        }
+
+        private void ApplyParticipantSelection()
+        {
+            if (Form == null || _itemContextMap.Count <= 0)
+            {
+                return;
+            }
+
+            foreach (KeyValuePair<long, RepoItemContext> pair in _itemContextMap)
+            {
+                RepoItemContext itemContext = pair.Value;
+                if (itemContext == null || itemContext.ComponentSlotType != TowerCompSlotType.None)
+                {
+                    continue;
+                }
+
+                Form.SetRepoItemSelected(pair.Key, _participantTowerIds.Contains(pair.Key));
+            }
+        }
+
+        private void RefreshParticipantAreaOnly()
+        {
+            if (_useCase == null || Form == null)
+            {
+                return;
+            }
+
+            RepoFormContext latestContext = BuildContext(_useCase.CreateInitialModel());
+            if (latestContext?.ParticipantAreaContext == null)
+            {
+                return;
+            }
+
+            Form.RefreshParticipantArea(latestContext.ParticipantAreaContext);
+            ApplyParticipantSelection();
+        }
+
+        private static IconAreaContext BuildIconAreaContext(TowerItemData tower)
+        {
+            if (tower == null)
+            {
+                return new IconAreaContext
+                {
+                    ComponentSlotType = TowerCompSlotType.None,
+                    Rarity = RarityType.None,
+                    Color = Color.white,
+                    Icon = null
+                };
+            }
+
+            return new IconAreaContext
+            {
+                ComponentSlotType = TowerCompSlotType.None,
+                Rarity = tower.Rarity,
+                Color = IconColorGenerator.GenerateForTower(tower),
+                Icon = null
+            };
+        }
+
+        private static IconAreaContext BuildIconAreaContext(TowerCompItemData item)
+        {
+            if (item == null)
+            {
+                return new IconAreaContext
+                {
+                    ComponentSlotType = TowerCompSlotType.None,
+                    Rarity = RarityType.None,
+                    Color = Color.white,
+                    Icon = null
+                };
+            }
+
+            return new IconAreaContext
+            {
+                ComponentSlotType = item.SlotType,
+                Rarity = item.Rarity,
+                Color = IconColorGenerator.GenerateForComponent(item),
+                Icon = null
+            };
+        }
+    }
+}

Assets/GameMain/Scripts/UI/Game/Controller/RepoFormController.ContextBuilder.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 55cf579e25a94ec6987443b7c6e6ab5f
+timeCreated: 1772629679

Assets/GameMain/Scripts/UI/Game/Controller/RepoFormController.cs

@@ -1,15 +1,13 @@
-using System;
 using System.Collections.Generic;
 using GeometryTD.CustomEvent;
 using GeometryTD.Definition;
 using GameFramework.Event;
-using GeometryTD.CustomUtility;
 using UnityEngine;
 using UnityGameFramework.Runtime;
 
 namespace GeometryTD.UI
 {
-    public class RepoFormController : UIFormControllerCommonBase<RepoFormContext, RepoForm>
+    public partial class RepoFormController : UIFormControllerCommonBase<RepoFormContext, RepoForm>
     {
         private const int MaxParticipantCount = 4;
         private RepoFormUseCase _useCase;
@@ -35,23 +33,21 @@ namespace GeometryTD.UI
 
         protected override void SubscribeCustomEvents()
         {
-            GameEntry.Event.Subscribe(RepoItemDetailRequestedEventArgs.EventId, OnRepoItemDetailRequested);
+            GameEntry.Event.Subscribe(RepoItemClickedEventArgs.EventId, OnRepoItemClicked);
             GameEntry.Event.Subscribe(RepoItemDragEndedEventArgs.EventId, OnRepoItemDragEnded);
             GameEntry.Event.Subscribe(CombineSlotClickedEventArgs.EventId, OnCombineSlotClicked);
             GameEntry.Event.Subscribe(RepoCombineRequestedEventArgs.EventId, OnRepoCombineRequested);
             GameEntry.Event.Subscribe(RepoParticipantAssignRequestedEventArgs.EventId, OnRepoParticipantAssignRequested);
-            GameEntry.Event.Subscribe(RepoParticipantRemoveRequestedEventArgs.EventId, OnRepoParticipantRemoveRequested);
             GameEntry.Event.Subscribe(RepoFormReturnEventArgs.EventId, OnRepoFormReturn);
         }
 
         protected override void UnsubscribeCustomEvents()
         {
-            GameEntry.Event.Unsubscribe(RepoItemDetailRequestedEventArgs.EventId, OnRepoItemDetailRequested);
+            GameEntry.Event.Unsubscribe(RepoItemClickedEventArgs.EventId, OnRepoItemClicked);
             GameEntry.Event.Unsubscribe(RepoItemDragEndedEventArgs.EventId, OnRepoItemDragEnded);
             GameEntry.Event.Unsubscribe(CombineSlotClickedEventArgs.EventId, OnCombineSlotClicked);
             GameEntry.Event.Unsubscribe(RepoCombineRequestedEventArgs.EventId, OnRepoCombineRequested);
             GameEntry.Event.Unsubscribe(RepoParticipantAssignRequestedEventArgs.EventId, OnRepoParticipantAssignRequested);
-            GameEntry.Event.Unsubscribe(RepoParticipantRemoveRequestedEventArgs.EventId, OnRepoParticipantRemoveRequested);
             GameEntry.Event.Unsubscribe(RepoFormReturnEventArgs.EventId, OnRepoFormReturn);
         }
 
@@ -100,375 +96,52 @@ namespace GeometryTD.UI
             _useCase = repoFormUseCase;
         }
 
-        private RepoFormContext BuildContext(RepoFormRawData rawData)
-        {
-            _itemContextMap.Clear();
-            _itemDescSeedMap.Clear();
-            if (rawData?.Inventory == null)
-            {
-                _participantTowerIds.Clear();
-                return null;
-            }
-
-            Dictionary<long, MuzzleCompItemData> muzzleMap = BuildComponentMap(rawData.Inventory.MuzzleComponents);
-            Dictionary<long, BearingCompItemData> bearingMap = BuildComponentMap(rawData.Inventory.BearingComponents);
-            Dictionary<long, BaseCompItemData> baseMap = BuildComponentMap(rawData.Inventory.BaseComponents);
-            Dictionary<long, TowerItemData> towerMap = BuildTowerMap(rawData.Inventory.Towers);
-            List<RepoItemContext> items = new List<RepoItemContext>();
-
-            if (rawData.Inventory.Towers != null)
-            {
-                foreach (TowerItemData tower in rawData.Inventory.Towers)
-                {
-                    if (tower == null)
-                    {
-                        continue;
-                    }
-
-                    AddItemContext(items, new RepoItemContext
-                    {
-                        InstanceId = tower.InstanceId,
-                        CanDrag = true,
-                        EnduranceRate01 = ItemDescUtility.ResolveTowerEnduranceRate(tower, muzzleMap, bearingMap, baseMap),
-                        ClickActionType = RepoItemClickActionType.OpenDetail,
-                        ComponentSlotType = TowerCompSlotType.None,
-                        IconAreaContext = BuildIconAreaContext(tower)
-                    });
-                    AddItemDescSeed(
-                        tower.InstanceId,
-                        tower.Name,
-                        "Tower",
-                        ItemDescUtility.BuildTowerDesc(tower, muzzleMap, bearingMap, baseMap) ?? string.Empty,
-                        tower.Stats != null ? tower.Stats.Tags : null);
-                }
-            }
-
-            if (rawData.Inventory.MuzzleComponents != null)
-            {
-                foreach (MuzzleCompItemData item in rawData.Inventory.MuzzleComponents)
-                {
-                    if (item == null || item.IsAssembledIntoTower)
-                    {
-                        continue;
-                    }
-
-                    AddItemContext(items, new RepoItemContext
-                    {
-                        InstanceId = item.InstanceId,
-                        CanDrag = true,
-                        EnduranceRate01 = ItemDescUtility.ResolveComponentEnduranceRate(item),
-                        ClickActionType = RepoItemClickActionType.OpenDetail,
-                        ComponentSlotType = TowerCompSlotType.Muzzle,
-                        IconAreaContext = BuildIconAreaContext(item)
-                    });
-                    AddItemDescSeed(
-                        item.InstanceId,
-                        item.Name,
-                        BuildComponentTypeText(item.SlotType),
-                        ItemDescUtility.BuildMuzzleDesc(item) ?? string.Empty,
-                        item.Tags);
-                }
-            }
-
-            if (rawData.Inventory.BearingComponents != null)
-            {
-                foreach (BearingCompItemData item in rawData.Inventory.BearingComponents)
-                {
-                    if (item == null || item.IsAssembledIntoTower)
-                    {
-                        continue;
-                    }
-
-                    AddItemContext(items, new RepoItemContext
-                    {
-                        InstanceId = item.InstanceId,
-                        CanDrag = true,
-                        EnduranceRate01 = ItemDescUtility.ResolveComponentEnduranceRate(item),
-                        ClickActionType = RepoItemClickActionType.OpenDetail,
-                        ComponentSlotType = TowerCompSlotType.Bearing,
-                        IconAreaContext = BuildIconAreaContext(item)
-                    });
-                    AddItemDescSeed(
-                        item.InstanceId,
-                        item.Name,
-                        BuildComponentTypeText(item.SlotType),
-                        ItemDescUtility.BuildBearingDesc(item) ?? string.Empty,
-                        item.Tags);
-                }
-            }
-
-            if (rawData.Inventory.BaseComponents != null)
-            {
-                foreach (BaseCompItemData item in rawData.Inventory.BaseComponents)
-                {
-                    if (item == null || item.IsAssembledIntoTower)
-                    {
-                        continue;
-                    }
-
-                    AddItemContext(items, new RepoItemContext
-                    {
-                        InstanceId = item.InstanceId,
-                        CanDrag = true,
-                        EnduranceRate01 = ItemDescUtility.ResolveComponentEnduranceRate(item),
-                        ClickActionType = RepoItemClickActionType.OpenDetail,
-                        ComponentSlotType = TowerCompSlotType.Base,
-                        IconAreaContext = BuildIconAreaContext(item)
-                    });
-                    AddItemDescSeed(
-                        item.InstanceId,
-                        item.Name,
-                        BuildComponentTypeText(item.SlotType),
-                        ItemDescUtility.BuildBaseDesc(item) ?? string.Empty,
-                        item.Tags);
-                }
-            }
-
-            ParticipantAreaContext participantAreaContext =
-                BuildParticipantAreaContext(rawData.Inventory, towerMap, muzzleMap, bearingMap, baseMap);
-
-            return new RepoFormContext
-            {
-                CombineAreaContext = new CombineAreaContext(),
-                CompAreaContext = new CompAreaContext
-                {
-                    Items = items.ToArray()
-                },
-                ParticipantAreaContext = participantAreaContext
-            };
-        }
-
-        private void AddItemContext(List<RepoItemContext> items, RepoItemContext itemContext)
-        {
-            if (itemContext == null)
-            {
-                return;
-            }
-
-            items.Add(itemContext);
-            _itemContextMap[itemContext.InstanceId] = itemContext;
-        }
-
-        private void AddItemDescSeed(long itemId, string title, string typeText, string description, TagType[] tags)
-        {
-            if (itemId <= 0)
-            {
-                return;
-            }
-
-            _itemDescSeedMap[itemId] = new ItemDescSeed
-            {
-                Title = string.IsNullOrWhiteSpace(title) ? $"Item {itemId}" : title,
-                TypeText = typeText ?? string.Empty,
-                Description = description ?? string.Empty,
-                Tags = CloneTags(tags)
-            };
-        }
-
-        private static TagType[] CloneTags(TagType[] tags)
-        {
-            return tags != null ? (TagType[])tags.Clone() : Array.Empty<TagType>();
-        }
-
-        private static string BuildComponentTypeText(TowerCompSlotType slotType)
-        {
-            return slotType switch
-            {
-                TowerCompSlotType.Muzzle => "Muzzle Component",
-                TowerCompSlotType.Bearing => "Bearing Component",
-                TowerCompSlotType.Base => "Base Component",
-                TowerCompSlotType.Accessory => "Accessory",
-                _ => "Component"
-            };
-        }
-
-        private static Dictionary<long, TComp> BuildComponentMap<TComp>(IReadOnlyList<TComp> items)
-            where TComp : TowerCompItemData
-        {
-            Dictionary<long, TComp> map = new Dictionary<long, TComp>();
-            if (items == null)
-            {
-                return map;
-            }
-
-            for (int i = 0; i < items.Count; i++)
-            {
-                TComp item = items[i];
-                if (item == null || item.InstanceId <= 0)
-                {
-                    continue;
-                }
-
-                map[item.InstanceId] = item;
-            }
-
-            return map;
-        }
-
-        private static Dictionary<long, TowerItemData> BuildTowerMap(IReadOnlyList<TowerItemData> towers)
-        {
-            Dictionary<long, TowerItemData> map = new Dictionary<long, TowerItemData>();
-            if (towers == null)
-            {
-                return map;
-            }
-
-            for (int i = 0; i < towers.Count; i++)
-            {
-                TowerItemData tower = towers[i];
-                if (tower == null || tower.InstanceId <= 0)
-                {
-                    continue;
-                }
-
-                map[tower.InstanceId] = tower;
-            }
-
-            return map;
-        }
-
-        private ParticipantAreaContext BuildParticipantAreaContext(
-            BackpackInventoryData inventory,
-            IReadOnlyDictionary<long, TowerItemData> towerMap,
-            IReadOnlyDictionary<long, MuzzleCompItemData> muzzleMap,
-            IReadOnlyDictionary<long, BearingCompItemData> bearingMap,
-            IReadOnlyDictionary<long, BaseCompItemData> baseMap)
-        {
-            _participantTowerIds.Clear();
-            List<RepoItemContext> participantItems = new List<RepoItemContext>();
-            if (inventory?.ParticipantTowerInstanceIds != null && towerMap != null)
-            {
-                for (int i = 0; i < inventory.ParticipantTowerInstanceIds.Count; i++)
-                {
-                    long towerId = inventory.ParticipantTowerInstanceIds[i];
-                    if (towerId <= 0)
-                    {
-                        continue;
-                    }
-
-                    if (!towerMap.TryGetValue(towerId, out TowerItemData tower) || tower == null)
-                    {
-                        continue;
-                    }
-
-                    if (!_participantTowerIds.Add(towerId))
-                    {
-                        continue;
-                    }
-
-                    participantItems.Add(new RepoItemContext
-                    {
-                        InstanceId = tower.InstanceId,
-                        CanDrag = false,
-                        EnduranceRate01 = ItemDescUtility.ResolveTowerEnduranceRate(tower, muzzleMap, bearingMap, baseMap),
-                        ClickActionType = RepoItemClickActionType.RemoveParticipant,
-                        ComponentSlotType = TowerCompSlotType.None,
-                        IconAreaContext = BuildIconAreaContext(tower)
-                    });
-                }
-            }
-
-            return new ParticipantAreaContext
-            {
-                Items = participantItems.ToArray(),
-                MaxCount = MaxParticipantCount
-            };
-        }
-
-        private void ApplyParticipantSelection()
-        {
-            if (Form == null || _itemContextMap.Count <= 0)
-            {
-                return;
-            }
-
-            foreach (KeyValuePair<long, RepoItemContext> pair in _itemContextMap)
-            {
-                RepoItemContext itemContext = pair.Value;
-                if (itemContext == null || itemContext.ComponentSlotType != TowerCompSlotType.None)
-                {
-                    continue;
-                }
-
-                Form.SetRepoItemSelected(pair.Key, _participantTowerIds.Contains(pair.Key));
-            }
-        }
-
-        private void RefreshParticipantAreaOnly()
-        {
-            if (_useCase == null || Form == null)
-            {
-                return;
-            }
-
-            RepoFormContext latestContext = BuildContext(_useCase.CreateInitialModel());
-            if (latestContext?.ParticipantAreaContext == null)
-            {
-                return;
-            }
-
-            Form.RefreshParticipantArea(latestContext.ParticipantAreaContext);
-            ApplyParticipantSelection();
-        }
-
-        private static IconAreaContext BuildIconAreaContext(TowerItemData tower)
-        {
-            if (tower == null)
-            {
-                return new IconAreaContext
-                {
-                    ComponentSlotType = TowerCompSlotType.None,
-                    Rarity = RarityType.None,
-                    Color = Color.white,
-                    Icon = null
-                };
-            }
-
-            return new IconAreaContext
-            {
-                ComponentSlotType = TowerCompSlotType.None,
-                Rarity = tower.Rarity,
-                Color = IconColorGenerator.GenerateForTower(tower),
-                Icon = null
-            };
-        }
-
-        private static IconAreaContext BuildIconAreaContext(TowerCompItemData item)
-        {
-            if (item == null)
-            {
-                return new IconAreaContext
-                {
-                    ComponentSlotType = TowerCompSlotType.None,
-                    Rarity = RarityType.None,
-                    Color = Color.white,
-                    Icon = null
-                };
-            }
-
-            return new IconAreaContext
-            {
-                ComponentSlotType = item.SlotType,
-                Rarity = item.Rarity,
-                Color = IconColorGenerator.GenerateForComponent(item),
-                Icon = null
-            };
-        }
-
         #region Event Handlers
 
-        private void OnRepoItemDetailRequested(object sender, GameEventArgs e)
+        private void OnRepoItemClicked(object sender, GameEventArgs e)
         {
             if (!IsEventFromCurrentForm(sender))
             {
                 return;
             }
 
-            if (!(e is RepoItemDetailRequestedEventArgs args))
+            if (!(e is RepoItemClickedEventArgs args))
             {
                 return;
             }
 
+            RepoItemClickActionType clickActionType = RepoItemClickActionType.OpenDetail;
+            if (sender is RepoItem clickedItem && clickedItem.Context != null)
+            {
+                clickActionType = clickedItem.Context.ClickActionType;
+            }
+            else if (_itemContextMap.TryGetValue(args.ItemId, out RepoItemContext itemContextFromMap) &&
+                     itemContextFromMap != null)
+            {
+                clickActionType = itemContextFromMap.ClickActionType;
+            }
+
+            if (args.ItemId <= 0)
+            {
+                return;
+            }
+
+            if (clickActionType == RepoItemClickActionType.RemoveParticipant)
+            {
+                if (_useCase == null || Form == null)
+                {
+                    return;
+                }
+
+                if (!_useCase.TryRemoveParticipantTower(args.ItemId))
+                {
+                    return;
+                }
+
+                RefreshParticipantAreaOnly();
+                return;
+            }
+
             if (!_itemDescSeedMap.TryGetValue(args.ItemId, out ItemDescSeed seed))
             {
                 return;
@@ -599,31 +272,6 @@ namespace GeometryTD.UI
             RefreshParticipantAreaOnly();
         }
 
-        private void OnRepoParticipantRemoveRequested(object sender, GameEventArgs e)
-        {
-            if (!IsEventFromCurrentForm(sender))
-            {
-                return;
-            }
-
-            if (!(e is RepoParticipantRemoveRequestedEventArgs args))
-            {
-                return;
-            }
-            
-            if (_useCase == null || Form == null || args.TowerItemId <= 0)
-            {
-                return;
-            }
-            
-            if (!_useCase.TryRemoveParticipantTower(args.TowerItemId))
-            {
-                return;
-            }
-
-            RefreshParticipantAreaOnly();
-        }
-
         private bool IsEventFromCurrentForm(object sender)
         {
             if (Form == null)