From 9049af796609c88d89f9cbe60920dd66c26472af Mon Sep 17 00:00:00 2001 From: SepComet <202308010230@stu.csust.edu.cn> Date: Mon, 15 Jun 2026 11:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=20DisplayItemInfoForm=20=E6=9B=B4?= =?UTF-8?q?=E5=90=8D=E4=B8=BA=20ItemTooltipForm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameMain/DataTables/UIForm.txt | 3 +- .../Base/Definition/Enum/UIFormType.cs | 2 +- .../DisplayItemInfoLockEventArgs.cs | 27 --------- ...ItemInfoForm.meta => ItemTooltipForm.meta} | 0 .../ItemTooltipHideEventArgs.cs} | 10 ++-- .../ItemTooltipHideEventArgs.cs.meta} | 0 .../ItemTooltipLockEventArgs.cs | 27 +++++++++ .../ItemTooltipLockEventArgs.cs.meta} | 0 .../ItemTooltipRecycleEventArgs.cs} | 10 ++-- .../ItemTooltipRecycleEventArgs.cs.meta} | 0 .../ItemTooltipShowEventArgs.cs} | 12 ++-- .../ItemTooltipShowEventArgs.cs.meta} | 0 ...emInfoContext.cs => ItemTooltipContext.cs} | 10 +--- ...ext.cs.meta => ItemTooltipContext.cs.meta} | 0 ...Controller.cs => ItemTooltipController.cs} | 56 +++++++++--------- ....cs.meta => ItemTooltipController.cs.meta} | 0 ...playItemInfoForm.cs => ItemTooltipForm.cs} | 16 ++--- ...foForm.cs.meta => ItemTooltipForm.cs.meta} | 0 .../Presentation/Main/Shop/ShopController.cs | 22 +++---- .../Presentation/Main/View/DisplayItem.cs | 6 +- ...emInfoRawData.cs => ItemTooltipRawData.cs} | 3 +- ...ata.cs.meta => ItemTooltipRawData.cs.meta} | 0 ...InfoForm.prefab => ItemTooltipForm.prefab} | 6 +- ...refab.meta => ItemTooltipForm.prefab.meta} | 0 Assets/Launcher.unity | 2 +- 数据表/UIForm.xlsx | Bin 11940 -> 11899 bytes 数据表/convert.py | 6 +- 27 files changed, 108 insertions(+), 110 deletions(-) delete mode 100644 Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm.meta => ItemTooltipForm.meta} (100%) rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs => ItemTooltipForm/ItemTooltipHideEventArgs.cs} (51%) rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs.meta => ItemTooltipForm/ItemTooltipHideEventArgs.cs.meta} (100%) create mode 100644 Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipLockEventArgs.cs rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs.meta => ItemTooltipForm/ItemTooltipLockEventArgs.cs.meta} (100%) rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs => ItemTooltipForm/ItemTooltipRecycleEventArgs.cs} (55%) rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs.meta => ItemTooltipForm/ItemTooltipRecycleEventArgs.cs.meta} (100%) rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemShowEventArgs.cs => ItemTooltipForm/ItemTooltipShowEventArgs.cs} (72%) rename Assets/GameMain/Scripts/Base/Event/{DisplayItemInfoForm/DisplayItemShowEventArgs.cs.meta => ItemTooltipForm/ItemTooltipShowEventArgs.cs.meta} (100%) rename Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/{DisplayItemInfoContext.cs => ItemTooltipContext.cs} (87%) rename Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/{DisplayItemInfoContext.cs.meta => ItemTooltipContext.cs.meta} (100%) rename Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/{DisplayItemInfoController.cs => ItemTooltipController.cs} (50%) rename Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/{DisplayItemInfoController.cs.meta => ItemTooltipController.cs.meta} (100%) rename Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/{DisplayItemInfoForm.cs => ItemTooltipForm.cs} (91%) rename Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/{DisplayItemInfoForm.cs.meta => ItemTooltipForm.cs.meta} (100%) rename Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/{DisplayItemInfoRawData.cs => ItemTooltipRawData.cs} (87%) rename Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/{DisplayItemInfoRawData.cs.meta => ItemTooltipRawData.cs.meta} (100%) rename Assets/GameMain/UI/UIForms/{DisplayItemInfoForm.prefab => ItemTooltipForm.prefab} (99%) rename Assets/GameMain/UI/UIForms/{DisplayItemInfoForm.prefab.meta => ItemTooltipForm.prefab.meta} (100%) diff --git a/Assets/GameMain/DataTables/UIForm.txt b/Assets/GameMain/DataTables/UIForm.txt index 5a24bc0..6109d04 100644 --- a/Assets/GameMain/DataTables/UIForm.txt +++ b/Assets/GameMain/DataTables/UIForm.txt @@ -5,9 +5,10 @@ 100 主菜单 MenuForm Default False True 101 设置 SettingForm Default False True 102 关于 AboutForm Default False True + 200 开始菜单 StartMenuForm Default False True 201 角色选择页 SelectRoleForm Default False True 202 游戏商店页 ShopForm Default False True 203 游戏HUD HudForm HUD False True 204 角色升级奖励页 LevelUpForm Default False True - 205 物品信息展示 DisplayItemInfoForm Default False False + 205 物品信息展示 ItemTooltipForm Default False False 206 虚拟摇杆 JoystickForm Default False False diff --git a/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs index d34617b..6ba525d 100644 --- a/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs +++ b/Assets/GameMain/Scripts/Base/Definition/Enum/UIFormType.cs @@ -57,7 +57,7 @@ namespace SepCore.Definition /// /// 物品信息展示页 /// - DisplayItemInfoForm = 205, + ItemTooltipForm = 205, /// /// 虚拟摇杆。 diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs deleted file mode 100644 index a65316f..0000000 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs +++ /dev/null @@ -1,27 +0,0 @@ -using GameFramework; -using GameFramework.Event; - -namespace SepCore.Event -{ - public class DisplayItemInfoLockEventArgs : GameEventArgs - { - public static readonly int EventId = typeof(DisplayItemInfoLockEventArgs).GetHashCode(); - - public override int Id => EventId; - - public DisplayItemInfoLockEventArgs() - { - } - - public static DisplayItemInfoLockEventArgs Create() - { - var args = ReferencePool.Acquire(); - - return args; - } - - public override void Clear() - { - } - } -} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm.meta b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm.meta rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm.meta diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipHideEventArgs.cs similarity index 51% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipHideEventArgs.cs index 4a590a8..497c89a 100644 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipHideEventArgs.cs @@ -3,22 +3,22 @@ using GameFramework.Event; namespace SepCore.Event { - public class DisplayItemInfoHideEventArgs : GameEventArgs + public class ItemTooltipHideEventArgs : GameEventArgs { - public static readonly int EventId = typeof(DisplayItemInfoHideEventArgs).GetHashCode(); + public static readonly int EventId = typeof(ItemTooltipHideEventArgs).GetHashCode(); public override int Id => EventId; public bool Force = false; - public DisplayItemInfoHideEventArgs() + public ItemTooltipHideEventArgs() { Force = false; } - public static DisplayItemInfoHideEventArgs Create(bool force = false) + public static ItemTooltipHideEventArgs Create(bool force = false) { - var args = ReferencePool.Acquire(); + var args = ReferencePool.Acquire(); args.Force = force; return args; diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipHideEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoHideEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipHideEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipLockEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipLockEventArgs.cs new file mode 100644 index 0000000..730a554 --- /dev/null +++ b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipLockEventArgs.cs @@ -0,0 +1,27 @@ +using GameFramework; +using GameFramework.Event; + +namespace SepCore.Event +{ + public class ItemTooltipLockEventArgs : GameEventArgs + { + public static readonly int EventId = typeof(ItemTooltipLockEventArgs).GetHashCode(); + + public override int Id => EventId; + + public ItemTooltipLockEventArgs() + { + } + + public static ItemTooltipLockEventArgs Create() + { + var args = ReferencePool.Acquire(); + + return args; + } + + public override void Clear() + { + } + } +} \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipLockEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoLockEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipLockEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipRecycleEventArgs.cs similarity index 55% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipRecycleEventArgs.cs index d56ab4b..0ab2480 100644 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipRecycleEventArgs.cs @@ -3,24 +3,24 @@ using GameFramework.Event; namespace SepCore.Event { - public class DisplayItemInfoRecycleEventArgs : GameEventArgs + public class ItemTooltipRecycleEventArgs : GameEventArgs { - public static readonly int EventId = typeof(DisplayItemInfoRecycleEventArgs).GetHashCode(); + public static readonly int EventId = typeof(ItemTooltipRecycleEventArgs).GetHashCode(); public override int Id => EventId; public int Index; public int Price; - public DisplayItemInfoRecycleEventArgs() + public ItemTooltipRecycleEventArgs() { Index = -1; Price = 0; } - public static DisplayItemInfoRecycleEventArgs Create(int index, int price) + public static ItemTooltipRecycleEventArgs Create(int index, int price) { - var args = ReferencePool.Acquire(); + var args = ReferencePool.Acquire(); args.Index = index; args.Price = price; diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipRecycleEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemInfoRecycleEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipRecycleEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemShowEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipShowEventArgs.cs similarity index 72% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemShowEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipShowEventArgs.cs index 1c56be6..8aa1786 100644 --- a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemShowEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipShowEventArgs.cs @@ -4,9 +4,9 @@ using UnityEngine; namespace SepCore.Event { - public class DisplayItemShowEventArgs : GameEventArgs + public class ItemTooltipShowEventArgs : GameEventArgs { - public static readonly int EventId = typeof(DisplayItemShowEventArgs).GetHashCode(); + public static readonly int EventId = typeof(ItemTooltipShowEventArgs).GetHashCode(); public override int Id => EventId; @@ -16,15 +16,15 @@ namespace SepCore.Event public Vector3 TargetPos { get; private set; } - public DisplayItemShowEventArgs() + public ItemTooltipShowEventArgs() { Index = -1; IsWeapon = false; } - public static DisplayItemShowEventArgs Create(int index, bool isWeapon, Vector3 targetPos) + public static ItemTooltipShowEventArgs Create(int index, bool isWeapon, Vector3 targetPos) { - var args = ReferencePool.Acquire(); + var args = ReferencePool.Acquire(); args.Index = index; args.IsWeapon = isWeapon; args.TargetPos = targetPos; @@ -38,4 +38,4 @@ namespace SepCore.Event TargetPos = Vector3.zero; } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemShowEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipShowEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Event/DisplayItemInfoForm/DisplayItemShowEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/ItemTooltipForm/ItemTooltipShowEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs similarity index 87% rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs index a7a6bc4..d704189 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs @@ -1,14 +1,10 @@ -using System; -using System.Drawing; using SepCore.CustomUtility; -using SepCore.Entity; -using SepCore.Entity.Weapon; using SepCore.Definition; using UnityEngine; namespace SepCore.UI { - public class DisplayItemInfoContext : UIContext + public class ItemTooltipContext : UIContext { public int Index; public string IconAssetName; @@ -20,7 +16,7 @@ namespace SepCore.UI public Vector3 TargetPos; public bool ShowRecycleButton; - public DisplayItemInfoContext() + public ItemTooltipContext() { Index = -1; IconAssetName = string.Empty; @@ -33,7 +29,7 @@ namespace SepCore.UI ShowRecycleButton = false; } - public DisplayItemInfoContext(DisplayItemInfoRawData rawData) + public ItemTooltipContext(ItemTooltipRawData rawData) { Index = rawData.Index; ItemType = rawData.ItemType; diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs similarity index 50% rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs index e2a4f4b..2ac4ec0 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs @@ -8,68 +8,68 @@ using UnityGameFramework.Runtime; namespace SepCore.UI { - public class DisplayItemInfoController : UIControllerBase + public class ItemTooltipController : UIControllerBase { - protected override UIFormType UIFormType => UIFormType.DisplayItemInfoForm; + protected override UIFormType UIFormType => UIFormType.ItemTooltipForm; private bool _locked = false; private Action _onRecycle; protected override void SubscribeCustomEvents() { - GameEntry.Event.Subscribe(DisplayItemInfoLockEventArgs.EventId, DisplayItemInfoLock); - GameEntry.Event.Subscribe(DisplayItemInfoHideEventArgs.EventId, DisplayItemInfoHide); - GameEntry.Event.Subscribe(DisplayItemInfoRecycleEventArgs.EventId, DisplayItemInfoRecycle); + GameEntry.Event.Subscribe(ItemTooltipLockEventArgs.EventId, ItemTooltipInfoLock); + GameEntry.Event.Subscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide); + GameEntry.Event.Subscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle); } protected override void UnsubscribeCustomEvents() { - GameEntry.Event.Unsubscribe(DisplayItemInfoLockEventArgs.EventId, DisplayItemInfoLock); - GameEntry.Event.Unsubscribe(DisplayItemInfoHideEventArgs.EventId, DisplayItemInfoHide); - GameEntry.Event.Unsubscribe(DisplayItemInfoRecycleEventArgs.EventId, DisplayItemInfoRecycle); + GameEntry.Event.Unsubscribe(ItemTooltipLockEventArgs.EventId, ItemTooltipInfoLock); + GameEntry.Event.Unsubscribe(ItemTooltipHideEventArgs.EventId, ItemTooltipHide); + GameEntry.Event.Unsubscribe(ItemTooltipRecycleEventArgs.EventId, ItemTooltipRecycle); } - protected override void RefreshUI(DisplayItemInfoForm form, DisplayItemInfoContext context) + protected override void RefreshUI(ItemTooltipForm form, ItemTooltipContext context) { form.RefreshUI(context).Forget(); } - protected override void CloseLoadedFormDirect(DisplayItemInfoForm form) + protected override void CloseLoadedFormDirect(ItemTooltipForm form) { GameEntry.UI.CloseUIForm(form); } - private static DisplayItemInfoContext BuildContext(DisplayItemInfoRawData rawData) + private static ItemTooltipContext BuildContext(ItemTooltipRawData rawData) { if (rawData == null) { - Log.Error("DisplayItemInfoFormController.BuildContext() rawData is null."); + Log.Error("ItemTooltipController.BuildContext() rawData is null."); return null; } - return new DisplayItemInfoContext(rawData); + return new ItemTooltipContext(rawData); } public override async UniTask OpenUIAsync(object userData = null, float timeout = 30f) { - if (userData is not DisplayItemInfoRawData rawData) + if (userData is not ItemTooltipRawData rawData) { if (userData != null) { - Log.Warning("DisplayItemInfoController.OpenUIAsync() userData type is invalid."); + Log.Warning("ItemTooltipController.OpenUIAsync() userData type is invalid."); } else { - Log.Warning("DisplayItemInfoController.OpenUIAsync() rawData is required."); + Log.Warning("ItemTooltipController.OpenUIAsync() rawData is required."); } return; } - DisplayItemInfoContext context = BuildContext(rawData); + ItemTooltipContext context = BuildContext(rawData); if (context == null) { - Log.Warning("DisplayItemInfoController.OpenUIAsync() rawData is invalid."); + Log.Warning("ItemTooltipController.OpenUIAsync() rawData is invalid."); return; } @@ -88,15 +88,15 @@ namespace SepCore.UI { if (useCase != null) { - Log.Warning("DisplayItemInfoController does not use a use case."); + Log.Warning("ItemTooltipController does not use a use case."); } } private bool IsCurrentFormSender(object sender) { - if (sender is DisplayItemInfoForm displayItemInfoForm) + if (sender is ItemTooltipForm ItemTooltipForm) { - return displayItemInfoForm == Form; + return ItemTooltipForm == Form; } if (sender is Component component && Form != null) @@ -109,9 +109,9 @@ namespace SepCore.UI #region Event Handlers - private void DisplayItemInfoLock(object sender, GameEventArgs e) + private void ItemTooltipInfoLock(object sender, GameEventArgs e) { - if (e is not DisplayItemInfoLockEventArgs) + if (e is not ItemTooltipLockEventArgs) { return; } @@ -119,21 +119,21 @@ namespace SepCore.UI _locked = true; } - private void DisplayItemInfoHide(object sender, GameEventArgs e) + private void ItemTooltipHide(object sender, GameEventArgs e) { - if (e is not DisplayItemInfoHideEventArgs args) + if (e is not ItemTooltipHideEventArgs args) { return; } if (_locked && !args.Force) return; - GameEntry.UIRouter.CloseUIAsync(UIFormType.DisplayItemInfoForm).Forget(); + GameEntry.UIRouter.CloseUIAsync(UIFormType.ItemTooltipForm).Forget(); } - private void DisplayItemInfoRecycle(object sender, GameEventArgs e) + private void ItemTooltipRecycle(object sender, GameEventArgs e) { - if (e is not DisplayItemInfoRecycleEventArgs args) + if (e is not ItemTooltipRecycleEventArgs args) { return; } diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoController.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipController.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs similarity index 91% rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs index 4897c21..b52d9e7 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs @@ -7,7 +7,7 @@ using UnityGameFramework.Runtime; namespace SepCore.UI { - public class DisplayItemInfoForm : UGuiForm + public class ItemTooltipForm : UGuiForm { [SerializeField] private RectTransform _content; @@ -33,15 +33,15 @@ namespace SepCore.UI [SerializeField] private float _screenEdgePadding = 0f; - private DisplayItemInfoContext _context; + private ItemTooltipContext _context; private Vector3 _targetPos; - public async UniTaskVoid RefreshUI(DisplayItemInfoContext context) + public async UniTaskVoid RefreshUI(ItemTooltipContext context) { if (context == null) { - Log.Warning("DisplayItemInfoForm context is invalid."); + Log.Warning("ItemTooltipForm context is invalid."); return; } @@ -85,9 +85,9 @@ namespace SepCore.UI { base.OnOpen(userData); - if (!(userData is DisplayItemInfoContext context)) + if (!(userData is ItemTooltipContext context)) { - Log.Error("DisplayItemInfoFormContext is invalid."); + Log.Error("ItemTooltipForm context is invalid."); return; } @@ -192,12 +192,12 @@ namespace SepCore.UI public void OnRecycleButtonClick() { if (_context == null) return; - GameEntry.Event.Fire(this, DisplayItemInfoRecycleEventArgs.Create(_context.Index, _context.Price)); + GameEntry.Event.Fire(this, ItemTooltipRecycleEventArgs.Create(_context.Index, _context.Price)); } public void OnCancelButtonClick() { - GameEntry.Event.Fire(this, DisplayItemInfoHideEventArgs.Create(true)); + GameEntry.Event.Fire(this, ItemTooltipHideEventArgs.Create(true)); } private string BuildTypeText(ItemType type) diff --git a/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/DisplayItemInfoForm.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/DisplayItemInfo/ItemTooltipForm.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs index 0464203..4eb050c 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopController.cs @@ -27,7 +27,7 @@ namespace SepCore.UI GameEntry.Event.Subscribe(RefreshEventArgs.EventId, Refresh); GameEntry.Event.Subscribe(ShopPurchaseEventArgs.EventId, ShopPurchase); GameEntry.Event.Subscribe(ShopContinueEventArgs.EventId, ShopContinue); - GameEntry.Event.Subscribe(DisplayItemShowEventArgs.EventId, DisplayItemShow); + GameEntry.Event.Subscribe(ItemTooltipShowEventArgs.EventId, DisplayItemShow); } protected override void UnsubscribeCustomEvents() @@ -35,7 +35,7 @@ namespace SepCore.UI GameEntry.Event.Unsubscribe(RefreshEventArgs.EventId, Refresh); GameEntry.Event.Unsubscribe(ShopPurchaseEventArgs.EventId, ShopPurchase); GameEntry.Event.Unsubscribe(ShopContinueEventArgs.EventId, ShopContinue); - GameEntry.Event.Unsubscribe(DisplayItemShowEventArgs.EventId, DisplayItemShow); + GameEntry.Event.Unsubscribe(ItemTooltipShowEventArgs.EventId, DisplayItemShow); } #region BuildContext @@ -205,7 +205,7 @@ namespace SepCore.UI public override async UniTask CloseUIAsync(object userData = null, float timeout = 30f) { - GameEntry.Event.Fire(this, DisplayItemInfoHideEventArgs.Create(true)); + GameEntry.Event.Fire(this, ItemTooltipHideEventArgs.Create(true)); _rawData = null; await base.CloseUIAsync(userData, timeout); } @@ -344,7 +344,7 @@ namespace SepCore.UI return false; } - private bool TryGetWeaponInfoRawData(int index, Vector3 targetPos, out DisplayItemInfoRawData rawData) + private bool TryGetWeaponInfoRawData(int index, Vector3 targetPos, out ItemTooltipRawData rawData) { rawData = null; @@ -373,7 +373,7 @@ namespace SepCore.UI return false; } - rawData = new DisplayItemInfoRawData + rawData = new ItemTooltipRawData { TargetPos = targetPos, Index = index, @@ -386,7 +386,7 @@ namespace SepCore.UI return true; } - private bool TryGetPropInfoRawData(int index, Vector3 targetPos, out DisplayItemInfoRawData rawData) + private bool TryGetPropInfoRawData(int index, Vector3 targetPos, out ItemTooltipRawData rawData) { rawData = null; @@ -409,7 +409,7 @@ namespace SepCore.UI return false; } - rawData = new DisplayItemInfoRawData + rawData = new ItemTooltipRawData { TargetPos = targetPos, Index = index, @@ -442,7 +442,7 @@ namespace SepCore.UI } Form?.RemoveWeaponDisplayItem(index); - GameEntry.Event.Fire(this, DisplayItemInfoHideEventArgs.Create(true)); + GameEntry.Event.Fire(this, ItemTooltipHideEventArgs.Create(true)); } #endregion @@ -513,7 +513,7 @@ namespace SepCore.UI private void DisplayItemShow(object sender, GameEventArgs e) { - if (e is not DisplayItemShowEventArgs args) + if (e is not ItemTooltipShowEventArgs args) { return; } @@ -529,7 +529,7 @@ namespace SepCore.UI return; } - DisplayItemInfoRawData rawData; + ItemTooltipRawData rawData; bool success = args.IsWeapon ? TryGetWeaponInfoRawData(args.Index, args.TargetPos, out rawData) : TryGetPropInfoRawData(args.Index, args.TargetPos, out rawData); @@ -539,7 +539,7 @@ namespace SepCore.UI return; } - GameEntry.UIRouter.OpenUIAsync(UIFormType.DisplayItemInfoForm, rawData).Forget(); + GameEntry.UIRouter.OpenUIAsync(UIFormType.ItemTooltipForm, rawData).Forget(); } #endregion diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs index 692358f..7970a52 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs @@ -56,17 +56,17 @@ namespace SepCore.UI rect.yMax, 0f) ); - GameEntry.Event.Fire(this, DisplayItemShowEventArgs.Create(_index, _context.IsWeapon, targetPos)); + GameEntry.Event.Fire(this, ItemTooltipShowEventArgs.Create(_index, _context.IsWeapon, targetPos)); } public void OnItemInfoLock() { - GameEntry.Event.Fire(this, DisplayItemInfoLockEventArgs.Create()); + GameEntry.Event.Fire(this, ItemTooltipLockEventArgs.Create()); } public void OnItemInfoHide() { - GameEntry.Event.Fire(this, DisplayItemInfoHideEventArgs.Create()); + GameEntry.Event.Fire(this, ItemTooltipHideEventArgs.Create()); } } } \ No newline at end of file diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/ItemTooltipRawData.cs similarity index 87% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/ItemTooltipRawData.cs index 1df731e..cee6fbf 100644 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs +++ b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/ItemTooltipRawData.cs @@ -1,7 +1,6 @@ using System; using SepCore.Definition; using SepCore.Entity; -using SepCore.Entity.Weapon; using UnityEngine; namespace SepCore.UI @@ -13,7 +12,7 @@ namespace SepCore.UI Prop } - public class DisplayItemInfoRawData + public class ItemTooltipRawData { public int Index; public WeaponData WeaponData; diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/ItemTooltipRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/DisplayItemInfoRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/DisplayItemInfo/ItemTooltipRawData.cs.meta diff --git a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab similarity index 99% rename from Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab rename to Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab index 203d231..1e825f8 100644 --- a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab +++ b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6368625289863409235} - component: {fileID: 4303509830935515119} m_Layer: 5 - m_Name: DisplayItemInfoForm + m_Name: ItemTooltipForm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -234,7 +234,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 4303509830935515119} - m_TargetAssemblyTypeName: SepCore.UI.DisplayItemInfoForm, SepCore.Presentation + m_TargetAssemblyTypeName: SepCore.UI.ItemTooltipForm, SepCore.Presentation m_MethodName: OnCancelButtonClick m_Mode: 1 m_Arguments: @@ -503,7 +503,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 4303509830935515119} - m_TargetAssemblyTypeName: SepCore.UI.DisplayItemInfoForm, SepCore.Presentation + m_TargetAssemblyTypeName: SepCore.UI.ItemTooltipForm, SepCore.Presentation m_MethodName: OnRecycleButtonClick m_Mode: 1 m_Arguments: diff --git a/Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab.meta b/Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab.meta similarity index 100% rename from Assets/GameMain/UI/UIForms/DisplayItemInfoForm.prefab.meta rename to Assets/GameMain/UI/UIForms/ItemTooltipForm.prefab.meta diff --git a/Assets/Launcher.unity b/Assets/Launcher.unity index 2407e20..1ffacdb 100644 --- a/Assets/Launcher.unity +++ b/Assets/Launcher.unity @@ -1583,7 +1583,7 @@ MonoBehaviour: _controllerTypeName: SepCore.UI.LevelUpController, SepCore.Presentation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - _uiFormType: 205 - _controllerTypeName: SepCore.UI.DisplayItemInfoController, SepCore.Presentation, + _controllerTypeName: SepCore.UI.ItemTooltipController, SepCore.Presentation, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - _uiFormType: 206 _controllerTypeName: SepCore.UI.JoystickController, SepCore.Presentation, Version=0.0.0.0, diff --git a/数据表/UIForm.xlsx b/数据表/UIForm.xlsx index fe66eaecdcc452de9c557f4423e1d04d0c38eda8..cf07e6f6f567fc8d26007888f670d6a8c0b52774 100644 GIT binary patch delta 6733 zcmY*eWmuG3xSgT9d+289aA>I^q(Qnvkq+q`x{(-CLQ0yUQ$mrJ?gmK-=@6;wIp?1H z-1GfdKlWOC?f2Q=pS|9<*!0e%77oPR`>2{M1q1-B;W{K9Y!a)F-(i|7@YJ z0R2JEg+a$4)zOhu5KrZF}3_L^HN4i|h+EY7x$!AyeV`7>%~C zt8Y;KD(23J@NnV($|S%-IAyF9h8D^jB$D4hoU2z$}x_sl*P@9WvZQ;Me<9=!z*Iy%5z zxnD&C0`^j>%p%uBT|bI*Xm9vqh?wv#dRS$I4veOOfQs2hLY};+8eftfYKM7vQ^Z*m z5vl`C)`YU97A_;L;hGJSboM_N>ub~WDhePFU2*nhShICUsv}h^9|04IG{lYx-TS^b zB&$UtbDa@1r0(VSN%Wnbu*&ld#Zns8`QnYHVtGStsHsU`#37TE_m(_$JG(5#UTbUY z{4B_||D_<>yE1g~-=1|%RbhtLTMZB}(=1~Rd%U|?PUz+1XQ ziuOE*eP|y~$xoZJdTH(I8IVl|J2SN5DCq7TKbp0;od|~!(fx(b?)XU6+4Y5gI+aUV z6;aNK>ik<(9y@cVkf?x(jG64klfC`r*+)vUB@4 zW|$n1W>b0n)QB`#1a|7zLCOq6rHwbfb(Mus%N5mOZU0RXY;kP($}2L+jv(apHU~O5 zFv%?^YN?={8i{gWgLt9k=5TWM@_JLCib3x|~;hCJWE5LG)fxz+87L&;KZ4e`HXZN+g;1*Z;07`LR;q?3lEJNZawx-@vC#Z3JIU#=i^%1+AdLr zataHztju=Yea6zD3{A?`+*qP|uL>J3@^!#KtQ0lDo_*kEJ-kLnJl~lte1@WbOek_Q zGxJ)U6cKQ+S*jC))=ztC)qaqs)lhb2Kef%OlENxyH+j^;g21(9PvX`kobuXpPEYzt z*m)bV=G0Gr1#Z1-_HMog6?@JQnd|n@5alVWMuyiAO*0Ud^*Sn1>sUQ!eh04mfdSI_ zQJilGD_52|d7duIlD>+Rkkh4H6$w4Ml?Ma*JnWon^ z`$Yv+j+YKo%5s~a*S4pArt|@XER!Gmo)tT-Z^>xh%TqbG300tA3Zwgf_es|;Ys zGcgehNon@bfuP(E`Co~fBB1P^A8EoHV-0ArEalisOGk?G1B8DFq=Lfii9=%9k)or` z0BNmEfFqj$3~Ax+PC%!c9#Vh~f%JiE7g{owgeIXpfN&B!pQy7TjL7x7yjwg{Dmimf zTt0|QDCsUgGE2FQ#Fj!n0$7wG6Sgu9yjCgl*tp~Tz3#fHly=+}&^m9qR5KDQGoa*$ zCZ=F?$Y*iu7Pm&q<*kVe#ORRwb{h6n9uJK>`@kZ5tVJZr8_+hGOQxbOVT;ia3wXK>K ztuUXBadr2NE{3h*e%6X!rP=xUgq%d%K!PKUhPjDA*XTk50EpnGM0_xmEJC^Pz~CZr z18aX_e|-{jeq@{+3|WXrC|anh5MFY=`~BIsqos51j_O(wJ;szOm-j2~-hp}kd7svE zS8it}BKU2IaEqcToUvn&px}27wnB{kk$yGnWT>*hSY#R|3c>*fLh-ap{a3POpZ6Gv z2#Hf!Pn3wXh$jHWxNI7=60+vPc`PMO9=RQxj5Yud%~%h1>imnU%1`lYT87= zEMH2kjN0v)jtyz}#Ujo0;04urEShCI?-na3_E(;jt)Kl2VG1S(xJ=m%IWA(Br(Un# zl0q`Bh!^pbXSwQL8?9_6yBk~*3t({UpmIrbJKDEs2f=nqKRQqt3n{Un6IUgPN)^js zsZx1pN633$-<|bVydJ4C8V0 z;`xoXA9polcOcBE`@72L;;m?aSo;oXfA!Bl6?hG!Uh@x_9p%7B0!7fS43fT!G#EQ_ z=-zhPlu9=*s?RO5--%LuoS@j$V5vYY9}UcI5u`hsxAUL9L28Q{z?_{?O!%&RuU2yp z{O@B3cz(kR*CM5ZW%CgPeQ12LxRs<(`jNt3jKyM`_P#>7!NdPOwMeLLZSv1})#=AO zM~wXvHDZl{z{lf;lTX%e{s`qu++wTHs0DYE_~24T>-#??e0n9+r(`!QXoQ8w@Q8=C z&a>WaEF{}S8}1{o5L`(>ZZz*Mt79ZBpT=arvCB+eU$|5ZJ6F=-4zZ~KOz6G{nD1mD zeNF9+q>8wN&zcy4rihI@gek$!ar11f3T@WoL8){`>2xl&QS4Z~%a}RsaAl?9cPq$C20F z!`Jb(JCBc(<4@Do#AO3gnBpd^R{IMwV?y`&_r;;qtPumFa#_-s1Vs76FLEfc*~XUC zy=^9yBb+G>beMJWYmH)F>wlD(0Fw3UeQUlO7up{oenQ$?bGTc}HWAO;XFjWH4x|`p z+uO>!__VijQe`gwh^-jBV5DN!Jwaon6&X83u znkAY2rGEYHdfMa?tZ-=5BF4UT;t3P{DA20VM@Mqri9SKp{!8*tYgR%M+EnL{t?TEs^#-%3EU zY$#@{VLl%{H1#P@W!BzLpGSS>{9-)`5pXd~dYgVp<@acr^>BG5tYG%bDC_Kljodd_l2+O3Yt;B$&W6>vuuZ zTW4kIAL#ZwI|A}Fx!eMUh-Az5f6zEHY7KQE2g~zvLi-I_nmS-I8*O??tZ~-jvOTD2 zr#DNZDR#rB<3fa`ZO@V~X06|SM#FHl&?9HzEAlE1A~*a5aTr6}9I=%B#-cJ5hZ&XD zPtW((Y!&+C9y78pf$*D^*H45;sivmiiZ>pTZ**}-<&cDJ|Pgpu1#;XHBIc)b}G63zBe=*#ymF{xS>2&d#8L?K_o z5{Q_sh^sN&Mqs0Mm1%zq?aSJRzTiFx*pLEV7E;fviH*OH{H=RxV@)G=UhorN^%uST zxG;XyL?zYdOys65EDqt)%RCnvFj!sZ79)Ra+asCGpL+$C5r<6Ho2Z99Dqj z9O4gAdn5^&BJilhzUd!ES_-8a6;1Mas2O(Mg9n8hBeh=2;QCH#=2my3Z640r7gbPH zAh^U(pywGdol$$cCTE-Nn%>d)`?OZdn_{x{_YRz1f=n=$f0nOM_d3{ZXY`M36dsjV zMh4Aevd>1QHjM>GE^CB@1<&<2|0X($c>r9oRWpCvWFcI9R7`Q~8s=R3&#z6)=5_(p#zjzD7(}WFPIi&Xl z8ZgJPWfaLAq{luMp=ip;Gf|3i)IK-J%|Xfcsq$9G(jL0?49AMDB39X7HhnXr0si1o z6f=}WL(a-*$0|lu{=?H0aj4s*;F#Cq=Ozi|DHgo;H67I4c4v@FnvTHflZVYDk3sgT zndFjd-r>lMi3yOrskWX6ec5~)I*=vmsl~lFH8SVU6O&)!Zg)QCsSYRk#;;~D@)iC> zFg!NR6TuzfaB^`tLOQO^gw;aOA>Mp=T*!C#U`F)ClcWdVZ)8*4F-{u0!8VXivIqM5 zQmNj}x{B)9)vje@8qgl*M{lkEMeWcvY1j?;}*ewcp zLc>@Dd2&3vj`ngEcOCnudUT8Lpk}9FWvu=#Z$w4X_dW4S3WYv@d7cO@&yI&}?XqDZ zz2e5!I-)0-|BTCWSIiCjWV02|CpUhoqG;DPAsZyd%xpC1X9%7y2L!g;vxtO5X8n?+ zohL)h66q|(4#(XxL)AKSj?f;5eyoR^97GmpoSDqt8p%EzYeWXE3tiw-lf%GoduAeg z6C0z4MXdSdolw3k#WzjgI?ZtI#F$bU{0b6i#Vki(vA248no;b~h6S}fM|4tU1Bn52 zL6ZT)hW#}U{{n}dC_b#vLQCgW3blmxybU_Mx-W5T;q=S)Gas(96jl4Mfl%DsPL4MP;EruaKmGYG(BL};ZC8Ij7m?i4lCMzvj zM#QKDH4k>Sp9nX0w!eW1V?rF=>}=02?cA2@c2$1!b|aVL@pqW3;lj#SyT8D58ho=Qh3on~6lx|5zx0G<$ zST#gtt5idSwi}t82O62a#553*5ZQZF`|(xe#^Wma_;Dia>|**R2m~)6lN}ml*zkcV zFz;=zCk|-9sEFxnwUGj%Um1;klX{NM0Pkj#)oh8F+8`#J7P3}op&OKn{aAoN`PiF% zRLT+Khl8tpl!|t;kXLX!-Z_mv&ejbJBKam`mp+vgw)4`40(O2jbhcNDpJ?87Gd3h7 zsT`b2d%~HUE_yp}u93KwfLdq*#k8P$u~7qOgHb;1t`40fvYtF~m&h%K6fnJkl?vqs zxO)8lPG^NBA>WsTF$z2X#iZ%{c8{MIw_1j8vqCn2z>SE6MXC2fBwo5;o{%$Li02aTV;i6=2cG(@V+439xRx(p@NFdy;s+ za_ho{hksBOH-tH1_c@VHQf2r8rX@!zYjr>5rk$r428Mp!&;8Kp^P8FBdtE+O9pB^8 zG#s{q8lU(Z+u~-NuMtav)gbi!h*>M_O`$V8DN5q1TnUvhrasvKnHOnSD75h=^j$ zD6AVtH6wC|ev$HC8rn|5oaK!zxM*CyFu-i0q9}^|A>a}qEo=x2ZHq#zHYhmz2;SBk z7LE%CfSgU{oSnQT7GcJjr_svmuFn1pHnUulZ?uinlp7d}o|WRv$@LO{ppJKj1=oqM zK)N7rH_A>mD*CVWstcNjbyp|8{T{nk_ibPm9)87xvv9tm zMaScmNZJ#)AcRG+tWLZ!l-77|fW+Pi`aL$G9=<`Dt4dWkOG25aQK2a|Hi(&!rP0W@VOD#%f2_pHnKMD5sVQq`#n3!Cf~bNAKa$cs z`B_%uCPzB6gA^Gs+PZkVtsy^0@(tM%LM7v=#7Z%P+3A1hLm0seMHsl zYi!kmUU;Tms+_|(gl74tS<6y0NYmE`&68*LhRYj8DmO`pO2X|M1N;_XIsP1@2A!`G z4fZklM4D@Hu>!O#USi}tXq-@wSe&ibT3w2qm|9v|gUI3WFf%*6O8~s0R11dgx7L%gZ{7k^Cvw0HCFiR`-f+T|Kel= z{U=!cL;o)ihKq5D0i)oaT*AN_cr}*{Z~=b81wnekhO=?Ap!^-iHMz-v6!16P62KyO vF}FA{0=~g518n(&==Xz&L#D)>7d0yHg-znK34H6C-X delta 6784 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 Aa{vGU diff --git a/数据表/convert.py b/数据表/convert.py index abd7f69..b72ac7b 100644 --- a/数据表/convert.py +++ b/数据表/convert.py @@ -1,7 +1,9 @@ import pandas as pd import os -def convert_excel_to_txt(folder_path='.'): +def convert_excel_to_txt(folder_path=None): + if folder_path is None: + folder_path = os.path.dirname(os.path.abspath(__file__)) # 计数器，用于最后汇总 count = 0 target_dir = os.path.join(os.path.dirname(__file__), '../Assets/GameMain/DataTables') @@ -37,7 +39,7 @@ def convert_excel_to_txt(folder_path='.'): print(f"\n任务完成！共转换了 {count} 个文件。") if __name__ == "__main__": - convert_excel_to_txt('.') + convert_excel_to_txt() # --- 关键修改：在这里添加暂停 --- print("\n" + "="*30)