From 7fa606968dc326384abaa6cbad42ec18e9a5d2b8 Mon Sep 17 00:00:00 2001 From: Eschenko_D Date: Wed, 12 Jan 2022 16:34:26 +0200 Subject: [PATCH] Release 2.0.0 --- CHANGELOG.md | 8 + Editor/ConsentRequestParametersEditor.cs | 85 ++- Editor/PostprocessiOSBuild.cs | 29 -- Editor/PostprocessiOSBuild.cs.meta | 11 - Plugins.meta | 8 - Plugins/iOS.meta | 8 - Plugins/iOS/CASUAppTracking.m | 28 - Plugins/iOS/CASUAppTracking.m.meta | 39 -- Prefabs/ConsentUITemplate.prefab | 631 +++++++++++++++++++---- Prefabs/NetworkPolicy.prefab | 148 +++++- Runtime/AppTrackingTransparency.cs | 38 +- Runtime/ConsentClient.cs | 35 +- Runtime/ConsentRequestParameters.cs | 8 - Runtime/MediationSettingsUI.cs | 35 +- Runtime/UserConsent.cs | 8 +- Runtime/UserConsentUI.cs | 56 +- Textures/cas_arrow.png | Bin 7573 -> 2705 bytes Textures/cas_panel.png.meta | 13 +- Textures/cas_settings.png | Bin 0 -> 10507 bytes Textures/cas_settings.png.meta | 90 ++++ package.json | 4 +- 21 files changed, 856 insertions(+), 426 deletions(-) delete mode 100644 Editor/PostprocessiOSBuild.cs delete mode 100644 Editor/PostprocessiOSBuild.cs.meta delete mode 100644 Plugins.meta delete mode 100644 Plugins/iOS.meta delete mode 100644 Plugins/iOS/CASUAppTracking.m delete mode 100644 Plugins/iOS/CASUAppTracking.m.meta create mode 100644 Textures/cas_settings.png create mode 100644 Textures/cas_settings.png.meta diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ffb99c..8113e91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Clever Ads Solutions Unity Plugin Change Log +## [2.0.0] - 2022-01-12 +### Dependencies +- CleverAdsSolutions - [2.6.1](https://github.com/cleveradssolutions/CAS-Unity/releases) +### Features +- Updated user interface prefabes. +- AppTrackingTransparency and NSLocationTrackingDescription implementation migrated to CAS Unity plguin. +- Addded AppTrackingTransparency request in any case. + ## [1.2.7] - 2021-09-07 ### Dependencies - CleverAdsSolutions - [2.5.2](https://github.com/cleveradssolutions/CAS-Unity/releases) diff --git a/Editor/ConsentRequestParametersEditor.cs b/Editor/ConsentRequestParametersEditor.cs index 9252fab..6680b58 100644 --- a/Editor/ConsentRequestParametersEditor.cs +++ b/Editor/ConsentRequestParametersEditor.cs @@ -33,7 +33,6 @@ public class ConsentRequestParametersEditor : Editor private SerializedProperty settingsTogglePrefabProp; private SerializedProperty privacyPolicyUrlProp; private SerializedProperty termsOfUseUrlProp; - private SerializedProperty trackingUsageDescriptionProp; private ReorderableList privacyPolicyList; private ReorderableList termsOfUseList; @@ -55,7 +54,6 @@ private void OnEnable() settingsTogglePrefabProp = props.FindProperty( "settingsTogglePrefab" ); privacyPolicyUrlProp = props.FindProperty( "privacyPolicyUrl" ); termsOfUseUrlProp = props.FindProperty( "termsOfUseUrl" ); - trackingUsageDescriptionProp = props.FindProperty( "trackingUsageDescription" ); privacyPolicyList = new ReorderableList( props, privacyPolicyUrlProp, true, true, true, true ) { @@ -93,59 +91,57 @@ public override void OnInspectorGUI() var obj = serializedObject; obj.UpdateIfRequiredOrScript(); - EditorGUILayout.PropertyField( withAudienceDefinitionProp ); - EditorGUILayout.PropertyField( withDeclineOptionProp ); - EditorGUILayout.PropertyField( showInEditorProp ); - EditorGUILayout.Space(); - - currentListProp = privacyPolicyUrlProp; - privacyPolicyList.DoLayoutList(); - currentListProp = termsOfUseUrlProp; - termsOfUseList.DoLayoutList(); - EditorGUILayout.Space(); + showInEditorProp.boolValue = GUILayout.Toggle( + showInEditorProp.boolValue, + " Test in Unity Editor" ); + withAudienceDefinitionProp.boolValue = GUILayout.Toggle( + withAudienceDefinitionProp.boolValue, + " With Age of audience requeset" ); + EditorGUI.indentLevel++; + EditorGUILayout.HelpBox( "The user is prompted for the year of birth and the audience is determined automatically.", MessageType.None ); + EditorGUI.indentLevel--; + withRequestTrackingTransparencyProp.boolValue = GUILayout.Toggle( + withRequestTrackingTransparencyProp.boolValue, + " With iOS App Tracking Transparency requeset" ); + EditorGUI.indentLevel++; + EditorGUILayout.HelpBox( "The iOS 14.5+ users is prompted for permission to track the Advertising ID.", MessageType.None ); + EditorGUI.indentLevel--; + withDeclineOptionProp.boolValue = GUILayout.Toggle( + withDeclineOptionProp.boolValue, + " With option of Decline consent" ); + EditorGUI.indentLevel++; + EditorGUILayout.HelpBox( "The user is given the choice to opt out dialog.", MessageType.None ); + EditorGUI.indentLevel--; - DrawPrefabSelector( "Consent UI Prefab", - uiPrefabProp, templateUIPrefabName, customUIPrefabName, - typeof( UserConsentUI ) ); - - HelpStyles.BeginBoxScope(); bool enableTogglePrefab = withMediationSettingsProp.boolValue; - if (enableTogglePrefab != EditorGUILayout.ToggleLeft( "With Mediaiton Settings", enableTogglePrefab )) + if (enableTogglePrefab != EditorGUILayout.ToggleLeft( "With Mediaiton Networks settings", enableTogglePrefab )) { enableTogglePrefab = !enableTogglePrefab; withMediationSettingsProp.boolValue = enableTogglePrefab; } EditorGUI.BeginDisabledGroup( !enableTogglePrefab ); - DrawPrefabSelector( "Toggle UI Prefab", + DrawPrefabSelector( "Network UI Prefab", settingsTogglePrefabProp, templateSettingsPrefabName, customSettingsPrefabName, typeof( MediationPolicyUI ) ); EditorGUI.EndDisabledGroup(); if (!enableTogglePrefab) settingsTogglePrefabProp.objectReferenceValue = null; - HelpStyles.EndBoxScope(); + EditorGUI.indentLevel++; + EditorGUILayout.HelpBox( "The user is provided with advanced consent settings for each active network in the game.", MessageType.None ); + EditorGUI.indentLevel--; - HelpStyles.BeginBoxScope(); - var activeTracking = withRequestTrackingTransparencyProp.boolValue; - if (activeTracking != GUILayout.Toggle( activeTracking, - "With iOS App Tracking Transparency requeset" )) - { - activeTracking = !activeTracking; - withRequestTrackingTransparencyProp.boolValue = activeTracking; - } - EditorGUI.BeginDisabledGroup( !activeTracking ); - EditorGUILayout.BeginHorizontal(); - EditorGUILayout.LabelField( "Tracking Usage Description:" ); - if (GUILayout.Button( "Default", EditorStyles.miniButton, GUILayout.ExpandWidth( false ) )) - trackingUsageDescriptionProp.stringValue = locationUsageDefaultDescription; - if (GUILayout.Button( "Info", EditorStyles.miniButton, GUILayout.ExpandWidth( false ) )) - Application.OpenURL( configuringPrivacyURL ); - EditorGUILayout.EndHorizontal(); - trackingUsageDescriptionProp.stringValue = - EditorGUILayout.TextArea( trackingUsageDescriptionProp.stringValue, HelpStyles.wordWrapTextAred ); - EditorGUILayout.HelpBox( "NSUserTrackingUsageDescription key with a custom message describing your usage location tracking to AppTrackingTransparency.Request().", MessageType.None ); - EditorGUI.EndDisabledGroup(); - HelpStyles.EndBoxScope(); + EditorGUILayout.Space(); + DrawPrefabSelector( "Consent UI Prefab", + uiPrefabProp, templateUIPrefabName, customUIPrefabName, + typeof( UserConsentUI ) ); + EditorGUILayout.Space(); + currentListProp = privacyPolicyUrlProp; + privacyPolicyList.DoLayoutList(); + currentListProp = termsOfUseUrlProp; + termsOfUseList.DoLayoutList(); + + EditorGUILayout.HelpBox( "Use 'Edit > Clear All PlayerPrefs' menu to reset consent state in Unity Editor.", MessageType.Info ); obj.ApplyModifiedProperties(); } @@ -154,10 +150,10 @@ private void DrawURLElement( Rect rect, int index, bool isActive, bool isFocused var height = rect.height; var item = currentListProp.GetArrayElementAtIndex( index ); rect.yMin += 1; - rect.yMax -= 1; + rect.yMax -= 3; if (currentListProp.arraySize > 1) { - rect.yMax -= height * 0.5f + 2; + rect.yMax -= height * 0.5f; var id = item.FindPropertyRelative( "id" ); var label = ( index == 0 ? "Preferred " : "Platform " ); @@ -198,9 +194,10 @@ private void DrawPrefabSelector( string title, SerializedProperty prop, string t prop.objectReferenceValue = LoadUITemplatePrefab( templateName ); } EditorGUILayout.EndHorizontal(); + EditorGUI.indentLevel++; prop.objectReferenceValue = EditorGUILayout.ObjectField( prop.objectReferenceValue, objType, false ); - EditorGUILayout.Space(); + EditorGUI.indentLevel--; } #region Utils diff --git a/Editor/PostprocessiOSBuild.cs b/Editor/PostprocessiOSBuild.cs deleted file mode 100644 index af98af0..0000000 --- a/Editor/PostprocessiOSBuild.cs +++ /dev/null @@ -1,29 +0,0 @@ -#if UNITY_IOS || CASDeveloper -using System.IO; -using UnityEditor; -using UnityEditor.Callbacks; -using UnityEditor.iOS.Xcode; -using UnityEngine; - -namespace CAS.UserConsent -{ - internal class PostprocessiOSBuild - { - [PostProcessBuild] - public static void OnPostProcessBuild( BuildTarget buildTarget, string path ) - { - if (buildTarget != BuildTarget.iOS) - return; - var parameters = UserConsent.BuildRequest(); - var trakingUsage = parameters.defaultIOSTrakingUsageDescription; - if (string.IsNullOrEmpty( trakingUsage )) - return; - string plistPath = Path.Combine( path, "Info.plist" ); - PlistDocument plist = new PlistDocument(); - plist.ReadFromFile( plistPath ); - plist.root.SetString( "NSUserTrackingUsageDescription", trakingUsage ); - File.WriteAllText( plistPath, plist.WriteToString() ); - } - } -} -#endif \ No newline at end of file diff --git a/Editor/PostprocessiOSBuild.cs.meta b/Editor/PostprocessiOSBuild.cs.meta deleted file mode 100644 index 476ec64..0000000 --- a/Editor/PostprocessiOSBuild.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1a3a0d97b01174e6bb50bbe829e0cf59 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Plugins.meta b/Plugins.meta deleted file mode 100644 index ad30530..0000000 --- a/Plugins.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 86a762e8959eb4c4fa0e32106d781b77 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Plugins/iOS.meta b/Plugins/iOS.meta deleted file mode 100644 index f30b802..0000000 --- a/Plugins/iOS.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d587a3d1e37954321b30f834393e2d5e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Plugins/iOS/CASUAppTracking.m b/Plugins/iOS/CASUAppTracking.m deleted file mode 100644 index bb7963e..0000000 --- a/Plugins/iOS/CASUAppTracking.m +++ /dev/null @@ -1,28 +0,0 @@ -// -// CASUAppTracking.m -// CASUnityPlugin -// -// Copyright © 2021 Clever Ads Solutions. All rights reserved. -// - -#import - -typedef void (*CASUTrackingStatusCallback)(NSInteger status); - -void CASURequestTracking(CASUTrackingStatusCallback callback) -{ - if (@available(iOS 14, *)) { - [ATTrackingManager - requestTrackingAuthorizationWithCompletionHandler:^(ATTrackingManagerAuthorizationStatus status) { - if (callback) { - dispatch_async(dispatch_get_main_queue(), ^{ - callback((int)status); - }); - } - }]; - } else { - if (callback) { - callback(3); - } - } -} diff --git a/Plugins/iOS/CASUAppTracking.m.meta b/Plugins/iOS/CASUAppTracking.m.meta deleted file mode 100644 index 1f3fd4c..0000000 --- a/Plugins/iOS/CASUAppTracking.m.meta +++ /dev/null @@ -1,39 +0,0 @@ -fileFormatVersion: 2 -guid: 72906c7255ca6435c99f5a1a15b0d7c9 -labels: -- CleverAdsSolutions -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - - first: - tvOS: tvOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Prefabs/ConsentUITemplate.prefab b/Prefabs/ConsentUITemplate.prefab index 7ae7631..d3a3454 100644 --- a/Prefabs/ConsentUITemplate.prefab +++ b/Prefabs/ConsentUITemplate.prefab @@ -153,6 +153,7 @@ GameObject: - component: {fileID: 48348062541502625} - component: {fileID: 48348062541502630} - component: {fileID: 48348062541502631} + - component: {fileID: 3662867873672439149} m_Layer: 5 m_Name: Accept m_TagString: Untagged @@ -173,12 +174,12 @@ RectTransform: m_Children: - {fileID: 48348062495784245} m_Father: {fileID: 48348064263290925} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.08331, y: -24.204758} - m_SizeDelta: {x: 78.83333, y: 48.409515} + m_AnchoredPosition: {x: 212.29999, y: -28.755} + m_SizeDelta: {x: 138.2, y: 57.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348062541502625 CanvasRenderer: @@ -201,12 +202,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4009434, g: 0.8565133, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -266,6 +267,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &3662867873672439149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348062541502629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &48348062614071354 GameObject: m_ObjectHideFlags: 0 @@ -278,6 +294,8 @@ GameObject: - component: {fileID: 48348062614071351} - component: {fileID: 48348062614071348} - component: {fileID: 48348062614071350} + - component: {fileID: 414940724657304795} + - component: {fileID: 5372471227978997023} m_Layer: 5 m_Name: Denied m_TagString: Untagged @@ -298,12 +316,12 @@ RectTransform: m_Children: - {fileID: 48348064096642488} m_Father: {fileID: 48348062625449506} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 113.390015, y: -24.204994} - m_SizeDelta: {x: 72.26001, y: 48.40999} + m_AnchoredPosition: {x: 68.75, y: -25} + m_SizeDelta: {x: 137.5, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348062614071351 CanvasRenderer: @@ -326,12 +344,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.88461196, g: 0.9485936, b: 0.9716981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -380,6 +398,36 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &414940724657304795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348062614071354} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 4, y: -4} + m_UseGraphicAlpha: 1 +--- !u!114 &5372471227978997023 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348062614071354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &48348062620002374 GameObject: m_ObjectHideFlags: 0 @@ -494,7 +542,7 @@ MonoBehaviour: m_HandleRect: {fileID: 48348063612381030} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -527,16 +575,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 48348064038300479} - {fileID: 48348062614071349} - {fileID: 6378617395406947628} m_Father: {fileID: 48348064575477781} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.89, y: 33.8} - m_SizeDelta: {x: 226.78003, y: 48.40999} + m_AnchoredPosition: {x: 0, y: 70} + m_SizeDelta: {x: 280, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &48348062625449501 MonoBehaviour: @@ -772,7 +819,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -65, y: 57} + m_AnchoredPosition: {x: -93, y: 57} m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348062807131854 @@ -849,7 +896,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 220, y: 57} + m_AnchoredPosition: {x: 248, y: 57} m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348062856447049 @@ -926,8 +973,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.03, y: 1} m_AnchorMax: {x: 0.97, y: 1} - m_AnchoredPosition: {x: 0, y: -90} - m_SizeDelta: {x: 0, y: 135} + m_AnchoredPosition: {x: 0, y: -80} + m_SizeDelta: {x: 0, y: 145} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063152031515 CanvasRenderer: @@ -998,7 +1045,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 65, y: 57} + m_AnchoredPosition: {x: 93, y: 57} m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063175071117 @@ -1130,6 +1177,7 @@ GameObject: - component: {fileID: 48348063205091764} - component: {fileID: 48348063205091765} - component: {fileID: 48348063205091770} + - component: {fileID: 6638877543334633794} m_Layer: 5 m_Name: Deselect All m_TagString: Untagged @@ -1149,13 +1197,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 48348062791754400} - m_Father: {fileID: 48348064263290925} + m_Father: {fileID: 8115628680030793671} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 123.24999, y: -24.204758} - m_SizeDelta: {x: 78.83333, y: 48.409515} + m_AnchoredPosition: {x: 69.1, y: -44.3825} + m_SizeDelta: {x: 138.2, y: 26.255} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063205091764 CanvasRenderer: @@ -1178,12 +1226,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.88461196, g: 0.9485936, b: 0.9716981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1243,6 +1291,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &6638877543334633794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348063205091768} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &48348063352503382 GameObject: m_ObjectHideFlags: 0 @@ -1273,14 +1336,15 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 5837118365823080264} m_Father: {fileID: 48348063199003343} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -90, y: -55} - m_SizeDelta: {x: 42.3, y: 43.9} + m_AnchoredPosition: {x: -83.9, y: -39.1} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063352503378 CanvasRenderer: @@ -1303,12 +1367,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0990b8511659343e8ad2a6415f2d1859, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1353,7 +1417,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 48348063352503376} + m_TargetGraphic: {fileID: 2235231852604298873} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -1435,7 +1499,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -14.000007} m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063354622639 @@ -1512,7 +1576,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000010577402} + m_AnchoredPosition: {x: 0, y: -0.0000024091607} m_SizeDelta: {x: -0.000030517578, y: 10} m_Pivot: {x: 0, y: 1} --- !u!114 &48348063406638305 @@ -1655,6 +1719,7 @@ GameObject: - component: {fileID: 48348063544628666} - component: {fileID: 48348063544628667} - component: {fileID: 48348063544628664} + - component: {fileID: 33754273765120219} m_Layer: 5 m_Name: Select All m_TagString: Untagged @@ -1674,13 +1739,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 48348064559115253} - m_Father: {fileID: 48348064263290925} + m_Father: {fileID: 8115628680030793671} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.416668, y: -24.204758} - m_SizeDelta: {x: 78.83333, y: 48.409515} + m_AnchoredPosition: {x: 69.1, y: -13.1275} + m_SizeDelta: {x: 138.2, y: 26.255} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063544628666 CanvasRenderer: @@ -1703,12 +1768,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.88461196, g: 0.9485936, b: 0.9716981, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1768,6 +1833,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &33754273765120219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348063544628670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &48348063545478076 GameObject: m_ObjectHideFlags: 0 @@ -2141,7 +2221,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.9999999} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -2214,10 +2294,10 @@ RectTransform: m_Father: {fileID: 48348063954614744} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.07, y: 1} - m_AnchorMax: {x: 0.93, y: 1} - m_AnchoredPosition: {x: 0, y: -346.54} - m_SizeDelta: {x: 0, y: 313.71155} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -343.63028} + m_SizeDelta: {x: 279.6, y: 307.8921} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063620916325 CanvasRenderer: @@ -2384,7 +2464,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -220, y: 57} + m_AnchoredPosition: {x: -248, y: 57} m_SizeDelta: {x: 90, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348063775683387 @@ -2505,6 +2585,7 @@ GameObject: - component: {fileID: 48348064008543004} - component: {fileID: 48348064008543005} - component: {fileID: 48348064008543010} + - component: {fileID: 1096093440654897436} m_Layer: 5 m_Name: Ok m_TagString: Untagged @@ -2553,12 +2634,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4, g: 0.85490197, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2618,6 +2699,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &1096093440654897436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348064008543008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &48348064038300476 GameObject: m_ObjectHideFlags: 0 @@ -2649,13 +2745,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 48348064393590655} - m_Father: {fileID: 48348062625449506} - m_RootOrder: 0 + m_Father: {fileID: 48348064575477781} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 36.130005, y: -24.204994} - m_SizeDelta: {x: 72.26001, y: 48.40999} + m_AnchoredPosition: {x: 26, y: -26} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348064038300472 CanvasRenderer: @@ -2678,14 +2774,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} - m_Type: 1 - m_PreserveAspect: 0 + m_Sprite: {fileID: 21300000, guid: ba84759b6b2644763a8b4b5f660c3a97, type: 3} + m_Type: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2884,6 +2980,7 @@ GameObject: - component: {fileID: 48348064253602523} - component: {fileID: 48348064253602520} - component: {fileID: 48348064253602521} + - component: {fileID: 4230467188303989392} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -2898,17 +2995,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 48348064253602526} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalRotation: {x: 0, y: -0, z: 0.976296, w: -0.21643949} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 48348064511136817} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 205} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 45, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348064253602520 CanvasRenderer: @@ -2931,7 +3028,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4, g: 0.85490197, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2945,6 +3042,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4230467188303989392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 48348064253602526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.6862745} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &48348064263290930 GameObject: m_ObjectHideFlags: 0 @@ -2973,16 +3085,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 48348063544628665} - - {fileID: 48348063205091771} + - {fileID: 8115628680030793671} - {fileID: 48348062541502628} m_Father: {fileID: 48348063954614744} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.000015259, y: 32} - m_SizeDelta: {x: 246.5, y: 48.409515} + m_AnchoredPosition: {x: 0, y: 68} + m_SizeDelta: {x: 281.4, y: 57.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &48348064263290924 MonoBehaviour: @@ -3026,7 +3137,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &48348064393590655 RectTransform: m_ObjectHideFlags: 0 @@ -3185,8 +3296,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 90, y: -55} - m_SizeDelta: {x: 42.3, y: 43.9} + m_AnchoredPosition: {x: 84.5, y: -39.09999} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &48348064511136818 CanvasRenderer: @@ -3690,6 +3801,7 @@ RectTransform: m_Children: - {fileID: 6378617394168751466} - {fileID: 6378617395662383899} + - {fileID: 48348064038300479} - {fileID: 48348062625449506} m_Father: {fileID: 6378617394226191200} m_RootOrder: 4 @@ -3707,6 +3819,160 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 48348064575477786} m_CullTransparentMesh: 0 +--- !u!1 &377221124145032494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3524990484684090270} + - component: {fileID: 623359614055664419} + - component: {fileID: 4709767384041771285} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3524990484684090270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377221124145032494} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6378617395942446379} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &623359614055664419 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377221124145032494} + m_CullTransparentMesh: 0 +--- !u!114 &4709767384041771285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377221124145032494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ____________ +--- !u!1 &2018815974985060217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2094144989790078903} + - component: {fileID: 6778791535696360384} + - component: {fileID: 1286008295262243720} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2094144989790078903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018815974985060217} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6378617395282631488} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6778791535696360384 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018815974985060217} + m_CullTransparentMesh: 0 +--- !u!114 &1286008295262243720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018815974985060217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: ____________ --- !u!1 &3623721124373350592 GameObject: m_ObjectHideFlags: 0 @@ -3718,6 +3984,7 @@ GameObject: - component: {fileID: 7020359311545998762} - component: {fileID: 4704463589497191026} - component: {fileID: 9152883303736444842} + - component: {fileID: 4228813599091909594} m_Layer: 5 m_Name: Field m_TagString: Untagged @@ -3741,7 +4008,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0, y: -54.999992} + m_AnchoredPosition: {x: -0, y: -69} m_SizeDelta: {x: 120, y: 45} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4704463589497191026 @@ -3765,12 +4032,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.8117647} + m_Color: {r: 0.8254717, g: 0.96096075, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3779,6 +4046,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4228813599091909594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3623721124373350592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6312534756924107867 GameObject: m_ObjectHideFlags: 0 @@ -3812,10 +4094,10 @@ RectTransform: m_Father: {fileID: 6378617394226191200} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 78} - m_SizeDelta: {x: 225, y: 30} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 16.8} + m_SizeDelta: {x: 0, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &873447579116203108 MonoBehaviour: @@ -3835,11 +4117,99 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 5 + m_Spacing: 10 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 +--- !u!1 &6354402913402611838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5837118365823080264} + - component: {fileID: 1168930148066039719} + - component: {fileID: 2235231852604298873} + - component: {fileID: 5418199745521731871} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5837118365823080264 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6354402913402611838} + m_LocalRotation: {x: 0, y: 0, z: -0.21643952, w: 0.97629607} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 48348063352503377} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -25} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 45, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1168930148066039719 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6354402913402611838} + m_CullTransparentMesh: 0 +--- !u!114 &2235231852604298873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6354402913402611838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.4, g: 0.85490197, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0990b8511659343e8ad2a6415f2d1859, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5418199745521731871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6354402913402611838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6378617394146771417 GameObject: m_ObjectHideFlags: 0 @@ -3870,12 +4240,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6378617395942446379} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -8, y: -8} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378617394146771420 CanvasRenderer: @@ -4343,12 +4713,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6378617395282631488} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -8, y: -8} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378617394430952957 CanvasRenderer: @@ -4492,6 +4862,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2094144989790078903} - {fileID: 6378617394430952955} m_Father: {fileID: 6725184885053005357} m_RootOrder: 1 @@ -4499,7 +4870,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 105, y: 30} + m_SizeDelta: {x: 132.2435, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378617395282631491 CanvasRenderer: @@ -4522,12 +4893,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4599,6 +4970,7 @@ GameObject: - component: {fileID: 6378617395406947631} - component: {fileID: 6378617395406947621} - component: {fileID: 6378617395406947626} + - component: {fileID: 3952198599410056845} m_Layer: 5 m_Name: Accept m_TagString: Untagged @@ -4619,12 +4991,12 @@ RectTransform: m_Children: - {fileID: 6378617394349402635} m_Father: {fileID: 48348062625449506} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 190.65002, y: -24.204994} - m_SizeDelta: {x: 72.26001, y: 48.40999} + m_AnchoredPosition: {x: 211.25, y: -25} + m_SizeDelta: {x: 137.5, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378617395406947631 CanvasRenderer: @@ -4647,12 +5019,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4009434, g: 0.8565133, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4701,6 +5073,21 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &3952198599410056845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6378617395406947627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6378617395662383898 GameObject: m_ObjectHideFlags: 0 @@ -5031,6 +5418,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3524990484684090270} - {fileID: 6378617394146771418} m_Father: {fileID: 6725184885053005357} m_RootOrder: 0 @@ -5038,7 +5426,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 105, y: 30} + m_SizeDelta: {x: 132.2435, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6378617395942446382 CanvasRenderer: @@ -5061,12 +5449,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5126,3 +5514,64 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &7407072944406619641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8115628680030793671} + - component: {fileID: 4232900423922786516} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8115628680030793671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7407072944406619641} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 48348063544628665} + - {fileID: 48348063205091771} + m_Father: {fileID: 48348064263290925} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 69.1, y: -28.755} + m_SizeDelta: {x: 138.2, y: 57.51} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4232900423922786516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7407072944406619641} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 diff --git a/Prefabs/NetworkPolicy.prefab b/Prefabs/NetworkPolicy.prefab index f3f97aa..39458ec 100644 --- a/Prefabs/NetworkPolicy.prefab +++ b/Prefabs/NetworkPolicy.prefab @@ -30,16 +30,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2614649273555961164} - {fileID: 2614649273632739444} - {fileID: 2614649273757039237} + - {fileID: 2614649273555961164} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_SizeDelta: {x: 400, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2614649272350555121 MonoBehaviour: @@ -130,6 +130,7 @@ GameObject: - component: {fileID: 2614649272655051545} - component: {fileID: 2614649272655051527} - component: {fileID: 9099393889505012680} + - component: {fileID: 2740606924324860641} m_Layer: 5 m_Name: Checkmark m_TagString: Untagged @@ -151,10 +152,10 @@ RectTransform: m_Father: {fileID: 2614649273632739444} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -4, y: -4} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 1.9} + m_SizeDelta: {x: 24, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2614649272655051527 CanvasRenderer: @@ -177,7 +178,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4, g: 0.85490197, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -191,6 +192,21 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2740606924324860641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2614649272655051546} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.79607844} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &2614649273555961165 GameObject: m_ObjectHideFlags: 0 @@ -221,14 +237,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2521302770969293841} - {fileID: 2614649274273741632} m_Father: {fileID: 2614649272350555122} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -9, y: 0} - m_SizeDelta: {x: -18, y: 0} + m_AnchorMin: {x: 0.6, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2614649273555961161 CanvasRenderer: @@ -251,7 +268,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -347,11 +364,11 @@ RectTransform: m_Children: - {fileID: 2614649272655051545} m_Father: {fileID: 2614649272350555122} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15, y: 0} m_SizeDelta: {x: 30, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2614649273632739442 @@ -375,13 +392,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.8666667} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14130e76a6b02484aae59b1ef1ec31dc, type: 3} - m_Type: 1 + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -419,12 +436,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2614649272350555122} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 7.5, y: 0} - m_SizeDelta: {x: -15, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.6, y: 1} + m_AnchoredPosition: {x: 15, y: 0} + m_SizeDelta: {x: -30, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2614649273757039235 CanvasRenderer: @@ -465,7 +482,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: Label --- !u!1 &2614649274273741633 GameObject: m_ObjectHideFlags: 0 @@ -496,7 +513,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2614649273555961164} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -543,3 +560,80 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Privacy Policy +--- !u!1 &2860153422914678993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2521302770969293841} + - component: {fileID: 3439246496035910057} + - component: {fileID: 1347161375762075609} + m_Layer: 5 + m_Name: Text (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2521302770969293841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860153422914678993} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2614649273555961164} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 1} + m_SizeDelta: {x: 0, y: -6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3439246496035910057 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860153422914678993} + m_CullTransparentMesh: 0 +--- !u!114 &1347161375762075609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860153422914678993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: __________ diff --git a/Runtime/AppTrackingTransparency.cs b/Runtime/AppTrackingTransparency.cs index b9cc930..c39a067 100644 --- a/Runtime/AppTrackingTransparency.cs +++ b/Runtime/AppTrackingTransparency.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.InteropServices; using UnityEngine; namespace CAS.iOS @@ -9,14 +8,15 @@ namespace CAS.iOS /// A class that provides a tracking authorization request and the tracking authorization status of the app. /// /// + [Obsolete( "Migrated to new CAS.ATTrackingStatus." )] public static class AppTrackingTransparency { public enum Status { - NotDetermined, - Restricted, - Denied, - Authorized + NotDetermined = ATTrackingStatus.AuthorizationStatus.NotDetermined, + Restricted = ATTrackingStatus.AuthorizationStatus.Restricted, + Denied = ATTrackingStatus.AuthorizationStatus.Denied, + Authorized = ATTrackingStatus.AuthorizationStatus.Authorized } /// @@ -45,31 +45,10 @@ public enum Status /// Please set NSUserTrackingUsageDescription in 'Assets > CleverAdsSolutions > iOS Settings' menu to correct tracking authorization request. public static void Request() { - if (OnAuthorizationRequestComplete == null) - throw new ArgumentNullException( "Please subscribe callback OnAuthorizationRequestComplete before call Request()." ); -#if UNITY_IOS || (CASDeveloper && UNITY_EDITOR) -#if UNITY_EDITOR - var settings = UserConsent.UserConsent.BuildRequest(); - if (string.IsNullOrEmpty( settings.defaultIOSTrakingUsageDescription )) - throw new ArgumentNullException( - "Please set NSUserTrackingUsageDescription in 'Assets > CleverAdsSolutions > Consent Request parameters' menu to correct tracking authorization request." ); - OnAuthorizationRequestComplete( Status.Authorized ); -#else - CASURequestTracking( AuthorizationRequestComplete ); -#endif -#else - OnAuthorizationRequestComplete( Status.Authorized ); -#endif + ATTrackingStatus.Request( AuthorizationRequestComplete ); } -#if UNITY_IOS || (CASDeveloper && UNITY_EDITOR) - internal delegate void CASUTrackingStatusCallback( int status ); - - [DllImport( "__Internal" )] - internal static extern void CASURequestTracking( CASUTrackingStatusCallback callback ); - - [AOT.MonoPInvokeCallback( typeof( CASUTrackingStatusCallback ) )] - private static void AuthorizationRequestComplete( int status ) + private static void AuthorizationRequestComplete( ATTrackingStatus.AuthorizationStatus status ) { try { @@ -78,9 +57,8 @@ private static void AuthorizationRequestComplete( int status ) } catch (Exception e) { - UnityEngine.Debug.LogException( e ); + Debug.LogException( e ); } } -#endif } } diff --git a/Runtime/ConsentClient.cs b/Runtime/ConsentClient.cs index 1eaeb4e..e2d27dc 100644 --- a/Runtime/ConsentClient.cs +++ b/Runtime/ConsentClient.cs @@ -77,7 +77,7 @@ internal static void SetMediationExtras() if (active.Length != consent.Length) return; var result = new Dictionary(); - var netTags = GetNetworkTags(); + var netTags = AdNetworkExtension.GetListOfTags(); for (int i = 0; i < consent.Length; i++) { if (consent[i] != '-') @@ -147,38 +147,5 @@ public static string GetTypedText( this ConsentRequestParameters.TypedText[] sou } return source[0].text; } - - public static string[] GetNetworkTags() - { - return new string[] - { - "AM", - "V", - "K", - "CB", - "U", - "AL", - "SuA", - "StA", - "AC", - "FB", - "IM", - "MF", - "MT", - "P", - "IS", - "Ya", - string.Empty, //VAST - string.Empty, //MAX - "Sm", - "MP", - "TJ", - string.Empty, //Fyber - "Fy", - "MB", - "Pa", - "HMX" - }; - } } } \ No newline at end of file diff --git a/Runtime/ConsentRequestParameters.cs b/Runtime/ConsentRequestParameters.cs index c7d1239..b9b5451 100644 --- a/Runtime/ConsentRequestParameters.cs +++ b/Runtime/ConsentRequestParameters.cs @@ -25,9 +25,6 @@ public sealed class ConsentRequestParameters : ScriptableObject [SerializeField] internal bool withRequestTrackingTransparency = false; - [SerializeField] - private string trackingUsageDescription; - [SerializeField] internal UserConsentUI uiPrefab; @@ -161,11 +158,6 @@ public ConsentRequestParameters WithResetUserInfo() resetStatus = 2; return this; } - - public string defaultIOSTrakingUsageDescription - { - get { return withRequestTrackingTransparency ? trackingUsageDescription : null; } - } #endregion #region Get text methods diff --git a/Runtime/MediationSettingsUI.cs b/Runtime/MediationSettingsUI.cs index 46a9daa..1280291 100644 --- a/Runtime/MediationSettingsUI.cs +++ b/Runtime/MediationSettingsUI.cs @@ -25,43 +25,14 @@ public sealed class MediationSettingsUI : MonoBehaviour private IEnumerator Start() { - string[] privacyPolicyList = - { - "https://policies.google.com/technologies/ads", - "https://vungle.com/privacy/", - "https://kidoz.net/privacy-policy/", - "https://answers.chartboost.com/en-us/articles/200780269", - "https://unity3d.com/legal/privacy-policy", - "https://www.applovin.com/privacy/", - "https://www.superawesome.com/privacy-hub/privacy-policy/", - "https://www.startapp.com/policy/privacy-policy/", - "https://www.adcolony.com/privacy-policy/", - "https://developers.facebook.com/docs/audience-network/policy/", - "https://www.inmobi.com/privacy-policy/", - "https://www.mobfox.com/privacy-policy/", - "https://legal.my.com/us/mytarget/privacy/", - null, - "https://developers.ironsrc.com/ironsource-mobile/air/ironsource-mobile-privacy-policy/", - "https://yandex.com/legal/mobileads_sdk_agreement/", - null, - null, - null, - "https://www.mopub.com/en/legal/privacy", - "https://www.tapjoy.com/legal/players/privacy-policy/", - null, - "https://www.fyber.com/privacy-policy/", - "https://www.mintegral.com/en/privacy/", - "https://www.pangleglobal.com/privacy/enduser-en" - }; - yield return null; var active = MobileAds.GetActiveNetworks(); items = new MediationPolicyUI[active.Length]; - for (int i = 0; i < active.Length && i < privacyPolicyList.Length; i++) + for (int i = 0; i < active.Length; i++) { - var policy = privacyPolicyList[( int )active[i]]; - if (policy != null) + var policy = active[i].GetPrivacyPolicy(); + if (!string.IsNullOrEmpty(policy)) { var netName = active[i].ToString(); if (netName.Length > 2) diff --git a/Runtime/UserConsent.cs b/Runtime/UserConsent.cs index ceac1ec..329e246 100644 --- a/Runtime/UserConsent.cs +++ b/Runtime/UserConsent.cs @@ -5,7 +5,7 @@ namespace CAS.UserConsent { public static class UserConsent { - public const string version = "1.2.7"; + public const string version = "2.0.0"; /// /// User latest consent status values. @@ -46,11 +46,5 @@ public static ConsentRequestParameters BuildRequest() return UnityEngine.Object.Instantiate( builder ); return ScriptableObject.CreateInstance(); } - - [Obsolete( "Deprecated. Additional calls are no longer required to apply user consent settings." )] - public static CASInitSettings WithUserConsent( this CASInitSettings builder ) - { - return builder; - } } } \ No newline at end of file diff --git a/Runtime/UserConsentUI.cs b/Runtime/UserConsentUI.cs index 56e9974..7305dd0 100644 --- a/Runtime/UserConsentUI.cs +++ b/Runtime/UserConsentUI.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System; +using UnityEngine; using UnityEngine.Events; using UnityEngine.UI; @@ -70,7 +71,7 @@ public void Init( ConsentRequestParameters parameters ) if (mediationSettings) { mediationSettings.gameObject.SetActive( false ); - mediationSettings.OnConsent.AddListener( OnMediationSettingsApplied ); + mediationSettings.OnConsent.AddListener( OnConsentDialogWillClose ); if (parameters.settingsTogglePrefab) mediationSettings.policyPrefab = parameters.settingsTogglePrefab; @@ -132,20 +133,6 @@ private void OnOpenTermsOfUse() private void ShowConsentPanel() { - if (parameters.withRequestTrackingTransparency) - { - CAS.iOS.AppTrackingTransparency.OnAuthorizationRequestComplete += ShowConsentContainer; - CAS.iOS.AppTrackingTransparency.Request(); - } - else - { - consentTextContainer.SetActive( true ); - } - } - - private void ShowConsentContainer( iOS.AppTrackingTransparency.Status status ) - { - CAS.iOS.AppTrackingTransparency.OnAuthorizationRequestComplete -= ShowConsentContainer; consentTextContainer.SetActive( true ); } @@ -159,30 +146,45 @@ private void OnOpenOptions() private void OnConsentAccepted() { consentTextContainer.SetActive( false ); - PlayerPrefs.SetString( ConsentClient.consentStringPref, ConsentClient.consentAccepted ); MobileAds.settings.userConsent = ConsentStatus.Accepted; PlayerPrefs.Save(); - Destroy( gameObject ); - if (parameters.OnConsent != null) - parameters.OnConsent(); - onConsent.Invoke(); + OnConsentDialogWillClose(); } private void OnConsentDenied() { consentTextContainer.SetActive( false ); - PlayerPrefs.SetString( ConsentClient.consentStringPref, ConsentClient.consentDenied ); MobileAds.settings.userConsent = ConsentStatus.Denied; PlayerPrefs.Save(); - Destroy( gameObject ); - if (parameters.OnConsent != null) - parameters.OnConsent(); - onConsent.Invoke(); + OnConsentDialogWillClose(); + } + + private void OnConsentDialogWillClose() + { + try + { + if (parameters.withRequestTrackingTransparency) + { + ATTrackingStatus.Request( OnATTResponse ); + return; + } + } + catch (Exception e) + { + Debug.LogException( e ); + } + + CloseConsentDialog(); + } + + private void OnATTResponse( ATTrackingStatus.AuthorizationStatus status ) + { + CloseConsentDialog(); } - private void OnMediationSettingsApplied() + private void CloseConsentDialog() { Destroy( gameObject ); if (parameters.OnConsent != null) diff --git a/Textures/cas_arrow.png b/Textures/cas_arrow.png index 6033e194d25817e7d665f27a1002fc3b71528c5b..c8300b85ec776ab0873e4fad7bce71f903f82f94 100644 GIT binary patch literal 2705 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 diff --git a/Textures/cas_panel.png.meta b/Textures/cas_panel.png.meta index f77d676..6bb7b86 100644 --- a/Textures/cas_panel.png.meta +++ b/Textures/cas_panel.png.meta @@ -65,7 +65,7 @@ TextureImporter: maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -82,6 +82,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Textures/cas_settings.png b/Textures/cas_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..c402d0dba86fabf819a6dfd8ab4c2d6425f8e075 GIT binary patch literal 10507 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

&j)s7|_;QCN;Ev>DI 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 literal 0 HcmV?d00001 diff --git a/Textures/cas_settings.png.meta b/Textures/cas_settings.png.meta new file mode 100644 index 0000000..55959c4 --- /dev/null +++ b/Textures/cas_settings.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: ba84759b6b2644763a8b4b5f660c3a97 +labels: +- CleverAdsSolutions +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e87b48d1c88f54ef6bdb0f58f0bdac0e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/package.json b/package.json index a2fe6b2..0a58122 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "com.cleversolutions.ads.consent.unity", - "version": "1.2.7", + "version": "2.0.0", "displayName": "CleverAdsSolutions Consent", "description": "Clever Ads Solutions User consent Unity plugin.", "unity": "2017.4", "dependencies": { - "com.cleversolutions.ads.unity": "2.5.2" + "com.cleversolutions.ads.unity": "2.6.1" }, "author": { "name": "CleverAdsSolutions",