diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity index f9255dda..d4ae1a76 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &748186694 -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: 4082915279172730652} --- !u!1001 &759556296 PrefabInstance: m_ObjectHideFlags: 0 @@ -501,15 +488,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8ac6f588d2964e04be0f3469f01b21d, type: 3} ---- !u!114 &4082915279172730652 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4082915279112502089, guid: b8ac6f588d2964e04be0f3469f01b21d, - type: 3} - m_PrefabInstance: {fileID: 4082915279172730651} - 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: diff --git a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity index 966b0136..a1e6f3a9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrderTelephone.unity @@ -203,6 +203,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 2504566118903868548, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + type: 3} - target: {fileID: 3058138224889858367, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_AnchorMax.y @@ -243,6 +249,24 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3699167350656252491, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, + type: 3} + - target: {fileID: 4315754686575543077, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, + type: 3} + - target: {fileID: 4315754686625492741, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, + type: 3} - target: {fileID: 4315754687099534943, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_SizeDelta.y @@ -368,6 +392,12 @@ PrefabInstance: propertyPath: m_PlaneDistance value: 0 objectReference: {fileID: 0} + - target: {fileID: 4315754688123097774, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c6f198817e0e9474facf0c1a36b1baf6, + type: 3} - target: {fileID: 4315754688526726639, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} propertyPath: m_AnchorMax.y @@ -388,5 +418,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4315754688581755603, guid: a1725d421d10a4e348ad0cf68ac29f68, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1725d421d10a4e348ad0cf68ac29f68, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 9de8102c..b1bd075d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -121,19 +121,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &23593157 -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: 117251345} --- !u!1001 &55686909 PrefabInstance: m_ObjectHideFlags: 0 @@ -186,7 +173,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} - target: {fileID: 671564200103447854, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -202,7 +189,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} - target: {fileID: 2660639677052336234, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -313,7 +300,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, + objectReference: {fileID: 21300000, guid: b5c3dfe5e499b418a991f497696772cb, type: 3} - target: {fileID: 2660639678456833894, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -344,7 +331,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, + objectReference: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} - target: {fileID: 2660639679000795571, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -370,7 +357,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, + objectReference: {fileID: 21300000, guid: f66393b99b4174dddb6d82c1953a414e, type: 3} - target: {fileID: 2660639679025358539, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -506,7 +493,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} - target: {fileID: 3664918248288857012, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -541,13 +528,13 @@ PrefabInstance: - target: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Text - value: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" + value: "\u53BB\u5B8C\u6210\u65E5\u5E38\u4EFB\u52A1\u5427\uFF01" objectReference: {fileID: 0} - target: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 5306379771047912363, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -573,7 +560,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} - target: {fileID: 6700388378296198159, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -597,206 +584,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} ---- !u!114 &117251345 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639679015166989, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &439249517 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &463005816 -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: 791726450} ---- !u!114 &471706765 -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: 439249517} ---- !u!114 &607560463 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5302925502965666185, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &669327496 -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: 1614911828} ---- !u!114 &783666780 -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: 1900675268} ---- !u!114 &791726450 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &1150667240 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &1556136478 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639678739049204, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &1562148314 -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: 607560463} ---- !u!114 &1562816802 -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: 1556136478} ---- !u!114 &1614911828 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &1653116222 -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: 1150667240} ---- !u!114 &1767471428 -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: 2032510751} ---- !u!114 &1900675268 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 518689044540430268, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 @@ -872,15 +659,3 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1944170687} m_PrefabAsset: {fileID: 0} ---- !u!114 &2032510751 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639677480706697, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} - 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: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab index 3228eea2..917d6feb 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Canvas.prefab @@ -177,7 +177,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3427e8ca8d0104e48931345970086635, type: 3} + m_Sprite: {fileID: 21300000, guid: 8433b258c2bfd447787ed80c48da8a3c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -444,7 +444,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 274b9e3453e45cb42952f9bf572e625b, type: 3} + m_Sprite: {fileID: 21300000, guid: a44ad4ea0a19042fc88f84bbe5b86f22, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -747,7 +747,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -864,7 +864,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} + m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1035,7 +1035,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2517cc429555fe24b8c0cc353d0c02f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 8934f039c9ff3492aa8714915bc4741d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2041,7 +2041,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} + m_Sprite: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2234,7 +2234,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2938,7 +2938,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, type: 3} - target: {fileID: 3658417434568161586, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -2954,13 +2954,13 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3108,19 +3108,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, type: 3} - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} @@ -3268,19 +3268,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a873c8bad83dea840beba737356790ad, + objectReference: {fileID: 21300000, guid: 0ff1c70960b9748eaadab0748b43396d, type: 3} - target: {fileID: 6701890202664346918, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 6701890203089164457, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, + objectReference: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} - target: {fileID: 6701890203127158494, guid: 72c4a5536cad64c4aa959dccbff86e18, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab index 4f3e1000..d50e4be0 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/CanvasTelePhone.prefab @@ -117,7 +117,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 30db09479dbd54cf0b008136e816acd7, type: 3} + m_Sprite: {fileID: 21300000, guid: 9ec1fd1b10d054845bc283dc1597bc56, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -309,7 +309,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 45c1d351783724d929b524fefee9e69d, type: 3} + m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -824,7 +824,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: 30 m_FontStyle: 0 m_BestFit: 1 @@ -1484,7 +1484,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c6f198817e0e9474facf0c1a36b1baf6, type: 3} + m_Sprite: {fileID: 21300000, guid: 48243d820b7c5bd43ba50a88f69a8c05, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1843,7 +1843,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2150,7 +2150,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: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} @@ -2440,7 +2440,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: 7c3046c0280714d4bb45d41bcbb71ce1, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab index cfa1e0bb..b97ed9a3 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Frame_BulkOrder.prefab @@ -1018,6 +1018,7 @@ GameObject: - component: {fileID: 3658417435668626825} - component: {fileID: 3658417435668626827} - component: {fileID: 3658417435668626824} + - component: {fileID: 2759836121109603270} m_Layer: 5 m_Name: Text_purchase m_TagString: Untagged @@ -1081,6 +1082,45 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2759836121109603270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3658417435668626830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_button_icon_make_logo + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &3658417436044435500 GameObject: m_ObjectHideFlags: 0 @@ -1092,6 +1132,7 @@ GameObject: - component: {fileID: 3658417436044435503} - component: {fileID: 3658417436044435497} - component: {fileID: 3658417436044435502} + - component: {fileID: 3492958125710759010} m_Layer: 5 m_Name: Text_purchase m_TagString: Untagged @@ -1155,6 +1196,45 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3492958125710759010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3658417436044435500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_button_icon_make_logo_gray + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &4087977220020919705 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab index a85f21c1..f89185d9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Orde.prefab @@ -121,7 +121,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 1 @@ -407,6 +407,7 @@ GameObject: - component: {fileID: 7119651629168984665} - component: {fileID: 1127519249548814916} - component: {fileID: 626758044086132379} + - component: {fileID: 164359427652092799} m_Layer: 0 m_Name: Frame m_TagString: Untagged @@ -461,7 +462,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1cf21f2fee6054541924259eb2b23038, type: 3} + m_Sprite: {fileID: 21300000, guid: 468363623fa5840f0b1517881e45ed6b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -471,6 +472,45 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &164359427652092799 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7526028034810490598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_Main_BulkOrder_POP_Quantity_White + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &8096741952411493421 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index aa23af1d..95847f87 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -2011,7 +2011,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_FontSize: 40 m_FontStyle: 1 m_BestFit: 0 @@ -2840,7 +2840,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ef9da11b0701dad4da6424299fc9aa92, type: 3} + m_Sprite: {fileID: 21300000, guid: b5c3dfe5e499b418a991f497696772cb, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -3198,7 +3198,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 21300000, guid: a9127674e25494b40acb95ee9c693fec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3773,7 +3773,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3637e2158d7e58745b60a579180459cf, type: 3} + m_Sprite: {fileID: 21300000, guid: f66393b99b4174dddb6d82c1953a414e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5636,7 +5636,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6796,7 +6796,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6910,7 +6910,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} + m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7354,13 +7354,13 @@ PrefabInstance: - target: {fileID: 1565904717471002110, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_Text - value: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046" + value: "\u53BB\u5B8C\u6210\u65E5\u5E38\u4EFB\u52A1\u5427\uFF01" objectReference: {fileID: 0} - target: {fileID: 1565904717471002110, guid: 5efec1563da076e43b72d4631cb86748, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 7706147672656590141, guid: 5efec1563da076e43b72d4631cb86748, type: 3} @@ -7371,7 +7371,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, + objectReference: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3} - target: {fileID: 8610769905762339287, guid: 5efec1563da076e43b72d4631cb86748, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity index 9c25a52f..f66554f5 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/WatchMovieCoinGet.unity @@ -474,7 +474,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 @@ -1097,7 +1097,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 33153abe11e8f48e1a209b7ef77a2f01, type: 3} + m_Sprite: {fileID: 21300000, guid: f247faa75d88e5c40a92444ba0e075c3, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/Main/update.unity b/popcorn/Assets/MyGame/Scenes/Main/update.unity index 611eb3e0..5c6e7369 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/update.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/update.unity @@ -655,7 +655,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: 37 m_FontStyle: 0 m_BestFit: 0 @@ -667,7 +667,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5E97\u94FA\u7B49\u7EA7\u5728\u8FBE\u523015\u7EA7\u4EE5\u540E\u6B22\u8FCE\u60A8\u7B49\u5F85\u6211\u4EEC\u7684\u6E38\u620F\u5185\u5BB9\u66F4\u65B0\uFF01" + m_Text: "\u5E97\u8217\u30EC\u30D9\u30EB15\u4EE5\u964D\u306F\n\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u5F85\u3063\u3066\u306D" --- !u!222 &575189314 CanvasRenderer: m_ObjectHideFlags: 0 @@ -868,7 +868,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1606,7 +1606,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0bb3005af5c7e495c98789eb993f7e7c, type: 3} + m_Sprite: {fileID: 21300000, guid: 2aa09e79e9eb3d74cb962b15849648f3, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab index c64f64a7..58a7e1ab 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/ShopLevel/Canvas.prefab @@ -330,7 +330,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 95995de0573834141b72741b08c59351, type: 3} + m_Sprite: {fileID: 21300000, guid: ed2ddfb0a2ddd2945af65cd7881b97e0, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -860,7 +860,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ddcb7afd00edf40b580ff0578ba769ca, type: 3} + m_Sprite: {fileID: 21300000, guid: 1817140589b2aa3449e3972236b874c5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -976,7 +976,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: 1 m_BestFit: 1 @@ -1130,7 +1130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b156ec0dd4c7425f959eb5daba597cc, type: 3} + m_Sprite: {fileID: 21300000, guid: 41d4ecc9e2cefff4babb89fa78a5ac78, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -11265,7 +11265,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 94d801fb3907346e98212732d7267807, type: 3} + m_Sprite: {fileID: 21300000, guid: ad8dde46c91fc7f4db2b42e6983fb2d6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11381,7 +11381,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: 1 m_BestFit: 1 @@ -11498,7 +11498,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, type: 3} + m_Sprite: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity index 073ccbf0..5b32688a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/StoreLevel.unity @@ -121,6 +121,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!114 &636499872 +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: 2007360780} --- !u!20 &1015955096 stripped Camera: m_CorrespondingSourceObject: {fileID: 9117079084301130544, guid: 021717b65b165374faa3fcffaafedfc2, @@ -196,6 +209,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 021717b65b165374faa3fcffaafedfc2, type: 3} +--- !u!114 &2007360780 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8660695105894842743, guid: 7a0e45165860f4e5099d690b636937a8, + type: 3} + m_PrefabInstance: {fileID: 8660695103961409415} + 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 &8660695103961409415 PrefabInstance: m_ObjectHideFlags: 0 @@ -207,19 +232,19 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 95995de0573834141b72741b08c59351, + objectReference: {fileID: 21300000, guid: ed2ddfb0a2ddd2945af65cd7881b97e0, type: 3} - target: {fileID: 8660695104521205934, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: ddcb7afd00edf40b580ff0578ba769ca, + objectReference: {fileID: 21300000, guid: 1817140589b2aa3449e3972236b874c5, type: 3} - target: {fileID: 8660695104846840910, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 3b156ec0dd4c7425f959eb5daba597cc, + objectReference: {fileID: 21300000, guid: 41d4ecc9e2cefff4babb89fa78a5ac78, type: 3} - target: {fileID: 8660695104952201896, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} @@ -380,13 +405,13 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 94d801fb3907346e98212732d7267807, + objectReference: {fileID: 21300000, guid: ad8dde46c91fc7f4db2b42e6983fb2d6, type: 3} - target: {fileID: 8660695105894842743, guid: 7a0e45165860f4e5099d690b636937a8, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 80b5bbe9faf984e9bb1b75d068890e40, + objectReference: {fileID: 21300000, guid: 4372cbbdff809454881ff362f84c540c, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a0e45165860f4e5099d690b636937a8, type: 3}