diff --git a/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab index 9ffaf195..97345a0d 100644 --- a/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab +++ b/Assets/Resources/UI/Prefab/Match/Mobile/ToolBarPanel.prefab @@ -393,7 +393,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7951c34819fbd124b9314983619c205c, type: 3} + m_Sprite: {fileID: 21300000, guid: a6cacbc220bfd0a46ac7f4d6e052107a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab index 32f84bae..9dfcf529 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab @@ -6601,12 +6601,12 @@ PrefabInstance: - target: {fileID: 3342506723743580665, guid: 24b12ea279c4803459cf87df536f6c21, type: 3} propertyPath: m_FontData.m_FontSize - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 3342506723743580665, guid: 24b12ea279c4803459cf87df536f6c21, type: 3} propertyPath: m_FontData.m_Alignment - value: 0 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3342506723879539847, guid: 24b12ea279c4803459cf87df536f6c21, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab index eda25771..5875008b 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab @@ -873,7 +873,7 @@ RectTransform: m_Children: - {fileID: 2283881591003425796} m_Father: {fileID: 1673965681348374004} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1074,9 +1074,9 @@ RectTransform: - {fileID: 3808910954941481150} - {fileID: 6595848013761631944} - {fileID: 4408462524766711656} - - {fileID: 7578623247347515893} - {fileID: 7118448401530350836} - {fileID: 8606172890055807794} + - {fileID: 7578623247347515893} - {fileID: 9114115754477968003} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1582,7 +1582,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1673965681348374004} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2152,6 +2152,7 @@ RectTransform: - {fileID: 1786430169159750715} - {fileID: 1128690593457696285} - {fileID: 7052195156892582935} + - {fileID: 2104230815779844094} m_Father: {fileID: 1673965681348374004} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2962,6 +2963,80 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6281041052674275333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2104230815779844094} + - component: {fileID: 4123304717997766521} + - component: {fileID: 8689588975029460177} + m_Layer: 5 + m_Name: Return + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2104230815779844094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6281041052674275333} + 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: 9114115754477968003} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 22, y: 26.3} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 1, y: 0} +--- !u!222 &4123304717997766521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6281041052674275333} + m_CullTransparentMesh: 0 +--- !u!114 &8689588975029460177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6281041052674275333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fdb6d865c6f1a0d45a6fa4e26e4784a8, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6795705504714217666 GameObject: m_ObjectHideFlags: 0 @@ -3803,12 +3878,12 @@ PrefabInstance: - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -3828,12 +3903,12 @@ PrefabInstance: - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -3843,12 +3918,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4013,12 +4088,12 @@ PrefabInstance: - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4028,12 +4103,12 @@ PrefabInstance: - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4093,12 +4168,12 @@ PrefabInstance: - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4108,12 +4183,12 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4168,12 +4243,12 @@ PrefabInstance: - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4188,12 +4263,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4208,12 +4283,12 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4243,12 +4318,12 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4258,7 +4333,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchoredPosition.y - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -4498,7 +4573,7 @@ PrefabInstance: - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -4838,15 +4913,15 @@ PrefabInstance: m_RemovedComponents: - {fileID: 829206726517620079, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} ---- !u!224 &7118448401530350836 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, - type: 3} - m_PrefabInstance: {fileID: 5067779267173090679} - m_PrefabAsset: {fileID: 0} --- !u!1 &7118448401530350837 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} m_PrefabInstance: {fileID: 5067779267173090679} m_PrefabAsset: {fileID: 0} +--- !u!224 &7118448401530350836 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + m_PrefabInstance: {fileID: 5067779267173090679} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab index 0838eea8..f2f46b9b 100644 --- a/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab +++ b/Assets/Resources/UI/Prefab/Ride/Mobile/Panel.prefab @@ -371,6 +371,84 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0 +--- !u!1 &630408988839091148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 670533550283776716} + - component: {fileID: 8044038630619342144} + - component: {fileID: 690887211814762174} + - component: {fileID: 5052182320752998251} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &670533550283776716 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630408988839091148} + 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: 5713008130561868329} + 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, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8044038630619342144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630408988839091148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &690887211814762174 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630408988839091148} + m_CullTransparentMesh: 0 +--- !u!114 &5052182320752998251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 630408988839091148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + Thickness: 2 --- !u!1 &646191182976603232 GameObject: m_ObjectHideFlags: 0 @@ -25556,6 +25634,69 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &2730472891200894308 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2110441581901934914} + - component: {fileID: 7578057870760350959} + - component: {fileID: 7045779857871748712} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2110441581901934914 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730472891200894308} + 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: 1716715902892692897} + m_RootOrder: 1 + 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: -250, y: -25} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7578057870760350959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730472891200894308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7045779857871748712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730472891200894308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} + m_Name: + m_EditorClassIdentifier: + Camera: {fileID: 0} + PlaneDistance: 20 --- !u!1 &2844054572527012973 GameObject: m_ObjectHideFlags: 0 @@ -25660,7 +25801,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7670097283291678859} + - {fileID: 1716715902892692897} - {fileID: 5572785103298013575} m_Father: {fileID: 765892906030958096} m_RootOrder: 3 @@ -26601,109 +26742,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: ---- !u!1 &3375886478312523229 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3824086401253479603} - - component: {fileID: 6039427340820385441} - - component: {fileID: 3087496328603589737} - - component: {fileID: 2766715087924092509} - - component: {fileID: 6283761764915427475} - m_Layer: 5 - m_Name: RectMask(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3824086401253479603 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375886478312523229} - 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: 7390572265656551856} - - {fileID: 8947708045150587001} - m_Father: {fileID: 7670097283291678859} - 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: 50} - m_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &6039427340820385441 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375886478312523229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &3087496328603589737 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375886478312523229} - m_CullTransparentMesh: 0 ---- !u!114 &2766715087924092509 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375886478312523229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &6283761764915427475 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3375886478312523229} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3465700279815372351 GameObject: m_ObjectHideFlags: 0 @@ -28362,69 +28400,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &4203169773198252612 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3304595875053872159} - - component: {fileID: 378326925362911875} - - component: {fileID: 4965390508863600258} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3304595875053872159 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4203169773198252612} - 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: 7670097283291678859} - m_RootOrder: 1 - 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: -250, y: -25} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &378326925362911875 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4203169773198252612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4965390508863600258 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4203169773198252612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8c8bf670921e114bbea10f451c86392, type: 3} - m_Name: - m_EditorClassIdentifier: - Camera: {fileID: 0} - PlaneDistance: 20 --- !u!1 &4317763269701405737 GameObject: m_ObjectHideFlags: 0 @@ -28716,56 +28691,6 @@ MonoBehaviour: m_EditorClassIdentifier: mType: 3 Tooltips: ---- !u!1 &4368876840229317077 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7670097283291678859} - - component: {fileID: 7903745166040211515} - m_Layer: 0 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7670097283291678859 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4368876840229317077} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.96, y: 0.96, z: 1} - m_Children: - - {fileID: 3824086401253479603} - - {fileID: 3304595875053872159} - m_Father: {fileID: 2877296740073624297} - m_RootOrder: 0 - 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_SizeDelta: {x: 500, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7903745166040211515 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4368876840229317077} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4381674482257577153 GameObject: m_ObjectHideFlags: 0 @@ -29860,84 +29785,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5105808275133220899 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7390572265656551856} - - component: {fileID: 602054531611622800} - - component: {fileID: 9142239472934930878} - - component: {fileID: 3799287668754960507} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7390572265656551856 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5105808275133220899} - 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: 3824086401253479603} - 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: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &602054531611622800 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5105808275133220899} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &9142239472934930878 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5105808275133220899} - m_CullTransparentMesh: 0 ---- !u!114 &3799287668754960507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5105808275133220899} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - Thickness: 4 --- !u!1 &5143933386882662904 GameObject: m_ObjectHideFlags: 0 @@ -30589,6 +30436,109 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 12 +--- !u!1 &5578547145851251907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5713008130561868329} + - component: {fileID: 2857495417941668210} + - component: {fileID: 8002807252619945801} + - component: {fileID: 3678850071666516500} + - component: {fileID: 392358364422749842} + m_Layer: 5 + m_Name: RectMask(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5713008130561868329 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578547145851251907} + 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: 1926873625705773617} + - {fileID: 670533550283776716} + m_Father: {fileID: 1716715902892692897} + 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: 50} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2857495417941668210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578547145851251907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &8002807252619945801 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578547145851251907} + m_CullTransparentMesh: 0 +--- !u!114 &3678850071666516500 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578547145851251907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &392358364422749842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5578547145851251907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5580545091462975039 GameObject: m_ObjectHideFlags: 0 @@ -30824,6 +30774,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6122293913701614504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1926873625705773617} + - component: {fileID: 7014869308344416312} + - component: {fileID: 4785207262038692264} + - component: {fileID: 8721874952398261614} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1926873625705773617 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122293913701614504} + 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: 5713008130561868329} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7014869308344416312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122293913701614504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &4785207262038692264 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122293913701614504} + m_CullTransparentMesh: 0 +--- !u!114 &8721874952398261614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6122293913701614504} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + Thickness: 4 --- !u!1 &6236749187527932663 GameObject: m_ObjectHideFlags: 0 @@ -30902,84 +30930,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!1 &6297358221479746587 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8947708045150587001} - - component: {fileID: 1414968795526067124} - - component: {fileID: 8109337324144013820} - - component: {fileID: 5555713834779778056} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8947708045150587001 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6297358221479746587} - 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: 3824086401253479603} - 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, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1414968795526067124 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6297358221479746587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &8109337324144013820 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6297358221479746587} - m_CullTransparentMesh: 0 ---- !u!114 &5555713834779778056 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6297358221479746587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - Thickness: 2 --- !u!1 &6481442373851045670 GameObject: m_ObjectHideFlags: 0 @@ -31569,6 +31519,56 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7116905161878010088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1716715902892692897} + - component: {fileID: 7221102771850051680} + m_Layer: 0 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1716715902892692897 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7116905161878010088} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.96, y: 0.96, z: 1} + m_Children: + - {fileID: 5713008130561868329} + - {fileID: 2110441581901934914} + m_Father: {fileID: 2877296740073624297} + m_RootOrder: 0 + 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_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7221102771850051680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7116905161878010088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7128831287110258232 GameObject: m_ObjectHideFlags: 0 @@ -35853,6 +35853,12 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 765892905839681543} m_Modifications: + - target: {fileID: 6130612940224783302, guid: 4e3c9875893ec9941bbcf94c8800b80b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a6cacbc220bfd0a46ac7f4d6e052107a, + type: 3} - target: {fileID: 6130612940446107804, guid: 4e3c9875893ec9941bbcf94c8800b80b, type: 3} propertyPath: m_Pivot.x diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 13337374..d5e81087 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -19,7 +19,7 @@ public delegate void ChangeLanguageDelegate(); public static class App { - public static string Host = "http://192.168.0.101:5083/"; + public static string Host = "http://192.168.0.101:5084/"; public static string AppVersion = Application.version; diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs index bcb777a0..43576a43 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionResultFactory.cs @@ -7,6 +7,8 @@ using UnityEngine.EventSystems; using UnityEngine.SceneManagement; using UnityEngine.UI; using DG.Tweening; +using System; +using Facebook.Unity; namespace Assets.Scenes.Ride.Scripts { @@ -64,6 +66,8 @@ namespace Assets.Scenes.Ride.Scripts WeChatGpButton = transform.Find("ToolBarPanel/GoogleButton").gameObject; UIManager.AddEvent(WeChatButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechat); UIManager.AddEvent(WeChatGpButton, UnityEngine.EventSystems.EventTriggerType.PointerClick, ShareWechatGp); + var fbButton = transform.Find("ToolBarPanel/FaceBookButton").gameObject; + UIManager.AddEvent(fbButton, EventTriggerType.PointerClick, shareFb); #endif SpriteTop = Resources.Load("Images/Ride/Match/top-1"); SpriteSecond = Resources.Load("Images/Ride/Match/top-2"); @@ -72,6 +76,7 @@ namespace Assets.Scenes.Ride.Scripts UIManager.AddEvent(closeBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, Close); } + float time = 1; private void Update() { @@ -244,6 +249,14 @@ namespace Assets.Scenes.Ride.Scripts Utils.showToast(null, "未安装微信"); } } + private void shareFb(BaseEventData arg0) + { + //cyclingController.competition.Title, "By " + App.CurrentUser.Nickname, null) + FB.ShareLink(contentURL: new Uri($"{App.CurrentUser.WebHost}Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}"), + contentTitle: cyclingController.competition.Title, + contentDescription: "By " + App.CurrentUser.Nickname, + photoURL: new Uri(cyclingController.competition.CoverImage)); + } private void ShareWechatGp(BaseEventData baseEventData) { diff --git a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs index adb277e3..39a7c33d 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/ResultPanelScript.cs @@ -8,6 +8,7 @@ using System; using DG.Tweening; using UnityEngine.EventSystems; using UnityEngine.SceneManagement; +using Facebook.Unity; namespace Assets.Scenes.Ride.Scripts { @@ -90,9 +91,19 @@ namespace Assets.Scenes.Ride.Scripts #if UNITY_ANDROID || UNITY_IOS cyclingController.AddEvent(shareWxBtn, EventTriggerType.PointerClick, shareToWx); cyclingController.AddEvent(shareWxGpButton, EventTriggerType.PointerClick, shareToWxGp); + var fbButton = transform.Find("ToolBarPanel/FaceBookButton").gameObject; + cyclingController.AddEvent(fbButton, EventTriggerType.PointerClick, shareToFb); #endif } + private void shareToFb(BaseEventData arg0) + { + FB.ShareLink(contentURL: new Uri($"{App.CurrentUser.WebHost}RoutesRecords/{cyclingController.RankingId}?Token={App.CurrentUser.cookie}"), + contentTitle: cyclingController.mapRoute.Name, + contentDescription: "By " + App.CurrentUser.Nickname, + photoURL: new Uri(cyclingController.mapRoute.CoverImage)); + } + private void shareToWx(BaseEventData b) { if (App.weChatController.IsWeChatAppInstalled()) diff --git a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs index d12edc9a..a803ffe0 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceHomeScript.cs @@ -76,12 +76,7 @@ public class RaceHomeScript : RaceScript #else btnGoList = rightContainer.Find("BtnGoList"); var nav = transform.Find("Tmp/MainNav-mobile").GetComponent(); - nav.SetButtonActive(new List { 2, 3, 4, 6, 7 }, 2, - custom: new NewMainNav.CustomButton(Resources.Load("Images/Race/back down"), () => - { - //OpenFilter(); - UIManager.ShowRaceListPanel(); - })); + nav.SetButtonActive(new List { 2, 3, 4, 6, 7 }, 2); newNav = nav; #endif if (btnGoList != null) diff --git a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs index 6726aad8..60926f57 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs @@ -232,37 +232,54 @@ public class RaceListScript : RaceScript var mc = transform.Find("MC"); UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b => { + conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f); mc.gameObject.SetActive(true); mc.GetComponent().alpha = 0; mc.GetComponent().DOFade(1, 0.3f); }); + transform.Find("Conditions/Return").gameObject.SetActive(false); UIManager.AddEvent(mc.gameObject, EventTriggerType.PointerClick, b => { - conditions.DOLocalMoveX(App.topRectStartX.Value, 0.3f); - mc.GetComponent().DOFade(0, 0.3f).onComplete = () => - { - mc.gameObject.SetActive(false); - }; + CloseFilter(); + }); + UIManager.AddEvent(transform.Find("Conditions/Return").gameObject, EventTriggerType.PointerClick, b => + { + CloseFilter(); }); - var nav = transform.Find("Tmp/MainNav-mobile").GetComponent(); nav.SetButtonActive(new List { 0, 3, 4, 6, 7 }, 0, custom: new NewMainNav.CustomButton(Resources.Load("Images/Mobile/map_筛选"), () => { - //OpenFilter(); - conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f); - mc.gameObject.SetActive(true); - mc.GetComponent().alpha = 0; - mc.GetComponent().DOFade(1, 0.3f); - }),custom2:new NewMainNav.CustomButton(Resources.Load("Images/Race/back up"),()=> - { - UIManager.ShowPrePanel(); + OpenFilter(); })); newNav = nav; #else #endif } + + private void OpenFilter() + { + var topRect = conditions.GetComponent(); + var mc = transform.Find("MC"); + transform.Find("Conditions/Return").gameObject.SetActive(true); + conditions.DOLocalMoveX(App.topRectStartX.Value + topRect.rect.width, 0.3f); + mc.gameObject.SetActive(true); + mc.GetComponent().alpha = 0; + mc.GetComponent().DOFade(1, 0.3f); + } + + private void CloseFilter() + { + var mc = transform.Find("MC"); + transform.Find("Conditions/Return").gameObject.SetActive(false); + conditions.DOLocalMoveX(App.topRectStartX.Value, 0.3f); + mc.GetComponent().DOFade(0, 0.3f).onComplete = () => + { + mc.gameObject.SetActive(false); + }; + } + private async Task Login() { var result = await ConfigHelper.userApi.Login("13115011550", "laozhong", "");