From 7841110f0afc58bd737e6b59094ef4b714404582 Mon Sep 17 00:00:00 2001 From: atusi Date: Thu, 3 Feb 2022 15:49:04 +0900 Subject: [PATCH 1/3] update GA package --- popcorn/Assets/GameAnalytics.meta | 5 + popcorn/Assets/GameAnalytics/Readme.txt | 59 +++++++++ popcorn/Assets/GameAnalytics/Readme.txt.meta | 4 + .../Resources/GameAnalytics/Settings.asset | 116 +++++++++++++++++- 4 files changed, 178 insertions(+), 6 deletions(-) create mode 100644 popcorn/Assets/GameAnalytics.meta create mode 100644 popcorn/Assets/GameAnalytics/Readme.txt create mode 100644 popcorn/Assets/GameAnalytics/Readme.txt.meta diff --git a/popcorn/Assets/GameAnalytics.meta b/popcorn/Assets/GameAnalytics.meta new file mode 100644 index 00000000..171fc847 --- /dev/null +++ b/popcorn/Assets/GameAnalytics.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 1857a5c95790a4603b443911d9111458 +folderAsset: yes +DefaultImporter: + userData: diff --git a/popcorn/Assets/GameAnalytics/Readme.txt b/popcorn/Assets/GameAnalytics/Readme.txt new file mode 100644 index 00000000..02ceb000 --- /dev/null +++ b/popcorn/Assets/GameAnalytics/Readme.txt @@ -0,0 +1,59 @@ +------------------------------------------------------ +GameAnalytics Unity SDK +------------------------------------------------------ + +Thank you for downloading the GameAnalytics Unity SDK. + +Visit our website at: +http://www.gameanalytics.com/ + +Review the Unity SDK documentation at: +https://gameanalytics.com/docs/unity-sdk + +------------------------------------------------------ +GETTING STARTED +------------------------------------------------------ + +A GameAnalytics menu has been added under Window in +the menu bar. + +Create a GameAnalytics Settings resource by going to: +Window > GameAnalytics > Select Settings + +The Settings resource allows you to create an account, +studio and game, login to get your game key and secret +key, and setup Custom Dimensions, Resource Types, and +other advanced settings. When the Settings resource is +selected you can also check what version of the SDK you +are currently using. + +------------------------------------------------------ +iOS +------------------------------------------------------ + +Xcode must be configured to work with GameAnalytics. + +For more information about the build process go here: +https://gameanalytics.com/docs/unity-sdk#ios-build + +------------------------------------------------------ +Android +------------------------------------------------------ + +Unity 5 can build the SDK for the Android platform without +any modification. + +https://gameanalytics.com/docs/unity-sdk#android-build + +------------------------------------------------------ + +To use the SDK on Unity 4.6.x+ please +download the compatible SDK here: + +http://download.gameanalytics.com/unity/GA_SDK_UNITY_4.unitypackage + +------------------------------------------------------ + +Have fun using GameAnalytics! + +The GameAnalytics Team diff --git a/popcorn/Assets/GameAnalytics/Readme.txt.meta b/popcorn/Assets/GameAnalytics/Readme.txt.meta new file mode 100644 index 00000000..4d0fa28c --- /dev/null +++ b/popcorn/Assets/GameAnalytics/Readme.txt.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 203f41d2ec7d045eba31db4f0a89cbc3 +TextScriptImporter: + userData: diff --git a/popcorn/Assets/Resources/GameAnalytics/Settings.asset b/popcorn/Assets/Resources/GameAnalytics/Settings.asset index de051c6f..c2da2f6f 100644 --- a/popcorn/Assets/Resources/GameAnalytics/Settings.asset +++ b/popcorn/Assets/Resources/GameAnalytics/Settings.asset @@ -47,17 +47,121 @@ MonoBehaviour: SelectedOrganization: 0300000003000000 SelectedStudio: 0100000001000000 SelectedGame: 0500000006000000 - NewVersion: 7.3.2 - Changes: '7.3.2 + NewVersion: 7.3.17 + Changes: '7.3.19 - - fixed missing custom event fields for when trying to fix - missing session end events + - updated dependencies + + + 7.3.18 + + - fixed fps event + script to still run coroutines when Time.timeScale = 0 by using WaitForSecondsRealtime + instead of WaitForSeconds + + + 7.3.17 + + - added method manually update gamekey + and secretkey + + + 7.3.16 + + - fixed uwp build errors + + + 7.3.15 + + - + changed frequency logic for fps events + + + 7.3.14 + + - small fix + + + 7.3.13 + + - + fixed crash for android builds + + + 7.3.12 + + - removed imei identifiers and + other alternative identifiers from user identifier logic (android) + + + 7.3.11 + + - + updated dependency to external dependency resolver + + + 7.3.10 + + - adding + missing .meta file for upm release + + - switched to using openupm for scoped + registry when using upm, please update the upm setup for the unity sdk + + + 7.3.9 + + - + fixed upm package.json + + + 7.3.8 + + - fixed upm dependecy + + + 7.3.7 + + - + added depedencies.xml for upm release + + + 7.3.6 + + - fixed playmaker bugs + + + 7.3.5 + + - + changed settings to have FPS events turned off by default + + + 7.3.4 + + - + added error events to be sent for invalid custom event fields used + + - added + optional mergeFields argument to event methods to merge with global custom fields + instead of overwrite them + + + 7.3.3 + + - playmaker fixes + + + 7.3.2 + + - + fixed missing custom event fields for when trying to fix missing session end + events 7.3.1 - - fixed editor ui bug with games - with the same name' + - fixed editor ui bug with games with the same name' SignUpOpen: 1 StudioName: jp.usaya GameName: popcorn From d9b6faed13dca329adbe338e9d39a42dc948acbe Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 3 Feb 2022 19:11:41 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=AE=E9=81=8A?= =?UTF-8?q?=E3=81=B3=E6=96=B9=E3=83=9C=E3=82=BF=E3=83=B3=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E3=81=8C=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=9F=E3=81=9F?= =?UTF-8?q?=E3=82=81=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scenes/Settings/SettingsDialog.unity | 41 ------------------- 1 file changed, 41 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity index b93d5a4f..175ff518 100644 --- a/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity +++ b/popcorn/Assets/MyGame/Scenes/Settings/SettingsDialog.unity @@ -3220,7 +3220,6 @@ GameObject: - component: {fileID: 1794914334} - component: {fileID: 1794914337} - component: {fileID: 1794914336} - - component: {fileID: 1794914335} m_Layer: 5 m_Name: Image_text m_TagString: Untagged @@ -3247,46 +3246,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 4} m_SizeDelta: {x: 96, y: 40} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1794914335 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1794914333} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} - m_Name: - m_EditorClassIdentifier: - mTerm: ui_button_icon_close_logo_small - mTermSecondary: - PrimaryTermModifier: 0 - SecondaryTermModifier: 0 - TermPrefix: - TermSuffix: - LocalizeOnAwake: 1 - IgnoreRTL: 0 - MaxCharactersInRTL: 0 - IgnoreNumbersInRTL: 1 - CorrectAlignmentForRTL: 1 - AddSpacesToJoinedLanguages: 0 - AllowLocalizedParameters: 1 - AllowParameters: 1 - TranslatedObjects: - - {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} - LocalizeEvent: - m_PersistentCalls: - m_Calls: [] - AlwaysForceLocalize: 0 - LocalizeCallBack: - Target: {fileID: 0} - MethodName: - mGUI_ShowReferences: 0 - mGUI_ShowTems: 1 - mGUI_ShowCallback: 0 - mLocalizeTarget: {fileID: 2060162125} - mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!114 &1794914336 MonoBehaviour: m_ObjectHideFlags: 0 From be8f8549335a4f8a7ac28402959d7e0fbd063473 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 4 Feb 2022 14:32:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=9F=E3=83=83=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=8A=9C=E3=81=91=E7=94=BB=E5=83=8F=E5=86=8D=E5=BA=A6?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/MyGame/Scenes/Main/Mission.unity | 357 ++++++++++++------ .../Main/Prefabs/Mission/MissionCanvas.prefab | 12 +- 2 files changed, 251 insertions(+), 118 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index f488c073..3412e949 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -121,18 +121,19 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &48717369 stripped +--- !u!114 &22296242 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998, - type: 3} - m_PrefabInstance: {fileID: 55686909} + 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: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} m_Name: m_EditorClassIdentifier: + mTarget: {fileID: 55686915} --- !u!1001 &55686909 PrefabInstance: m_ObjectHideFlags: 0 @@ -140,6 +141,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 73786970766650198, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 470528878150322008, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -197,6 +203,22 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1948332030859109782, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 1877237825} + - target: {fileID: 1948332030859109782, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: TranslatedObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1948332030859109782, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: TranslatedObjects.Array.data[0] + value: + objectReference: {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, + type: 3} - target: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_Sprite @@ -574,6 +596,43 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} + - target: {fileID: 5631139686551261399, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 535073476} + - target: {fileID: 5631139686551261399, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: TranslatedObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5631139686551261399, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: TranslatedObjects.Array.data[0] + value: + objectReference: {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, + type: 3} + - target: {fileID: 5648759929853669395, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6165330503802040305, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 1526372568} + - target: {fileID: 6165330503802040305, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: TranslatedObjects.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6165330503802040305, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + type: 3} + propertyPath: TranslatedObjects.Array.data[0] + value: + objectReference: {fileID: 21300000, guid: 5d1e87eb3bb45484faaeea95f63dc072, + type: 3} - target: {fileID: 6700388378296198159, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} propertyPath: m_AnchorMax.x @@ -596,9 +655,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} ---- !u!114 &73758579 stripped +--- !u!114 &55686910 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + m_CorrespondingSourceObject: {fileID: 7673446267768404167, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} m_PrefabInstance: {fileID: 55686909} m_PrefabAsset: {fileID: 0} @@ -608,19 +667,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &230435945 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 &341744830 stripped +--- !u!114 &55686911 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 518689044540430268, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -632,9 +679,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &360061174 stripped +--- !u!114 &55686912 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639679015166989, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + m_CorrespondingSourceObject: {fileID: 5315427058870261576, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} m_PrefabInstance: {fileID: 55686909} m_PrefabAsset: {fileID: 0} @@ -644,73 +691,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &885865648 stripped +--- !u!114 &55686913 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 &1032004766 -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: 1092775355} ---- !u!114 &1064145805 -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: 230435945} ---- !u!114 &1089516913 -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: 48717369} ---- !u!114 &1092338131 -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: 73758579} ---- !u!114 &1092775355 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2660639678406526125, guid: 66c0408cd45e7422cb6d59d2bdf4e998, + m_CorrespondingSourceObject: {fileID: 2088785184059642796, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} m_PrefabInstance: {fileID: 55686909} m_PrefabAsset: {fileID: 0} @@ -720,20 +703,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1178903781 -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: 885865648} ---- !u!114 &1200797307 stripped +--- !u!114 &55686914 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3089254109135973278, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -745,7 +715,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1479870730 stripped +--- !u!114 &55686915 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 &55686916 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2660639677480706697, guid: 66c0408cd45e7422cb6d59d2bdf4e998, type: 3} @@ -757,7 +739,67 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1538003472 +--- !u!114 &55686917 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 &55686918 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 &55686919 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 &55686920 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2362301707389979568, 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 &55686921 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 968457695405726169, 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 &92922530 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -769,8 +811,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 360061174} ---- !u!114 &1660846284 + mTarget: {fileID: 55686918} +--- !u!114 &431592529 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -782,8 +824,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1200797307} ---- !u!114 &1868087303 + mTarget: {fileID: 55686911} +--- !u!114 &535073476 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -795,8 +837,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 341744830} ---- !u!114 &1895385517 + mTarget: {fileID: 55686921} +--- !u!114 &571125603 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -805,10 +847,75 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1479870730} + 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 +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: 55686913} +--- !u!114 &1148965748 +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: 55686917} +--- !u!114 &1526372568 +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: 55686910} +--- !u!114 &1877237825 +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: 55686920} --- !u!1001 &1944170687 PrefabInstance: m_ObjectHideFlags: 0 @@ -884,3 +991,29 @@ 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 +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: 55686912} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index eb8c6ab5..18c9b522 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: 6099069952261714468} + - component: {fileID: 5631139686551261399} 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 &6099069952261714468 +--- !u!114 &5631139686551261399 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4618,7 +4618,7 @@ GameObject: - component: {fileID: 5723880628462744749} - component: {fileID: 1455510406861626823} - component: {fileID: 7673446267768404167} - - component: {fileID: 412364985173912892} + - component: {fileID: 6165330503802040305} m_Layer: 5 m_Name: Cooked m_TagString: Untagged @@ -4682,7 +4682,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &412364985173912892 +--- !u!114 &6165330503802040305 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5772,7 +5772,7 @@ GameObject: - component: {fileID: 561343442237248935} - component: {fileID: 7860309679329529339} - component: {fileID: 2362301707389979568} - - component: {fileID: 8529197286358042402} + - component: {fileID: 1948332030859109782} m_Layer: 5 m_Name: Cooked m_TagString: Untagged @@ -5836,7 +5836,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8529197286358042402 +--- !u!114 &1948332030859109782 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0}