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 fe66eae..cf07e6f 100644
Binary files a/数据表/UIForm.xlsx and b/数据表/UIForm.xlsx differ
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)