diff --git a/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpRefreshEventArgs.cs similarity index 57% rename from Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs rename to Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpRefreshEventArgs.cs index 0c15c1d..dd94a16 100644 --- a/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs +++ b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpRefreshEventArgs.cs @@ -3,22 +3,22 @@ using GameFramework.Event; namespace SepCore.Event { - public class RefreshEventArgs : GameEventArgs + public class LevelUpRefreshEventArgs : GameEventArgs { - public static readonly int EventId = typeof(RefreshEventArgs).GetHashCode(); + public static readonly int EventId = typeof(LevelUpRefreshEventArgs).GetHashCode(); public override int Id => EventId; public int Cost { get; private set; } - public RefreshEventArgs() + public LevelUpRefreshEventArgs() { Cost = 0; } - public static RefreshEventArgs Create(int cost) + public static LevelUpRefreshEventArgs Create(int cost) { - var args = ReferencePool.Acquire(); + var args = ReferencePool.Acquire(); args.Cost = cost; @@ -31,4 +31,4 @@ namespace SepCore.Event } } -} \ No newline at end of file +} diff --git a/Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs.meta b/Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpRefreshEventArgs.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Base/Event/RefreshEventArgs.cs.meta rename to Assets/GameMain/Scripts/Base/Event/LevelUp/LevelUpRefreshEventArgs.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs index 4c10af5..7b1f57d 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpController.cs @@ -21,14 +21,14 @@ namespace SepCore.UI protected override void SubscribeCustomEvents() { - GameEntry.Event.Subscribe(RefreshEventArgs.EventId, OnRefresh); - GameEntry.Event.Subscribe(LevelUpPropSelectedEventArgs.EventId, OnLevelUpPropSelected); + GameEntry.Event.Subscribe(LevelUpRefreshEventArgs.EventId, LevelUpRefresh); + GameEntry.Event.Subscribe(LevelUpPropSelectedEventArgs.EventId, LevelUpPropSelected); } protected override void UnsubscribeCustomEvents() { - GameEntry.Event.Unsubscribe(RefreshEventArgs.EventId, OnRefresh); - GameEntry.Event.Unsubscribe(LevelUpPropSelectedEventArgs.EventId, OnLevelUpPropSelected); + GameEntry.Event.Unsubscribe(LevelUpRefreshEventArgs.EventId, LevelUpRefresh); + GameEntry.Event.Unsubscribe(LevelUpPropSelectedEventArgs.EventId, LevelUpPropSelected); } private static LevelUpContext BuildContext(LevelUpRawData rawData) @@ -144,14 +144,14 @@ namespace SepCore.UI await OpenUIAsync(rawData); } - private void OnRefresh(object sender, GameEventArgs e) + private void LevelUpRefresh(object sender, GameEventArgs e) { if (sender is not LevelUpForm levelUpForm || levelUpForm != Form) { return; } - if (e is not RefreshEventArgs args) + if (e is not LevelUpRefreshEventArgs args) { return; } @@ -159,7 +159,7 @@ namespace SepCore.UI RefreshRewardListAsync(args.Cost).Forget(); } - private void OnLevelUpPropSelected(object sender, GameEventArgs e) + private void LevelUpPropSelected(object sender, GameEventArgs e) { if (sender is not LevelUpForm levelUpForm || levelUpForm != Form) { diff --git a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpForm.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpForm.cs index 3550970..7148384 100644 --- a/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpForm.cs +++ b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpForm.cs @@ -64,7 +64,7 @@ namespace SepCore.UI public void OnRefreshButtonClick() { - GameEntry.Event.Fire(this, RefreshEventArgs.Create(_context.RefreshPrice)); + GameEntry.Event.Fire(this, LevelUpRefreshEventArgs.Create(_context.RefreshPrice)); } } } diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItem.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs rename to Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItem.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/LevelUpRewardItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItem.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItemContext.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItemContext.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/LevelUpRewardItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/LevelUp/LevelUpRewardItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItem.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItem.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/DisplayItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItem.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItemContext.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItemContext.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/DisplayItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListArea.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListArea.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListArea.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/DisplayListArea.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListArea.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListAreaContext.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListAreaContext.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListAreaContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/DisplayListAreaContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Shop/DisplayListAreaContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/GoodsItemContext.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs rename to Assets/GameMain/Scripts/Presentation/Main/Shop/GoodsItemContext.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Shop/GoodsItemContext.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/Context/GoodsItemContext.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Shop/GoodsItemContext.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopGoodsItem.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs rename to Assets/GameMain/Scripts/Presentation/Main/Shop/ShopGoodsItem.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs.meta b/Assets/GameMain/Scripts/Presentation/Main/Shop/ShopGoodsItem.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/ShopGoodsItem.cs.meta rename to Assets/GameMain/Scripts/Presentation/Main/Shop/ShopGoodsItem.cs.meta diff --git a/Assets/GameMain/Scripts/Presentation/ObjectPool.meta b/Assets/GameMain/Scripts/Presentation/ObjectPool.meta new file mode 100644 index 0000000..580a2df --- /dev/null +++ b/Assets/GameMain/Scripts/Presentation/ObjectPool.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 166c0ae58c1d0b34ababe6d3a3791efa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs b/Assets/GameMain/Scripts/Presentation/ObjectPool/DisplayItemObject.cs similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs rename to Assets/GameMain/Scripts/Presentation/ObjectPool/DisplayItemObject.cs diff --git a/Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs.meta b/Assets/GameMain/Scripts/Presentation/ObjectPool/DisplayItemObject.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Presentation/Main/View/DisplayItemObject.cs.meta rename to Assets/GameMain/Scripts/Presentation/ObjectPool/DisplayItemObject.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs deleted file mode 100644 index ae1ce98..0000000 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs +++ /dev/null @@ -1,14 +0,0 @@ -using SepCore.Definition; -using UnityEngine; - -namespace SepCore.UI -{ - public class LevelUpRewardItemRawData - { - public string Title; - public Sprite Icon; - public ItemRarity ItemRarity; - public string Description; - public string IconAssetName; - } -} diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs.meta deleted file mode 100644 index e10bec5..0000000 --- a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/LevelUpRewardItemRawData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 56a75fb39cca45c4ea220af2c850e677 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayItemRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayItemRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayItemRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayItemRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayItemRawData.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayListAreaRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayListAreaRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayListAreaRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/DisplayListAreaRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/DisplayListAreaRawData.cs.meta diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs diff --git a/Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs.meta b/Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs.meta similarity index 100% rename from Assets/GameMain/Scripts/Runtime/UIBase/Main/RawData/GoodsItemRawData.cs.meta rename to Assets/GameMain/Scripts/Runtime/UIBase/Main/Shop/GoodsItemRawData.cs.meta