diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_MaterialInventory.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_MaterialInventory.prefab index 88d8e380..9fd5d825 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_MaterialInventory.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_MaterialInventory.prefab @@ -9,10 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1140500465765898261} - - component: {fileID: 1140500465765898251} - - component: {fileID: 1140500465765898260} m_Layer: 5 - m_Name: icon + m_Name: IconTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28,7 +26,8 @@ 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_Children: [] + m_Children: + - {fileID: 2806955952627970955} m_Father: {fileID: 1140500465779448313} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -37,43 +36,6 @@ RectTransform: m_AnchoredPosition: {x: -327, y: -2} m_SizeDelta: {x: 56, y: 56} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1140500465765898251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140500465765898262} - m_CullTransparentMesh: 0 ---- !u!114 &1140500465765898260 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140500465765898262} - 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: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ffa1614fb4f7b9d48b0530ce2f77f954, 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 &1140500465779448314 GameObject: m_ObjectHideFlags: 0 @@ -310,7 +272,7 @@ GameObject: - component: {fileID: 1140500466731938231} - component: {fileID: 1140500466731938224} m_Layer: 5 - m_Name: Text + m_Name: NameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -504,6 +466,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a3678f95f7fb47e6a896f5981fa856ee, type: 3} m_Name: m_EditorClassIdentifier: + nameText: {fileID: 1140500466731938224} + amountText: {fileID: 1140500467660440448} + materialTarget: {fileID: 1140500465765898261} + viewObject: {fileID: 1140500465779448314} + noStockObject: {fileID: 1140500466556492164} --- !u!1 &1140500467660440450 GameObject: m_ObjectHideFlags: 0 @@ -516,7 +483,7 @@ GameObject: - component: {fileID: 1140500467660440455} - component: {fileID: 1140500467660440448} m_Layer: 5 - m_Name: Text (2) + m_Name: AmountText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -582,3 +549,77 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "150\u500B" +--- !u!1 &3850907118588409827 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2806955952627970955} + - component: {fileID: 1485916121158641289} + - component: {fileID: 7179781423974187134} + m_Layer: 5 + m_Name: icon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2806955952627970955 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850907118588409827} + 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: 1140500465765898261} + 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: 0, y: 0} + m_SizeDelta: {x: 56, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1485916121158641289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850907118588409827} + m_CullTransparentMesh: 0 +--- !u!114 &7179781423974187134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850907118588409827} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ffa1614fb4f7b9d48b0530ce2f77f954, 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 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_ProductInventory.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_ProductInventory.prefab index 009d9ec1..0d353be8 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_ProductInventory.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_ProductInventory.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1407137828897438298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3921211637963681551} + - component: {fileID: 4259597446877117596} + - component: {fileID: 2470170075764803144} + m_Layer: 5 + m_Name: Popcorn (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3921211637963681551 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407137828897438298} + 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: 4260782103473765504} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000030517578, y: -0.000061035156} + m_SizeDelta: {x: 92, y: 136} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4259597446877117596 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407137828897438298} + m_CullTransparentMesh: 0 +--- !u!114 &2470170075764803144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1407137828897438298} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, 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 &4260782103094776042 GameObject: m_ObjectHideFlags: 0 @@ -90,7 +164,7 @@ GameObject: - component: {fileID: 4260782103114427592} - component: {fileID: 4260782103114427595} m_Layer: 5 - m_Name: Text (2) + m_Name: AmountText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -278,10 +352,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4260782103473765504} - - component: {fileID: 4260782103473765510} - - component: {fileID: 4260782103473765505} m_Layer: 5 - m_Name: Popcorn + m_Name: PopcornTarget m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -297,7 +369,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0.11129463, w: 0.9937875} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.59999996, y: 0.59999996, z: 0.59999996} - m_Children: [] + m_Children: + - {fileID: 3921211637963681551} m_Father: {fileID: 4260782103209256009} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -12.780001} @@ -306,43 +379,6 @@ RectTransform: m_AnchoredPosition: {x: -325, y: -0.000061035156} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4260782103473765510 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4260782103473765507} - m_CullTransparentMesh: 0 ---- !u!114 &4260782103473765505 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4260782103473765507} - 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: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 99d426990eeb08d4d85ae03f04609196, 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 &4260782103694084379 GameObject: m_ObjectHideFlags: 0 @@ -467,6 +503,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c900b532386a4143b472d5dda83f0d7b, type: 3} m_Name: m_EditorClassIdentifier: + nameText: {fileID: 4260782104779803627} + amountText: {fileID: 4260782103114427595} + productTarget: {fileID: 4260782103473765504} + viewObject: {fileID: 4260782103209256008} + noStockObject: {fileID: 4260782104312622756} --- !u!1 &4260782104312622756 GameObject: m_ObjectHideFlags: 0 @@ -516,7 +557,7 @@ GameObject: - component: {fileID: 4260782104779803624} - component: {fileID: 4260782104779803627} m_Layer: 5 - m_Name: Text + m_Name: NameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_histoy.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_histoy.prefab index 10efd71b..44fab707 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_histoy.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Information/detail_histoy.prefab @@ -10,12 +10,12 @@ GameObject: m_Component: - component: {fileID: 6878252344180914110} m_Layer: 0 - m_Name: 'record_ yellow ' + m_Name: record m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6878252344180914110 RectTransform: m_ObjectHideFlags: 0 @@ -32,7 +32,7 @@ RectTransform: - {fileID: 6878252345909755265} - {fileID: 6878252345190694868} m_Father: {fileID: 6878252344716020596} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -67,7 +67,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6878252345413873268} - {fileID: 6878252344180914110} - {fileID: 6878252345583698427} m_Father: {fileID: 0} @@ -90,80 +89,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ec14e6a9da43403d96c18ca8372f3b9a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &6878252344780763311 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6878252344780763308} - - component: {fileID: 6878252344780763306} - - component: {fileID: 6878252344780763309} - m_Layer: 5 - m_Name: line - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6878252344780763308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252344780763311} - 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: 6878252345413873268} - 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: -4, y: 108.99996} - m_SizeDelta: {x: 800, y: 6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6878252344780763306 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252344780763311} - m_CullTransparentMesh: 0 ---- !u!114 &6878252344780763309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252344780763311} - 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: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ff4296f46be2e7a4583db68be1c12d4c, type: 3} - m_Type: 2 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + achievementText: {fileID: 6878252345909755294} + playButton: {fileID: 6878252345190694869} + oddColorBG: {fileID: 6878252345310641718} + viewObject: {fileID: 6878252344180914081} + unreleasedObject: {fileID: 6878252345583698426} --- !u!1 &6878252344990047431 GameObject: m_ObjectHideFlags: 0 @@ -316,124 +246,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\uFF1F\uFF1F\uFF1F" ---- !u!1 &6878252345082755157 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6878252345082755154} - - component: {fileID: 6878252345082755153} - - component: {fileID: 6878252345082755152} - - component: {fileID: 6878252345082755155} - m_Layer: 0 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6878252345082755154 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345082755157} - 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: 6878252345413873268} - m_RootOrder: 2 - 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: 323, y: 149.99997} - m_SizeDelta: {x: 102, y: 64} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6878252345082755153 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345082755157} - m_CullTransparentMesh: 0 ---- !u!114 &6878252345082755152 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345082755157} - 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_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77272d7fa9a0a9a42bc6cfad0607cefa, 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!114 &6878252345082755155 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345082755157} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6878252345082755152} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &6878252345190694871 GameObject: m_ObjectHideFlags: 0 @@ -655,12 +467,12 @@ GameObject: - component: {fileID: 6878252345310641717} - component: {fileID: 6878252345310641716} m_Layer: 0 - m_Name: Image + m_Name: OddColorImage m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6878252345310641719 RectTransform: m_ObjectHideFlags: 0 @@ -717,44 +529,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6878252345413873271 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6878252345413873268} - m_Layer: 0 - m_Name: record - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6878252345413873268 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345413873271} - 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: 6878252344780763308} - - {fileID: 6878252345860775681} - - {fileID: 6878252345082755154} - m_Father: {fileID: 6878252344716020596} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -124} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6878252345583698426 GameObject: m_ObjectHideFlags: 0 @@ -770,7 +544,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6878252345583698427 RectTransform: m_ObjectHideFlags: 0 @@ -785,91 +559,13 @@ RectTransform: - {fileID: 6878252345214281198} - {fileID: 6878252344993303725} m_Father: {fileID: 6878252344716020596} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -124} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6878252345860775680 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6878252345860775681} - - component: {fileID: 6878252345860775711} - - component: {fileID: 6878252345860775710} - m_Layer: 5 - m_Name: Text (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6878252345860775681 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345860775680} - 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: 6878252345413873268} - m_RootOrder: 1 - 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: -38.999992, y: 150} - m_SizeDelta: {x: 700, y: 56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6878252345860775711 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345860775680} - m_CullTransparentMesh: 0 ---- !u!114 &6878252345860775710 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6878252345860775680} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.43137258, g: 0.29803923, b: 0.19215688, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 35 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 30 - m_MaxSize: 35 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "Lv.1\u3000\u3072\u3088\u3063\u3053\u306E\u304A\u5E97" --- !u!1 &6878252345909755264 GameObject: m_ObjectHideFlags: 0 @@ -882,7 +578,7 @@ GameObject: - component: {fileID: 6878252345909755295} - component: {fileID: 6878252345909755294} m_Layer: 5 - m_Name: Text (1) + m_Name: AchievementText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs index fca4307f..d83f416c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasMaterialItemView.cs @@ -1,6 +1,27 @@ +using System; using UnityEngine; +using UnityEngine.UI; public class HasMaterialItemView : MonoBehaviour { + private static readonly string amountFormat = "{0}個"; + [SerializeField] private Text nameText; + [SerializeField] private Text amountText; + [SerializeField] private Transform materialTarget; + [SerializeField] private GameObject viewObject; + [SerializeField] private GameObject noStockObject; + public void SetData(ShopData shopData, int amount) + { + amountText.text = String.Format(amountFormat, amount); + nameText.text = shopData.name; + materialTarget.DestroyAllChildrens(); + Instantiate(shopData.GetIconPrefab(), materialTarget); + } + + public void SetNoStock(bool active) + { + viewObject.SetActive(!active); + noStockObject.SetActive(active); + } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs index 8ed8b610..56adc0a7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/HasProductItemView.cs @@ -1,6 +1,27 @@ +using System; using UnityEngine; +using UnityEngine.UI; public class HasProductItemView : MonoBehaviour { - + private static readonly string amountFormat = "{0}個"; + [SerializeField] private Text nameText; + [SerializeField] private Text amountText; + [SerializeField] private Transform productTarget; + [SerializeField] private GameObject viewObject; + [SerializeField] private GameObject noStockObject; + + public void SetData(ProductData productData, int amount) + { + amountText.text = String.Format(amountFormat, amount); + nameText.text = productData.name; + productTarget.DestroyAllChildrens(); + Instantiate(productData.GetIconPrefab(), productTarget); + } + + public void SetNoStock(bool active) + { + viewObject.SetActive(!active); + noStockObject.SetActive(active); + } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs index fedc1c62..f5277c8c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/Information.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using UniRx; using UnityEngine; using UnityEngine.UI; @@ -66,5 +67,97 @@ public class Information : MonoBehaviour scrollRect.verticalNormalizedPosition = 1; }).AddTo(this); shopInfoButton.onClick.Invoke(); + + var gameData = GameDataManager.GameData; + var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); + var shopScriptList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ScriptDataSheet); + Debug.Log(gameData.ViewedShopLevel); + var shopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel) ?? shopLevelList[0]; + var nextShopLevelData = shopLevelList.FirstOrDefault(data => data.shopLevel == gameData.ViewedShopLevel + 1); + var nextLevelHeart = nextShopLevelData?.heart ?? shopLevelData.heart; + totalDayText.text = String.Format(dayFormat, 1); + totalSalesText.text = String.Format(salesFormat, gameData.TotalSales); + totalCoinText.text = gameData.TotalAddCoin.ToString(); + achievementText.text = shopLevelData.achievement; + shopLevelText.text = gameData.ViewedShopLevel.ToString(); + progressText.text = String.Format(progressFormat, Mathf.Min(gameData.Heart, nextLevelHeart), nextLevelHeart); + + var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); + var materialList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); + var shopStockList = gameData.ShopStock.Select(data => (data.FlavorId, data.Stock)); + var tankStockList = gameData.StorageTanks.Select(data => (data.FlavorId, data.Stock)); + var totalStockList = shopStockList.Concat(tankStockList).ToList(); + + // shopLevel + historyTarget.DestroyAllChildrens(); + var shopLevelIndex = 1; + foreach (var levelData in shopLevelList) + { + var scriptList = shopScriptList.Where(data => data.id == levelData.shopLevel).ToList(); + var view = Instantiate(historyPrefab, historyTarget); + view.SetOddBG(shopLevelIndex % 2 == 0); + shopLevelIndex++; + if (levelData.shopLevel > gameData.ViewedShopLevel) + { + view.SetUnreleased(true); + continue; + } + view.SetData(levelData); + if (scriptList.Count > 0) + { + view.PlayButton.ThrottleFirst(TimeSpan.FromSeconds(1f)).Subscribe(_ => + { + LocalCacheManager.Save(BrotherConversation.ScriptDataTag, scriptList); + TransitionManager.Instance.LoadSceneAdditive(GameScenes.Conversation); + }).AddTo(view); + } + else + { + view.SetButtonAcive(false); + } + } + + // product + productTarget.DestroyAllChildrens(); + if (totalStockList.Sum(data => data.Stock) == 0) + { + var view = Instantiate(productPrefab, productTarget); + view.SetNoStock(true); + } + else + { + foreach (var productData in productList) + { + var count = totalStockList.Count(data => data.FlavorId == productData.id); + if (count == 0) + { + continue; + } + + var view = Instantiate(productPrefab, productTarget); + view.SetData(productData, count); + } + } + + // material + materialTarget.DestroyAllChildrens(); + var totalCount = gameData.Material.Sum(data => data.Amount); + if (totalCount == 0) + { + var view = Instantiate(materialPrefab, materialTarget); + view.SetNoStock(true); + } + else + { + foreach (var materialData in gameData.Material) + { + if (materialData.Amount == 0) + { + continue; + } + var view = Instantiate(materialPrefab, materialTarget); + view.SetData(materialList.First(data => data.itemId == materialData.Id), materialData.Amount); + } + } } } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs index 9c68db78..c31c2819 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/ShopHistoryItemView.cs @@ -1,6 +1,35 @@ +using System; +using UniRx; using UnityEngine; +using UnityEngine.UI; public class ShopHistoryItemView : MonoBehaviour { - + private static readonly string acivementFormat = "Lv.{0} {1}"; + [SerializeField] private Text achievementText; + [SerializeField] private Button playButton; + [SerializeField] private GameObject oddColorBG; + [SerializeField] private GameObject viewObject; + [SerializeField] private GameObject unreleasedObject; + public IObservable PlayButton => playButton.OnClickAsObservable().TakeUntilDestroy(this); + public void SetData(ShopLevelData levelData) + { + achievementText.text = String.Format(acivementFormat, levelData.shopLevel, levelData.achievement); + } + + public void SetUnreleased(bool active) + { + viewObject.SetActive(!active); + unreleasedObject.SetActive(active); + } + + public void SetButtonAcive(bool active) + { + playButton.gameObject.SetActive(active); + } + + public void SetOddBG(bool active) + { + oddColorBG.SetActive(active); + } } \ No newline at end of file