diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index e7800b7d..743ec211 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -770,6 +770,7 @@ MonoBehaviour: fieldButton: {fileID: 3310671341662576995} stockButton: {fileID: 3310671341034218318} saleButton: {fileID: 3310671341763054133} + productManagementButton: {fileID: 3908473096140235644} --- !u!1 &3310671341662576997 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 2eb6a5e7..b7f2132d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -2210,6 +2210,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 497615752} m_CullTransparentMesh: 0 +--- !u!1 &500927380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 500927383} + - component: {fileID: 500927382} + - component: {fileID: 500927381} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &500927381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500927380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &500927382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500927380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &500927383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500927380} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &533409545 PrefabInstance: m_ObjectHideFlags: 0 @@ -2364,6 +2430,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 541190664} m_CullTransparentMesh: 0 +--- !u!1 &586451194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 586451195} + - component: {fileID: 586451196} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &586451195 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586451194} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 918.96783, y: 1697.08, z: -85.76374} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &586451196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586451194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a62cbd02371f4283b67c8730d020b558, type: 3} + m_Name: + m_EditorClassIdentifier: + prevButton: {fileID: 119168414} --- !u!1 &613202084 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs new file mode 100644 index 00000000..9c60742b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -0,0 +1,24 @@ +using System; +using UniRx; +using UnityEngine; +using UnityEngine.UI; + +public class ProductManagement : MonoBehaviour +{ + public static readonly string PrevSceneNameTag = "ProductManagementPrevSceneName"; + + [SerializeField] private Button prevButton; + + private void Start() + { + var prevGameScene = GameScenes.Main; + if (LocalCacheManager.Exists(PrevSceneNameTag)) + { + prevGameScene = LocalCacheManager.Load(PrevSceneNameTag); + } + prevButton.OnClickAsObservable().Subscribe(_ => + { + TransitionManager.Instance.LoadScene(prevGameScene); + }).AddTo(this); + } +} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs.meta b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs.meta new file mode 100644 index 00000000..e8dadbbd --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a62cbd02371f4283b67c8730d020b558 +timeCreated: 1631245810 \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 79c5da46..4a98e135 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -9,6 +9,7 @@ public class FooterManager : MonoBehaviour [SerializeField] private Button fieldButton; [SerializeField] private Button stockButton; [SerializeField] private Button saleButton; + [SerializeField] private Button productManagementButton; private BoolReactiveProperty shareGate = new BoolReactiveProperty(true); private void Start() @@ -33,5 +34,11 @@ public class FooterManager : MonoBehaviour TransitionManager.Instance.LoadScene(GameScenes.marketing); return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); }).AddTo(this); + productManagementButton.BindToOnClick(shareGate, _ => + { + LocalCacheManager.Save(ProductManagement.PrevSceneNameTag, Enum.Parse(typeof(GameScenes), gameObject.scene.name)); + TransitionManager.Instance.LoadScene(GameScenes.ProductManagement); + return Observable.Timer(TimeSpan.FromSeconds(.5f)).AsUnitObservable(); + }).AddTo(this); } } \ No newline at end of file