From d622536f1e445047878f4429cf15f4d784b7d773 Mon Sep 17 00:00:00 2001 From: kabix09 Date: Sat, 24 Dec 2022 15:14:41 +0100 Subject: [PATCH] Add Account Balance module --- Assets/NewGame.cs | 2 + .../Resources/UiPanels/InventoryPanel.prefab | 404 +++++++++++++++++- Assets/Scenes/CaveEntrance.unity | 75 +++- Assets/Scenes/Cementary.unity | 87 +++- Assets/Scenes/FirstVillage.unity | 75 +++- Assets/Scenes/InnVillage.unity | 75 +++- Assets/Scenes/OutsideWizardsHouse.unity | 75 +++- Assets/Scenes/SampleScene.unity | 63 ++- Assets/Scenes/WizardHouse.unity | 79 +++- .../Application/AccountBalance.meta | 8 + .../AccountBalance/AccountBalanceManager.cs | 78 ++++ .../AccountBalanceManager.cs.meta | 11 + .../AccountBalance/PanelCashController.cs | 46 ++ .../PanelCashController.cs.meta | 11 + .../Application/Shop/ShopItemCardKeeper.cs | 45 +- .../UI/Inventory/InventoryUIManager.cs | 2 +- Assets/Scripts/SaveController.cs | 6 + 17 files changed, 1090 insertions(+), 52 deletions(-) create mode 100644 Assets/Scripts/REFACTORING/Application/AccountBalance.meta create mode 100644 Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs create mode 100644 Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs.meta create mode 100644 Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs create mode 100644 Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs.meta diff --git a/Assets/NewGame.cs b/Assets/NewGame.cs index 637f9fef..558937e8 100644 --- a/Assets/NewGame.cs +++ b/Assets/NewGame.cs @@ -23,6 +23,8 @@ public class NewGame : MonoBehaviour PlayerPrefs.SetInt("lvl", 1); PlayerPrefs.SetFloat("maxExp", 10); + PlayerPrefs.SetInt(AccountBalanceManager.PLAYER_ACCOUNT_VALUE, 0); + string name = "none"; PlayerPrefs.SetString("name", name); diff --git a/Assets/Resources/UiPanels/InventoryPanel.prefab b/Assets/Resources/UiPanels/InventoryPanel.prefab index 690a3219..bdf18e19 100644 --- a/Assets/Resources/UiPanels/InventoryPanel.prefab +++ b/Assets/Resources/UiPanels/InventoryPanel.prefab @@ -1,5 +1,386 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1844643680802943149 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4160897812758261683} + - component: {fileID: 4504096425441227888} + - component: {fileID: 1920757209049782289} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4160897812758261683 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844643680802943149} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.6344782} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: [] + m_Father: {fileID: 2181280109304687902} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -20, y: -12.46} + m_SizeDelta: {x: 92, y: 30.081} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4504096425441227888 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844643680802943149} + m_CullTransparentMesh: 1 +--- !u!114 &1920757209049782289 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1844643680802943149} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Gold:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2} + m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4280896883 + m_fontColor: {r: 0.4528302, g: 0.30150148, b: 0.16019936, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0.08430481, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6358129284676741273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2181280109304687902} + - component: {fileID: 5072486462454209631} + - component: {fileID: 5749580855174929001} + m_Layer: 0 + m_Name: Layer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2181280109304687902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6358129284676741273} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.6344782} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_Children: + - {fileID: 3709863386082553142} + - {fileID: 4160897812758261683} + m_Father: {fileID: 6528725967738540667} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 125, y: 7} + m_SizeDelta: {x: 100, y: 25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5072486462454209631 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6358129284676741273} + m_CullTransparentMesh: 1 +--- !u!114 &5749580855174929001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6358129284676741273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 99ef742ea21894b4d995d1bc6209bd91, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7510958097152264394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6528725967738540667} + m_Layer: 5 + m_Name: CashSection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6528725967738540667 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7510958097152264394} + 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: + - {fileID: 2181280109304687902} + m_Father: {fileID: 9124304227729624650} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 550, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8755320427742132926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3709863386082553142} + - component: {fileID: 8966794799687036646} + - component: {fileID: 7650903343690722400} + m_Layer: 5 + m_Name: Value + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3709863386082553142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8755320427742132926} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.6344782} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: [] + m_Father: {fileID: 2181280109304687902} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 20, y: -12.5} + m_SizeDelta: {x: 106.8214, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8966794799687036646 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8755320427742132926} + m_CullTransparentMesh: 1 +--- !u!114 &7650903343690722400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8755320427742132926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 5000 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2} + m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: -0.110473625, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &9124304227092242852 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +409,6 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9124304228607424520} m_RootOrder: 0 @@ -164,7 +544,6 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 9124304227903849263} m_Father: {fileID: 9124304227744546881} @@ -238,6 +617,7 @@ GameObject: - component: {fileID: 9124304227729624652} - component: {fileID: 9124304227729624653} - component: {fileID: 7107743575243314760} + - component: {fileID: 3357633937721738046} m_Layer: 5 m_Name: InventoryPanel m_TagString: Untagged @@ -255,10 +635,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.4, y: 0.4, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9124304228607424520} - {fileID: 9124304227744546881} + - {fileID: 6528725967738540667} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -320,6 +700,21 @@ MonoBehaviour: _panelContent: {fileID: 9124304227903849260} ChildBoxTemplate: {fileID: 4202482119828722599, guid: 843626bb28e804c4384ea070e0fead67, type: 3} ChildBoxList: [] + AllowToUseItemInPanel: 1 +--- !u!114 &3357633937721738046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9124304227729624651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6fb47b0e304a4644db8ee53654039f3c, type: 3} + m_Name: + m_EditorClassIdentifier: + AccountBalanceValue: 0 + displayedValue: {fileID: 7650903343690722400} --- !u!1 &9124304227744546894 GameObject: m_ObjectHideFlags: 0 @@ -349,7 +744,6 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 9124304227602340160} m_Father: {fileID: 9124304227729624650} @@ -456,7 +850,6 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9124304227602340160} m_RootOrder: 0 @@ -532,7 +925,6 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 9124304227092242855} m_Father: {fileID: 9124304227729624650} diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index 723cefb0..47370931 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -839,7 +839,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 277471083} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &67120570 MonoBehaviour: @@ -23633,6 +23633,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 105457317} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &105457320 MonoBehaviour: m_ObjectHideFlags: 0 @@ -50449,7 +50461,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 277471083} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &239749518 MonoBehaviour: @@ -50815,6 +50827,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2021546877} - {fileID: 1133845001} - {fileID: 67120569} - {fileID: 239749517} @@ -114629,6 +114642,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 933251618} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &933251620 MonoBehaviour: m_ObjectHideFlags: 0 @@ -121591,7 +121616,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 277471083} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1133845002 MonoBehaviour: @@ -253752,6 +253777,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020243788} m_CullTransparentMesh: 1 +--- !u!1 &2021546876 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021546877} + - component: {fileID: 2021546878} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2021546877 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021546876} + 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: 277471083} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2021546878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021546876} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &2027990421 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Cementary.unity b/Assets/Scenes/Cementary.unity index 8f4228d5..9947fbbc 100644 --- a/Assets/Scenes/Cementary.unity +++ b/Assets/Scenes/Cementary.unity @@ -74102,6 +74102,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 449315221} - {fileID: 1206337686} - {fileID: 1022973875} - {fileID: 764402918} @@ -75611,6 +75612,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 435019654} m_CullTransparentMesh: 1 +--- !u!1 &449315220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 449315221} + - component: {fileID: 449315222} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &449315221 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449315220} + 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: 41994467} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &449315222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449315220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &533363156 GameObject: m_ObjectHideFlags: 0 @@ -77101,7 +77146,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 41994467} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &764402919 MonoBehaviour: @@ -112968,7 +113013,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 41994467} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1022973876 MonoBehaviour: @@ -113614,7 +113659,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1133906874} m_TargetAssemblyTypeName: SaveController, Assembly-CSharp - m_MethodName: SaveItems + m_MethodName: SavePlayerEquipmentItems m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -113626,7 +113671,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1133906874} m_TargetAssemblyTypeName: SaveController, Assembly-CSharp - m_MethodName: SaveQuests + m_MethodName: SavePlayerQuests m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -113638,7 +113683,19 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1133906874} m_TargetAssemblyTypeName: SaveController, Assembly-CSharp - m_MethodName: SaveInventory + m_MethodName: SavePlayerInventory + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1133906874} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -113814,7 +113871,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 41994467} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1206337687 MonoBehaviour: @@ -119945,7 +120002,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1657062785} m_TargetAssemblyTypeName: SaveController, Assembly-CSharp - m_MethodName: SaveItems + m_MethodName: SavePlayerEquipmentItems m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -119957,7 +120014,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1657062785} m_TargetAssemblyTypeName: SaveController, Assembly-CSharp - m_MethodName: SaveQuests + m_MethodName: SavePlayerQuests m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -119969,7 +120026,19 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1657062785} m_TargetAssemblyTypeName: SaveController, Assembly-CSharp - m_MethodName: SaveInventory + m_MethodName: SavePlayerInventory + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1657062785} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scenes/FirstVillage.unity b/Assets/Scenes/FirstVillage.unity index c627e673..6211eaa0 100644 --- a/Assets/Scenes/FirstVillage.unity +++ b/Assets/Scenes/FirstVillage.unity @@ -17708,6 +17708,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 123635617} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &123635619 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21686,7 +21698,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1864162581} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &166764750 MonoBehaviour: @@ -23825,7 +23837,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1864162581} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &184342404 MonoBehaviour: @@ -44965,6 +44977,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 401367761} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &401367764 MonoBehaviour: m_ObjectHideFlags: 0 @@ -263649,6 +263673,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &777896379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 777896380} + - component: {fileID: 777896381} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &777896380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777896379} + 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: 1864162581} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &777896381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777896379} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &778770044 GameObject: m_ObjectHideFlags: 0 @@ -502682,7 +502750,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1864162581} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1743473113 MonoBehaviour: @@ -514314,6 +514382,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 777896380} - {fileID: 166764749} - {fileID: 1743473112} - {fileID: 184342403} diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index 79d0e05a..1b5011bc 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -5255,6 +5255,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 539229158} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &539229160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19723,7 +19735,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2056121819} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &787186379 MonoBehaviour: @@ -20337,6 +20349,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 847960748} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &847960751 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21163,6 +21187,50 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &996480419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 996480420} + - component: {fileID: 996480421} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &996480420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996480419} + 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: 2056121819} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &996480421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 996480419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &1021636886 GameObject: m_ObjectHideFlags: 0 @@ -23315,7 +23383,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2056121819} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1234651975 MonoBehaviour: @@ -23583,7 +23651,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2056121819} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1301442103 MonoBehaviour: @@ -28695,6 +28763,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 996480420} - {fileID: 787186378} - {fileID: 1301442102} - {fileID: 1234651974} diff --git a/Assets/Scenes/OutsideWizardsHouse.unity b/Assets/Scenes/OutsideWizardsHouse.unity index 900e7e9d..87247c00 100644 --- a/Assets/Scenes/OutsideWizardsHouse.unity +++ b/Assets/Scenes/OutsideWizardsHouse.unity @@ -5396,7 +5396,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1777083284} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &32218799 MonoBehaviour: @@ -123803,6 +123803,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 150991652} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &150991654 MonoBehaviour: m_ObjectHideFlags: 0 @@ -161368,7 +161380,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1777083284} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &501671383 MonoBehaviour: @@ -211845,7 +211857,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1777083284} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &920737005 MonoBehaviour: @@ -764626,6 +764638,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1872828445} - {fileID: 501671382} - {fileID: 920737004} - {fileID: 32218798} @@ -775431,6 +775444,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1872828444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1872828445} + - component: {fileID: 1872828446} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1872828445 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872828444} + 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: 1777083284} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1872828446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872828444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &1874668237 GameObject: m_ObjectHideFlags: 0 @@ -777507,6 +777564,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1893347151} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1893347154 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 6bcaa49a..6cd83acf 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1759,7 +1759,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1273555370} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &149978587 MonoBehaviour: @@ -38477,9 +38477,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: FollowingEnemy, Assembly-CSharp - m_MethodName: SaveCheckpoint + - m_Target: {fileID: 897697754} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -41643,6 +41643,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1396222005} - {fileID: 1833717355} - {fileID: 149978586} - {fileID: 2073875298} @@ -42530,6 +42531,50 @@ MonoBehaviour: textEnglish: MAIN MENU textPolish: MENU GLOWNE displayText: {fileID: 1374645924} +--- !u!1 &1396222004 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396222005} + - component: {fileID: 1396222006} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1396222005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396222004} + 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: 1273555370} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1396222006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1396222004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &1427837625 GameObject: m_ObjectHideFlags: 0 @@ -147076,7 +147121,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1273555370} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1833717356 MonoBehaviour: @@ -148204,7 +148249,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1273555370} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2073875299 MonoBehaviour: @@ -148704,9 +148749,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: FollowingEnemy, Assembly-CSharp - m_MethodName: SaveCheckpoint + - m_Target: {fileID: 2146696734} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index eeed0fb0..42913b4c 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -22230,6 +22230,50 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &147084380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 147084381} + - component: {fileID: 147084382} + m_Layer: 0 + m_Name: AccountBalance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &147084381 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147084380} + 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: 1539180721} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &147084382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147084380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60e0a5fc22bc183469ff5f5a937f5015, type: 3} + m_Name: + m_EditorClassIdentifier: + Gold: 0 --- !u!1 &159795062 GameObject: m_ObjectHideFlags: 0 @@ -27311,6 +27355,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 949853991} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &949853993 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28329,7 +28385,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1539180721} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1134345426 MonoBehaviour: @@ -29793,7 +29849,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1539180721} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1284827862 MonoBehaviour: @@ -30018,7 +30074,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1539180721} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1302056882 MonoBehaviour: @@ -31295,6 +31351,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 147084381} - {fileID: 1134345425} - {fileID: 1284827861} - {fileID: 1302056881} @@ -37387,6 +37444,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 1868257117} + m_TargetAssemblyTypeName: SaveController, Assembly-CSharp + m_MethodName: SaveAccountBalance + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1868257120 MonoBehaviour: m_ObjectHideFlags: 0 @@ -38785,6 +38854,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1393757793} m_Modifications: + - target: {fileID: -7576677615092044163, guid: 417d111e604a8124cb960805d809e513, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: -7576677615092044163, guid: 417d111e604a8124cb960805d809e513, type: 3} propertyPath: currentPosition.walkable value: 0 diff --git a/Assets/Scripts/REFACTORING/Application/AccountBalance.meta b/Assets/Scripts/REFACTORING/Application/AccountBalance.meta new file mode 100644 index 00000000..b8f8a029 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/AccountBalance.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2a61002aaf00c44b86491c3c6d4016e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs b/Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs new file mode 100644 index 00000000..4d50400c --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +class AccountBalanceManager : MonoBehaviour +{ + public const string PLAYER_ACCOUNT_VALUE = "Player.AccountBalance"; + + public static AccountBalanceManager Instance; + + public int Gold; + + public void Awake() + { + if (Instance == null) + { + // Load saved gold value + LoadValue(); + + Instance = this; + } + else + { + Destroy(gameObject); + } + } + + public void SetAccountBalanceValue(int gold) + { + Gold = gold; + + UpdatePanelValue(); + } + + public void IncreaseAccountBalanceValue(int gold) + { + Gold += gold; + + UpdatePanelValue(); + } + + public void DecreaseAccountBalanceValue(int gold) + { + Gold -= gold; + + UpdatePanelValue(); + } + + public void SaveValue() + { + PlayerPrefs.SetInt(PLAYER_ACCOUNT_VALUE, Gold); + } + + public void LoadValue() + { + if(PlayerPrefs.HasKey(PLAYER_ACCOUNT_VALUE)) + { + Gold = PlayerPrefs.GetInt(PLAYER_ACCOUNT_VALUE); + } + else + { + Gold = 0; + } + } + + /// + /// Function to update value displayed on Inventory Panel - only if is opened + /// + private void UpdatePanelValue() + { + if (InventoryUIManager.Instance.GetPanelStatus()) + InventoryUIManager.Instance.DynamicPanel.GetComponent().RefreshPanel(Gold); + } +} + diff --git a/Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs.meta b/Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs.meta new file mode 100644 index 00000000..160cf25a --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/AccountBalance/AccountBalanceManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 60e0a5fc22bc183469ff5f5a937f5015 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs b/Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs new file mode 100644 index 00000000..2ac84c95 --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +class PanelCashController : MonoBehaviour +{ + [Header("Current Value")] + public int AccountBalanceValue; + + [Header("Account Balance")] + [SerializeField] public TextMeshProUGUI displayedValue; + + + public void Start() + { + // Get current remembered value + var balanceManager = AccountBalanceManager.Instance; + + if (balanceManager == null) + throw new NullReferenceException("AccountBalanceManager not found!!!"); + + RefreshPanel(balanceManager.Gold); + + DisplayePlayerAccountBalance(); + } + + // synch status after selling, buying item + + public void RefreshPanel(int gold) + { + AccountBalanceValue = gold; + + DisplayePlayerAccountBalance(); + } + + public void DisplayePlayerAccountBalance() + { + displayedValue.text = $"{AccountBalanceValue}"; + } +} + diff --git a/Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs.meta b/Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs.meta new file mode 100644 index 00000000..786ae77c --- /dev/null +++ b/Assets/Scripts/REFACTORING/Application/AccountBalance/PanelCashController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6fb47b0e304a4644db8ee53654039f3c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/REFACTORING/Application/Shop/ShopItemCardKeeper.cs b/Assets/Scripts/REFACTORING/Application/Shop/ShopItemCardKeeper.cs index 36aea2b2..88df5b3d 100644 --- a/Assets/Scripts/REFACTORING/Application/Shop/ShopItemCardKeeper.cs +++ b/Assets/Scripts/REFACTORING/Application/Shop/ShopItemCardKeeper.cs @@ -114,12 +114,21 @@ class ShopItemCardKeeper : MonoBehaviour public void BuyItem() { - Debug.Log("Buy item"); - if (!_buyButton.IsActive()) return; - // TODO - CHECK PLAYER ACCOUNT + var itemPrice = SelectedItem.Price; + + // Check player account balance + if (!CheckPlayerAccoutnBalance(itemPrice)) + { + Debug.Log($"You don't have enouht gold - required {itemPrice}"); + + return; + } + + // Change account balance status (refresh view) + AccountBalanceManager.Instance.DecreaseAccountBalanceValue(SelectedItem.Price); // 1. Buy transaction // 1.1.1 Add to player Inventory Panel + refresh view @@ -137,18 +146,17 @@ class ShopItemCardKeeper : MonoBehaviour if (ShopUIManager.Instance.GetPanelStatus()) GameObject.FindObjectOfType().BuildPanelContent(ShopContentUIManager.Instance.GetList()); - // 1.2.2 Save chnages in Shop Panel + // 2 Save changes + + // 2.1 Save chnages in Shop Panel SceneInventoryDataManager.Instance.SaveDynamicData(); - - - // 2. TODO - Player gold change & save + // 2.2 Save account balance current status + AccountBalanceManager.Instance.SaveValue(); } public void SellItem() { - Debug.Log("Sell item"); - if (!_sellButton.IsActive()) return; @@ -158,11 +166,24 @@ class ShopItemCardKeeper : MonoBehaviour if (InventoryUIManager.Instance.GetPanelStatus()) GameObject.FindObjectOfType().BuildPanelContent(InventoryUIManager.Instance.GetList()); - - // 1.1.2 Save chnages in Inventory Panel + + + // 2. Change account balance status (refresh view) + AccountBalanceManager.Instance.IncreaseAccountBalanceValue(SelectedItem.Price); + + + // 3 Save changes + + // 3.1 Save chnages in Shop Panel SceneInventoryDataManager.Instance.SaveDynamicData(); + // 3.2 Save account balance current status + AccountBalanceManager.Instance.SaveValue(); + } - // 2. TODO - Player gold change & save + + public bool CheckPlayerAccoutnBalance(int requiredAmount) + { + return AccountBalanceManager.Instance.Gold > requiredAmount; } } \ No newline at end of file diff --git a/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs b/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs index 89b9c144..8bd2c294 100644 --- a/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs +++ b/Assets/Scripts/REFACTORING/Application/UI/Inventory/InventoryUIManager.cs @@ -7,7 +7,7 @@ public class InventoryUIManager : UIWarehouseManager { public static new InventoryUIManager Instance { get; protected set; } - public override int SLOTS_NUMBER { get { return 48; } } + public override int SLOTS_NUMBER { get { return 42; } } public const string ITEM_LOCALIZATION = "UiPanels/"; public const string PANEL_NAME = "InventoryPanel"; diff --git a/Assets/Scripts/SaveController.cs b/Assets/Scripts/SaveController.cs index d8829549..1e5259be 100644 --- a/Assets/Scripts/SaveController.cs +++ b/Assets/Scripts/SaveController.cs @@ -30,6 +30,12 @@ public class SaveController : MonoBehaviour player.GetComponent().SaveCheckpoint(); } + public void SaveAccountBalance() + { + if (AccountBalanceManager.Instance) + AccountBalanceManager.Instance.SaveValue(); + } + #region palyer panels data public void SavePlayerEquipmentItems() // toDO change name to save Equipment - save items will save items on map eg after drops {