diff --git a/popcorn/Assets/MyGame/Scenes/Main/Information.unity b/popcorn/Assets/MyGame/Scenes/Main/Information.unity index a03ee8bd..e4c4eecd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Information.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Information.unity @@ -121,6 +121,18 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &846582176 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6859128402182084773, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + m_PrefabInstance: {fileID: 6859128401289428600} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1556412026 PrefabInstance: m_ObjectHideFlags: 0 @@ -196,6 +208,19 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1556412026} m_PrefabAsset: {fileID: 0} +--- !u!114 &1892543846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 846582176} --- !u!1001 &6859128401289428600 PrefabInstance: m_ObjectHideFlags: 0 @@ -528,6 +553,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128400961489650, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, + type: 3} - target: {fileID: 6859128400999920012, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.x @@ -603,6 +634,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401126514286, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, + type: 3} - target: {fileID: 6859128401135470825, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -733,6 +770,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401308736545, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u7D2F\u8A08\u30ED\u30B0\u30A4\u30F3\u6570" + objectReference: {fileID: 0} + - target: {fileID: 6859128401308736545, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128401342021930, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -758,11 +806,44 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401366313437, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u7D2F\u8A08" + objectReference: {fileID: 0} + - target: {fileID: 6859128401366313437, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6859128401369031084, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u304A\u5E97\u306E\u6B69\u307F" + objectReference: {fileID: 0} + - target: {fileID: 6859128401369031084, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128401516038727, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401682711732, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u5E97\u8217\u30EC\u30D9\u30EB" + objectReference: {fileID: 0} + - target: {fileID: 6859128401682711732, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128401750419788, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -808,6 +889,17 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401939500947, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + objectReference: {fileID: 0} + - target: {fileID: 6859128401939500947, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128401943574370, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -828,6 +920,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128401988334834, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u5546\u54C1\u5728\u5EAB" + objectReference: {fileID: 0} + - target: {fileID: 6859128401988334834, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128402056634900, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -858,6 +961,28 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128402077804075, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u7D2F\u8A08\u8CA9\u58F2\u6570" + objectReference: {fileID: 0} + - target: {fileID: 6859128402077804075, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u79F0\u53F7" + objectReference: {fileID: 0} + - target: {fileID: 6859128402130815625, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128402165333294, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -888,6 +1013,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128402182084773, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + type: 3} - target: {fileID: 6859128402297305239, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -903,6 +1034,23 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128402301004802, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u6750\u6599\u5728\u5EAB" + objectReference: {fileID: 0} + - target: {fileID: 6859128402301004802, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} + - target: {fileID: 6859128402304538401, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, + type: 3} - target: {fileID: 6859128402360749161, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_Name @@ -1028,6 +1176,17 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u5E97\u8217\u30EC\u30D9\u30EB" + objectReference: {fileID: 0} + - target: {fileID: 6859128402411520440, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128402441431547, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_AnchorMax.y @@ -1078,6 +1237,17 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6859128402708489558, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_Text + value: "\u7D2F\u8A08\u53D6\u5F97\u30B3\u30A4\u30F3" + objectReference: {fileID: 0} + - target: {fileID: 6859128402708489558, guid: b9106333bdbe2421486d8af844a9b8cb, + type: 3} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + type: 3} - target: {fileID: 6859128402839842459, guid: b9106333bdbe2421486d8af844a9b8cb, type: 3} propertyPath: m_SizeDelta.x diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index b0fcb14c..d2557083 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -222,7 +222,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5110cb836fda4417b89051c3d3f8509b, type: 3} + m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1187,7 +1187,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 94bfd479e68964f438c9c619fc7e88f1, type: 3} + m_Sprite: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2039,7 +2039,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2051,7 +2051,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8BA1\u767B\u9646\u6570" + m_Text: "\u7D2F\u8A08\u30ED\u30B0\u30A4\u30F3\u6570" --- !u!114 &6641915190159818204 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2195,7 +2195,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2207,7 +2207,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8BA1" + m_Text: "\u7D2F\u8A08" --- !u!114 &8484226659470063900 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2313,7 +2313,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2325,7 +2325,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u94FA\u53D1\u5C55\u53F2" + m_Text: "\u304A\u5E97\u306E\u6B69\u307F" --- !u!114 &2516843243683150584 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2951,7 +2951,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -2963,7 +2963,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u94FA\u7B49\u7EA7" + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3181,7 +3181,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3377,7 +3377,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3389,7 +3389,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3570,7 +3570,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -3582,7 +3582,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5546\u54C1\u5E93\u5B58" + m_Text: "\u5546\u54C1\u5728\u5EAB" --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3688,7 +3688,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3917,7 +3917,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -3929,7 +3929,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8BA1\u9500\u552E\u6570" + m_Text: "\u7D2F\u8A08\u8CA9\u58F2\u6570" --- !u!114 &2853590059505424815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4149,7 +4149,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4161,7 +4161,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u79F0\u8C13" + m_Text: "\u79F0\u53F7" --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4267,7 +4267,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -4462,7 +4462,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4815,7 +4815,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4827,7 +4827,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6750\u6599\u5E93\u5B58" + m_Text: "\u6750\u6599\u5728\u5EAB" --- !u!114 &2317717004034477971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4932,7 +4932,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 83a5b0d11178145cfb6950bec9e6efc4, type: 3} + m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -5362,7 +5362,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5374,7 +5374,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5E97\u94FA\u7B49\u7EA7" + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB" --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5971,7 +5971,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5983,7 +5983,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u7D2F\u8BA1\u83B7\u5F97\u91D1\u5E01" + m_Text: "\u7D2F\u8A08\u53D6\u5F97\u30B3\u30A4\u30F3" --- !u!114 &2645931646123064803 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6429,7 +6429,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -6891,7 +6891,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7032,7 +7032,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7053,7 +7053,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -7174,7 +7174,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -7195,7 +7195,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7316,7 +7316,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7337,7 +7337,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7453,7 +7453,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -7584,7 +7584,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7715,7 +7715,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7856,7 +7856,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -7987,7 +7987,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8118,7 +8118,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8249,7 +8249,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8380,7 +8380,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8511,7 +8511,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8642,7 +8642,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8773,7 +8773,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -8904,7 +8904,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9035,7 +9035,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9166,7 +9166,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9297,7 +9297,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1247e9d6e57be4a49819f11b7e60acec, type: 3} @@ -9318,7 +9318,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -9434,7 +9434,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index 01d8e5b4..cfc20967 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -192,7 +192,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -204,7 +204,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.3 - m_Text: "\u98DF\u54C1\u7BB1\u4F1A\u7ACB\u523B\u6E05\u7A7A\uFF0C\u4F46\u662F\u91D1\u5E01\u548C\u7231\u5FC3\u4E5F\u65E0\u6CD5\u83B7\u5F97\u4E86\u54E6" + m_Text: "\u30BF\u30F3\u30AF\u5185\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3059\u3050\u306B\u7A7A\u306B\u3067\u304D\u308B\u3088\n\u30B3\u30A4\u30F3\u3084\u30CF\u30FC\u30C8\u306F\u3082\u3089\u3048\u306A\u3044\u3088" --- !u!114 &7887033067418340973 MonoBehaviour: m_ObjectHideFlags: 0 @@ -593,7 +593,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5f438a31f7ef146c29a828987af58ea7, type: 3} + m_Sprite: {fileID: 21300000, guid: c48bf96df0daa8840893d8b46010f597, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1265,7 +1265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} + m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1823,7 +1823,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -1940,7 +1940,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f50fa4accac674373bffac79f4157bb4, type: 3} + m_Sprite: {fileID: 21300000, guid: aac62235e8d499d4f8c23e2f10a05471, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity index a853390b..900cf0ba 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Tasting.unity @@ -121,131 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &14271496 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1240625622} ---- !u!114 &28137624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 449567760} ---- !u!114 &307005459 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5089467467985140646, guid: 0da1dd32f93cb4fe4881d732047679ec, - type: 3} - m_PrefabInstance: {fileID: 5089467467794925111} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &326175531 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 611773674} ---- !u!114 &449567760 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5089467466247093045, guid: 0da1dd32f93cb4fe4881d732047679ec, - type: 3} - m_PrefabInstance: {fileID: 5089467467794925111} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &578393844 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5089467468128331485, guid: 0da1dd32f93cb4fe4881d732047679ec, - type: 3} - m_PrefabInstance: {fileID: 5089467467794925111} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &611773674 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5089467466529880991, guid: 0da1dd32f93cb4fe4881d732047679ec, - type: 3} - m_PrefabInstance: {fileID: 5089467467794925111} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1240625622 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5089467467555811495, guid: 0da1dd32f93cb4fe4881d732047679ec, - type: 3} - m_PrefabInstance: {fileID: 5089467467794925111} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1568768064 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 307005459} ---- !u!114 &1806668544 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 578393844} --- !u!224 &1989384000 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5089467466543878519, guid: 0da1dd32f93cb4fe4881d732047679ec,