diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index 0c563221..c5ad04c1 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -12374,7 +12374,7 @@ MonoBehaviour: - delay: 0 time: 0 interval: 0 - filename: tofu_fail + filename: se_cooking_Failure_smoke maxCount: 0 --- !u!198 &947177465739795022 ParticleSystem: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index a6f2072b..dcad4c5b 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -260,6 +260,7 @@ GameObject: - component: {fileID: 320398127} - component: {fileID: 320398126} - component: {fileID: 320398125} + - component: {fileID: 4852160585447148657} m_Layer: 5 m_Name: Button_setting m_TagString: Untagged @@ -368,6 +369,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &4852160585447148657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320398123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &1339603268 GameObject: m_ObjectHideFlags: 0 @@ -974,6 +991,7 @@ GameObject: - component: {fileID: 7031342967731239570} - component: {fileID: 3380000601969954953} - component: {fileID: 8545829044125670743} + - component: {fileID: 6737177677381340405} m_Layer: 5 m_Name: Button_publicity_on m_TagString: Untagged @@ -1082,6 +1100,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6737177677381340405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 566248750470715636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &698401032965878637 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index 7a7f78c0..95ec6739 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 137127162501263390} - component: {fileID: 137127162501263385} - component: {fileID: 137127162501263384} + - component: {fileID: 7093486002631549965} m_Layer: 5 m_Name: Button_setting m_TagString: Untagged @@ -118,6 +119,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &7093486002631549965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127162501263386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &137127162547959665 GameObject: m_ObjectHideFlags: 0 @@ -1120,6 +1137,7 @@ GameObject: - component: {fileID: 137127164298331676} - component: {fileID: 137127164298331679} - component: {fileID: 137127164298331678} + - component: {fileID: 6337376625524217682} m_Layer: 5 m_Name: Button_information m_TagString: Untagged @@ -1226,6 +1244,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &6337376625524217682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137127164298331672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &137127164573744480 GameObject: m_ObjectHideFlags: 0 @@ -1535,6 +1569,7 @@ GameObject: - component: {fileID: 3270954252519000258} - component: {fileID: 8472443207940590385} - component: {fileID: 7425175309417248097} + - component: {fileID: 3344914652358049824} m_Layer: 5 m_Name: Button_mission m_TagString: Untagged @@ -1641,6 +1676,22 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &3344914652358049824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5097575317734896701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 --- !u!1 &5887459306579115384 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 89066ddb..27f50820 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -305,7 +305,7 @@ RectTransform: 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_AnchoredPosition: {x: -2, y: -22} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &255490368 @@ -573,7 +573,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -16, y: 411} - m_SizeDelta: {x: 512, y: 6} + m_SizeDelta: {x: 680, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &374985850 MonoBehaviour: @@ -595,7 +595,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: befe49c03955d3642a335e511312e1ba, type: 3} - m_Type: 0 + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1274,8 +1274,8 @@ RectTransform: 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: -16.000008, y: 440} - m_SizeDelta: {x: 450, y: 50} + m_AnchoredPosition: {x: -16, y: 440} + m_SizeDelta: {x: 630, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &707887860 MonoBehaviour: @@ -1298,11 +1298,11 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 34 - m_FontStyle: 0 + m_FontSize: 35 + m_FontStyle: 1 m_BestFit: 1 - m_MinSize: 34 - m_MaxSize: 40 + m_MinSize: 35 + m_MaxSize: 37 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -1824,7 +1824,7 @@ RectTransform: 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: 6, y: 21} + m_AnchoredPosition: {x: 9, y: 21} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &956402762 @@ -1849,7 +1849,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 25 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 1 m_MinSize: 22 m_MaxSize: 27 @@ -2505,7 +2505,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -180} - m_SizeDelta: {x: 700, y: 170} + m_SizeDelta: {x: 700, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1170636685 MonoBehaviour: @@ -2898,8 +2898,8 @@ RectTransform: 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: 9, y: 0} - m_SizeDelta: {x: 370, y: 6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1484296445 MonoBehaviour: @@ -2921,7 +2921,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: ff4296f46be2e7a4583db68be1c12d4c, type: 3} - m_Type: 0 + m_Type: 2 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3580,7 +3580,7 @@ RectTransform: 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: 62.000008, y: -154} + m_AnchoredPosition: {x: 0, y: -130} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2045825932 @@ -3617,8 +3617,8 @@ RectTransform: 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: 77, y: -204} - m_SizeDelta: {x: 370, y: 85} + m_AnchoredPosition: {x: 75, y: -208} + m_SizeDelta: {x: 370, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2045825934 MonoBehaviour: @@ -3641,12 +3641,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 23 + m_FontSize: 25 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 + m_BestFit: 1 + m_MinSize: 23 m_MaxSize: 25 - m_Alignment: 3 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0