diff --git a/Assets/Resources/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab index d819d6e5d6a9ba9affccf430c57aadaa17164262..71af78aeb03f94ab8a91a366f9cd2bcf9dd2339a 100644 --- a/Assets/Resources/Prefabs/Stage_Default.prefab +++ b/Assets/Resources/Prefabs/Stage_Default.prefab @@ -2069,6 +2069,31 @@ PrefabInstance: propertyPath: cursor value: objectReference: {fileID: 9064903938289346084} + - target: {fileID: 1063267680994324452, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1063267680994324455, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1063267681001813619, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y @@ -2349,6 +2374,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1826169665482517540, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1867232307010943140, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_IsActive @@ -2364,6 +2394,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2900011465618118542, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00030517578 + objectReference: {fileID: 0} + - target: {fileID: 3128576041734964161, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3128576041734964161, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.0005493164 + objectReference: {fileID: 0} - target: {fileID: 3994617728676202523, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_Enabled @@ -2459,6 +2504,61 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6483326332893997119, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119472, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6533984972335119475, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6580710286566362471, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y @@ -2479,6 +2579,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7897743737149705849, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_FlexibleHeight + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b996060e27da25c498842defc1996d84, type: 3} --- !u!114 &3020720018354060034 stripped @@ -2544,6 +2649,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 46571147959259406, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 40 + objectReference: {fileID: 0} - target: {fileID: 140740148844084842, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2564,6 +2674,21 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 712664738254972820, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 712664738254972820, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 712664738254972820, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 120 + objectReference: {fileID: 0} - target: {fileID: 883562610317082921, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2589,11 +2714,36 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1288332713478340093, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 1288332713478340093, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 42.5 + objectReference: {fileID: 0} - target: {fileID: 1319643632073573343, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 1611472016343752370, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FlexibleHeight + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1829459189653575846, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 1829459189653575846, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} - target: {fileID: 1831671680050863756, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -2694,6 +2844,11 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 3500129622877184076, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FlexibleHeight + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3502153650081912715, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_DefaultActionMap @@ -2714,6 +2869,26 @@ PrefabInstance: propertyPath: m_ActionEvents.Array.data[44].m_ActionName value: Actionmap1/Run[/Keyboard/leftShift] objectReference: {fileID: 0} + - target: {fileID: 3828945693395908685, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 3828945693395908685, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -50 + objectReference: {fileID: 0} + - target: {fileID: 3860972096132670217, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_FlexibleHeight + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4545877116474182818, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} - target: {fileID: 4549626014426059054, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_AnchorMax.x @@ -2914,6 +3089,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4926730115625812497, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5106811703022426982, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_Pivot.x @@ -2949,6 +3129,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6037608698931376944, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6037608698984363721, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_AnchorMax.x @@ -2999,6 +3184,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 6965625904789863175, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6965625904789863175, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} - target: {fileID: 7273377425215222267, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld @@ -3044,6 +3239,16 @@ PrefabInstance: propertyPath: m_PresetInfoIsWorld value: 0 objectReference: {fileID: 0} + - target: {fileID: 8858798501607791799, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 8858798501607791799, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} - target: {fileID: 9044766020949755674, guid: f6ee936e2ace8e84ba70ad7e1ae58bdc, type: 3} propertyPath: m_PresetInfoIsWorld diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab b/Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab new file mode 100644 index 0000000000000000000000000000000000000000..8ac9ccc08e48fe432f8fdb73e4cd7950479ba188 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab @@ -0,0 +1,121 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8501539927679564588 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3581652732795482904, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Name + value: Factscreen + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.x + value: 900 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_SizeDelta.y + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -225 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} diff --git a/Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab.meta b/Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..ba6dc2509a975fcfefe5f9544aa612dcc220c518 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Facts/Factscreen_mobile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fec7827228b24574ca4bf8427d875012 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab index d9d286d678a7487aeefa57cc210ed699541738e2..02770de65049ef13167d4918ef4a72217b4d8fe1 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/FrameITUI_mobile.prefab @@ -288,7 +288,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &327874510602248635 MonoBehaviour: m_ObjectHideFlags: 0 @@ -602,7 +602,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.85} m_AnchorMax: {x: 0.6, y: 0.99} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 130, y: 0} m_SizeDelta: {x: -0.00005531311, y: -0.0000038146973} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4901663823968045019 @@ -783,7 +783,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &7622515375801632008 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2302,7 +2302,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &7298780208311908334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3351,7 +3351,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.4, y: 0.85} m_AnchorMax: {x: 0.6, y: 0.99} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 130, y: 0} m_SizeDelta: {x: -0.00005531311, y: -0.0000038146973} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4491262259019493989 @@ -3979,6 +3979,131 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4842294571495540312} m_Modifications: + - target: {fileID: 1171763813273885303, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 2789741445689372993, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 2789741445689372993, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 2789741445689372993, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 3144986313061421276, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3144986313061421279, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3144986313061421279, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3144986313061421279, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3144986313061421279, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3454744611266316251, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_FontData.m_MaxSize + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 3454744611266316251, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_FontData.m_FontSize + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 3906671111525207667, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3906671111525207667, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 4518746616353106728, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.x + value: -95 + objectReference: {fileID: 0} + - target: {fileID: 4518746616353106728, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 42.5 + objectReference: {fileID: 0} + - target: {fileID: 5647701191439592341, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5764075389599067602, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 5764075389599067602, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6171063509661895266, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6171063509661895266, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 6428525376133266209, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6428525376133266209, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.00088500977 + objectReference: {fileID: 0} + - target: {fileID: 6512965376468496238, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6512965376468496238, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.000030517578 + objectReference: {fileID: 0} + - target: {fileID: 7331851036447918469, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9207926679512206244, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} propertyPath: m_IsActive @@ -4104,6 +4229,21 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 9207926680489444168, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926680489444168, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926680489444168, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9207926680489444171, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} propertyPath: m_IsActive diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab index c7c3774b25c18736ae9d9affcc59da3f9ae1edc4..c56dc7aa03575c100e6e8fab7550dafed3cceb4b 100644 --- a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas.prefab @@ -1,5 +1,70 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &7783372717906542472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7367280031197214242} + - component: {fileID: 7520878850387361931} + m_Layer: 5 + m_Name: LeftSide + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7367280031197214242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783372717906542472} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2950203166553965712} + - {fileID: 9207926680489444168} + m_Father: {fileID: 9207926679660501330} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 900, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &7520878850387361931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7783372717906542472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, 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: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 --- !u!1 &9207926679476855463 GameObject: m_ObjectHideFlags: 0 @@ -423,9 +488,8 @@ RectTransform: - {fileID: 9207926681531587060} - {fileID: 9207926680103916033} - {fileID: 9207926679476855460} - - {fileID: 9207926680489444168} - - {fileID: 3144986313061421279} - {fileID: 9207926680741575118} + - {fileID: 7367280031197214242} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -477,7 +541,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &9207926679660501331 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1179,6 +1243,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9207926680489444168} + - component: {fileID: 1843142343782310291} m_Layer: 5 m_Name: Scrolls-Show m_TagString: Untagged @@ -1199,14 +1264,34 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 9207926680331850712} - m_Father: {fileID: 9207926679660501330} - m_RootOrder: 5 + m_Father: {fileID: 7367280031197214242} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.000061035156, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 900, y: 630} m_Pivot: {x: 0, y: 0} +--- !u!114 &1843142343782310291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9207926680489444171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: 1 + m_LayoutPriority: 1 --- !u!1 &9207926680522215218 GameObject: m_ObjectHideFlags: 0 @@ -1283,7 +1368,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9207926679660501330} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2249,8 +2334,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 9207926681445974878} m_HandleRect: {fileID: 9207926681445974865} m_Direction: 0 - m_Value: 0 - m_Size: 1 + m_Value: 1 + m_Size: 0.4705884 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -2739,7 +2824,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0.000030517578} + m_AnchoredPosition: {x: 107288.836, y: 0.000030517578} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &9207926681532248488 @@ -2782,13 +2867,28 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!1001 &1878469765440807876 +--- !u!1001 &1821050779846997899 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 9207926679660501330} + m_TransformParent: {fileID: 7367280031197214242} m_Modifications: + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2908476680003779928, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 3581652732795482904, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_Name @@ -2807,7 +2907,7 @@ PrefabInstance: - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_RootOrder - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} @@ -2817,7 +2917,7 @@ PrefabInstance: - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} @@ -2827,7 +2927,7 @@ PrefabInstance: - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} @@ -2877,12 +2977,12 @@ PrefabInstance: - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_AnchoredPosition.x - value: 450 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} propertyPath: m_AnchoredPosition.y - value: -225 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} @@ -2904,14 +3004,45 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4838871000058222821, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2746.791 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} ---- !u!224 &3144986313061421279 stripped +--- !u!224 &2950203166553965712 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3581652732795482907, guid: 49deb83b881477047bfac0ee629a7ae9, type: 3} - m_PrefabInstance: {fileID: 1878469765440807876} + m_PrefabInstance: {fileID: 1821050779846997899} m_PrefabAsset: {fileID: 0} +--- !u!1 &2950203166553965715 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3581652732795482904, guid: 49deb83b881477047bfac0ee629a7ae9, + type: 3} + m_PrefabInstance: {fileID: 1821050779846997899} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4205760458875477032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2950203166553965715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: 1 + m_LayoutPriority: 1 --- !u!1001 &7390358983506737413 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab new file mode 100644 index 0000000000000000000000000000000000000000..21bb869d7c6108d8f0c6f15399e5b7645da2dba9 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab @@ -0,0 +1,121 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8344639071233981480 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501330, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9207926679660501333, guid: b162218cc487f1242bd5ac7b4315a051, + type: 3} + propertyPath: m_Name + value: HidingCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b162218cc487f1242bd5ac7b4315a051, type: 3} diff --git a/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab.meta b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..337b2b3d8f684a699685fba2839947c1ee4f3f66 --- /dev/null +++ b/Assets/Resources/Prefabs/UI/Ingame/HidingCanvas_mobile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 67b7a55fada6ee94d8d7b3b6dd7e9e28 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: