diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index 3412e949..1c0f0e5c 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 &22296242 -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: 55686915} --- !u!1001 &55686909 PrefabInstance: m_ObjectHideFlags: 0 @@ -799,7 +786,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &92922530 +--- !u!114 &289108742 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -811,8 +798,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686918} ---- !u!114 &431592529 + mTarget: {fileID: 55686912} +--- !u!114 &420869077 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -824,7 +811,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686911} + mTarget: {fileID: 55686921} --- !u!114 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -838,33 +825,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686921} ---- !u!114 &571125603 -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: 55686914} ---- !u!114 &801028859 -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: 55686919} ---- !u!114 &983214044 +--- !u!114 &630757454 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -877,7 +838,46 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686913} ---- !u!114 &1148965748 +--- !u!114 &807882696 +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: 55686914} +--- !u!114 &900096721 +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: 55686915} +--- !u!114 &1100311687 +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: 55686918} +--- !u!114 &1367802505 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -903,6 +903,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 55686910} +--- !u!114 &1841430514 +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: 55686916} --- !u!114 &1877237825 MonoBehaviour: m_ObjectHideFlags: 0 @@ -991,20 +1004,7 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1944170687} m_PrefabAsset: {fileID: 0} ---- !u!114 &1962071691 -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: 55686916} ---- !u!114 &2053093782 +--- !u!114 &1964113741 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1016,4 +1016,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 55686912} + mTarget: {fileID: 55686919} +--- !u!114 &2131480984 +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: 55686911} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index 18c9b522..12f5f9a7 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2485849122900942437} - component: {fileID: 9199389168504249485} - component: {fileID: 968457695405726169} - - component: {fileID: 5631139686551261399} + - component: {fileID: 456444784329462386} m_Layer: 5 m_Name: Cooked m_TagString: Untagged @@ -75,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5631139686551261399 +--- !u!114 &456444784329462386 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -101,7 +101,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -4618,7 +4619,7 @@ GameObject: - component: {fileID: 5723880628462744749} - component: {fileID: 1455510406861626823} - component: {fileID: 7673446267768404167} - - component: {fileID: 6165330503802040305} + - component: {fileID: 6528176445042821859} m_Layer: 5 m_Name: Cooked m_TagString: Untagged @@ -4682,7 +4683,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6165330503802040305 +--- !u!114 &6528176445042821859 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4708,7 +4709,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -5772,7 +5774,7 @@ GameObject: - component: {fileID: 561343442237248935} - component: {fileID: 7860309679329529339} - component: {fileID: 2362301707389979568} - - component: {fileID: 1948332030859109782} + - component: {fileID: 7952241339826361266} m_Layer: 5 m_Name: Cooked m_TagString: Untagged @@ -5836,7 +5838,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1948332030859109782 +--- !u!114 &7952241339826361266 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5862,7 +5864,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: []