From 7c1d1e797c9844d5216aa60b02b29766237885d1 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 10 Feb 2022 12:57:43 +0800 Subject: [PATCH 01/38] =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=88=92=E8=88=B9?= =?UTF-8?q?=E6=9C=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=98=BB=E5=8A=9B=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/Panel/Mobile/HomePanel.prefab | 46 +- .../Panel/Mobile/ResultListPanel.prefab | 6 +- .../UI/Prefab/Panel/Mobile/RowerPanel.prefab | 3881 ++++++++++------- .../Devices/Ant/Interfaces/IRowerDevice.cs | 1 + .../Scripts/Devices/Ble/Devices/FtmsRower.cs | 6 + Assets/Scripts/Scenes/MainController.cs | 24 +- Assets/Scripts/UI/Control/PFUISlider.cs | 10 + Assets/Scripts/UI/Prefab/NewMainNav.cs | 13 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 5 +- .../UI/Prefab/Panel/RowerHomeScript.cs | 17 + .../AndroidResolverDependencies.xml | 2 +- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 6 +- 13 files changed, 2376 insertions(+), 1642 deletions(-) diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab index 74a7af15..39e55095 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab @@ -7471,12 +7471,12 @@ PrefabInstance: - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7496,12 +7496,12 @@ PrefabInstance: - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7511,12 +7511,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7681,12 +7681,12 @@ PrefabInstance: - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7696,12 +7696,12 @@ PrefabInstance: - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7761,12 +7761,12 @@ PrefabInstance: - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7776,12 +7776,12 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7836,12 +7836,12 @@ PrefabInstance: - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7856,12 +7856,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7881,12 +7881,12 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7916,12 +7916,12 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} @@ -7931,7 +7931,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -2 objectReference: {fileID: 0} - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab index bba90d7e..98f95e80 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab @@ -95,7 +95,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3111753855602397197 RectTransform: m_ObjectHideFlags: 0 @@ -749,6 +749,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 693a8dfbfae474849b06c5d0080136f1, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!1 &3070817481139605444 GameObject: m_ObjectHideFlags: 0 @@ -1614,7 +1615,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1724308109339741718 RectTransform: m_ObjectHideFlags: 0 @@ -1803,6 +1804,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e9e4a559c32ef6d4a95d06e4a10c73d4, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} routeResult: {fileID: 4085630360285719620, guid: ed1035afec068174db9b2d39c6568c42, type: 3} --- !u!1 &4915624194418938824 diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RowerPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RowerPanel.prefab index f5fdde00..45d9ef24 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RowerPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RowerPanel.prefab @@ -75,7 +75,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &355368203805574430 +--- !u!1 &381408821210548009 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -83,9 +83,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 781085996890271118} - - component: {fileID: 1664248810802170545} - - component: {fileID: 7790571446783326756} + - component: {fileID: 7168175655652908439} + - component: {fileID: 7428453263032755430} + - component: {fileID: 2678590461658764546} m_Layer: 5 m_Name: New Game Object m_TagString: Untagged @@ -93,32 +93,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &781085996890271118 +--- !u!224 &7168175655652908439 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355368203805574430} + m_GameObject: {fileID: 381408821210548009} 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: 756793808329525777} - m_RootOrder: 0 + m_Father: {fileID: 1764245029811365376} + 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} - m_AnchoredPosition: {x: -18, y: 0.15} + m_AnchoredPosition: {x: -18, y: 165.15} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1664248810802170545 +--- !u!114 &7428453263032755430 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355368203805574430} + m_GameObject: {fileID: 381408821210548009} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} @@ -126,22 +126,22 @@ MonoBehaviour: m_EditorClassIdentifier: RectTransformOverride: {fileID: 0} parentSet: 0 - parent: {fileID: 6187736912012284930} + parent: {fileID: 5060568683623666842} Recycled: 0 YMirror: 0 ---- !u!114 &7790571446783326756 +--- !u!114 &2678590461658764546 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355368203805574430} + m_GameObject: {fileID: 381408821210548009} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &474084168217938131 +--- !u!1 &527239118548778822 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -149,10 +149,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 9201044070982506388} - - component: {fileID: 8203474069756072971} - - component: {fileID: 2403969632937927404} - - component: {fileID: 4844577001982534013} + - component: {fileID: 4133606464887294421} + - component: {fileID: 6524469258145936928} + - component: {fileID: 765387738054956976} + m_Layer: 5 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4133606464887294421 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527239118548778822} + 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: 1764245029811365376} + m_RootOrder: 2 + 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: -18, y: 66.15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6524469258145936928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527239118548778822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} + m_Name: + m_EditorClassIdentifier: + RectTransformOverride: {fileID: 0} + parentSet: 0 + parent: {fileID: 6931242137256574622} + Recycled: 0 + YMirror: 0 +--- !u!114 &765387738054956976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 527239118548778822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &550491944265958183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5060568683623666842} + - component: {fileID: 5048312211428241448} + - component: {fileID: 2115460481751697708} m_Layer: 5 m_Name: item m_TagString: Untagged @@ -160,74 +225,59 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &9201044070982506388 +--- !u!224 &5060568683623666842 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 474084168217938131} + m_GameObject: {fileID: 550491944265958183} 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: 182636268937576404} - m_RootOrder: 0 + m_Children: + - {fileID: 8520832301067649688} + m_Father: {fileID: 326760644030275416} + m_RootOrder: 5 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -204, y: 49.649994} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8203474069756072971 +--- !u!114 &5048312211428241448 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 474084168217938131} + m_GameObject: {fileID: 550491944265958183} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &2403969632937927404 -CanvasRenderer: +--- !u!223 &2115460481751697708 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 474084168217938131} - m_CullTransparentMesh: 0 ---- !u!114 &4844577001982534013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 474084168217938131} + m_GameObject: {fileID: 550491944265958183} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d05bb511ff55104f930cb9d1c27c8d7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &573432502412838466 GameObject: m_ObjectHideFlags: 0 @@ -302,6 +352,77 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &619382636579625634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6659733187623110574} + - component: {fileID: 7538206942399437437} + - component: {fileID: 6362243300649114754} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6659733187623110574 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619382636579625634} + 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: 8181242006719178365} + m_Father: {fileID: 326760644030275416} + 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: -204, y: -16.350006} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7538206942399437437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619382636579625634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!223 &6362243300649114754 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619382636579625634} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!114 &3184924405028552336 MonoBehaviour: m_ObjectHideFlags: 0 @@ -315,6 +436,76 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mType: 8 +--- !u!1 &808004759740233847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 326760644030275416} + - component: {fileID: 3272348814641907122} + - component: {fileID: 447323552137970599} + m_Layer: 5 + m_Name: textController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &326760644030275416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808004759740233847} + 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: 3206193790585330384} + - {fileID: 5139653051851993301} + - {fileID: 6931242137256574622} + - {fileID: 6659733187623110574} + - {fileID: 8777112992124395435} + - {fileID: 5060568683623666842} + - {fileID: 4611258717269864919} + m_Father: {fileID: 238484529820959138} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3272348814641907122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808004759740233847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &447323552137970599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 808004759740233847} + 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 &1192857085458133778 GameObject: m_ObjectHideFlags: 0 @@ -389,6 +580,77 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1226600412213126938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5139653051851993301} + - component: {fileID: 526283508398472340} + - component: {fileID: 6596684922491934464} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5139653051851993301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226600412213126938} + 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: 5191686750437829377} + m_Father: {fileID: 326760644030275416} + 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: -204, y: -82.350006} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &526283508398472340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226600412213126938} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!223 &6596684922491934464 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226600412213126938} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &1502889230681629888 GameObject: m_ObjectHideFlags: 0 @@ -478,7 +740,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 26 ---- !u!1 &1979400972358915204 +--- !u!1 &1623839748990029820 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -486,113 +748,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5738695721650226213} - - component: {fileID: 4743192391834548435} - - component: {fileID: 4673367231244350382} - - component: {fileID: 2552610130299023741} - - component: {fileID: 4277972500879828436} - 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 &5738695721650226213 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979400972358915204} - 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: 1063655824531284767} - - {fileID: 8523086518535161760} - - {fileID: 7514633768374641636} - m_Father: {fileID: 182636268937576404} - m_RootOrder: 4 - 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: 231} - m_SizeDelta: {x: 372, y: 231} - m_Pivot: {x: 0, y: 1} ---- !u!114 &4743192391834548435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979400972358915204} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!222 &4673367231244350382 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979400972358915204} - m_CullTransparentMesh: 0 ---- !u!114 &2552610130299023741 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979400972358915204} - 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 &4277972500879828436 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1979400972358915204} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &2032942428529960945 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6137175612636235404} - - component: {fileID: 3779794693416442095} - - component: {fileID: 5825543852090784309} + - component: {fileID: 5191686750437829377} + - component: {fileID: 2191026076962971781} + - component: {fileID: 7981015595980097372} + - component: {fileID: 7439122151802813572} m_Layer: 5 m_Name: Text(Clone) m_TagString: Untagged @@ -600,18 +759,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6137175612636235404 +--- !u!224 &5191686750437829377 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2032942428529960945} + m_GameObject: {fileID: 1623839748990029820} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} m_Children: [] - m_Father: {fileID: 1438291785404480553} + m_Father: {fileID: 5139653051851993301} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -619,21 +778,21 @@ RectTransform: m_AnchoredPosition: {x: 50, y: 50} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3779794693416442095 +--- !u!222 &2191026076962971781 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2032942428529960945} + m_GameObject: {fileID: 1623839748990029820} m_CullTransparentMesh: 0 ---- !u!114 &5825543852090784309 +--- !u!114 &7981015595980097372 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2032942428529960945} + m_GameObject: {fileID: 1623839748990029820} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -659,7 +818,86 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 1000 + m_Text: 200 +--- !u!114 &7439122151802813572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623839748990029820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &1978742042127953787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 927529457441695804} + - component: {fileID: 2449794596577876295} + - component: {fileID: 5251504953383436998} + m_Layer: 5 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &927529457441695804 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978742042127953787} + 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: 1764245029811365376} + 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} + m_AnchoredPosition: {x: -18, y: 198.15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2449794596577876295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978742042127953787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} + m_Name: + m_EditorClassIdentifier: + RectTransformOverride: {fileID: 0} + parentSet: 0 + parent: {fileID: 4611258717269864919} + Recycled: 0 + YMirror: 0 +--- !u!114 &5251504953383436998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1978742042127953787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2157374091360064997 GameObject: m_ObjectHideFlags: 0 @@ -706,7 +944,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2157374091360064997} m_CullTransparentMesh: 0 ---- !u!1 &2232833477003234816 +--- !u!1 &2649027759344492309 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -714,9 +952,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8395983450427616987} - - component: {fileID: 2611206060336546906} - - component: {fileID: 7913548766650438907} + - component: {fileID: 5166176399575111378} + - component: {fileID: 7653293749109965945} + - component: {fileID: 7278805144181817346} + - component: {fileID: 431997046930314956} m_Layer: 5 m_Name: Text(Clone) m_TagString: Untagged @@ -724,18 +963,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8395983450427616987 +--- !u!224 &5166176399575111378 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2232833477003234816} + m_GameObject: {fileID: 2649027759344492309} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} m_Children: [] - m_Father: {fileID: 3683649784781322604} + m_Father: {fileID: 8777112992124395435} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -743,21 +982,21 @@ RectTransform: m_AnchoredPosition: {x: 50, y: 50} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2611206060336546906 +--- !u!222 &7653293749109965945 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2232833477003234816} + m_GameObject: {fileID: 2649027759344492309} m_CullTransparentMesh: 0 ---- !u!114 &7913548766650438907 +--- !u!114 &7278805144181817346 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2232833477003234816} + m_GameObject: {fileID: 2649027759344492309} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -783,78 +1022,20 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 400 ---- !u!1 &2305501244654796428 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3683649784781322604} - - component: {fileID: 831929554982960806} - - component: {fileID: 481221393493287726} - m_Layer: 5 - m_Name: item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3683649784781322604 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2305501244654796428} - 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: 8395983450427616987} - m_Father: {fileID: 7115404593487703308} - m_RootOrder: 2 - 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: -204, y: -49.349976} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &831929554982960806 + m_Text: 800 +--- !u!114 &431997046930314956 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2305501244654796428} + m_GameObject: {fileID: 2649027759344492309} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!223 &481221393493287726 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2305501244654796428} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 + key: --- !u!1 &2662154291857312347 GameObject: m_ObjectHideFlags: 0 @@ -933,7 +1114,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: --- ---- !u!1 &2813024216979002289 +--- !u!1 &2910347260937567488 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -941,9 +1122,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2178542770819332539} - - component: {fileID: 7474484270734959562} - - component: {fileID: 9220630095413682140} + - component: {fileID: 5019477492083042222} + - component: {fileID: 9002756131719486307} + - component: {fileID: 5590716612654299624} + - component: {fileID: 1483667778043796745} m_Layer: 5 m_Name: item m_TagString: Untagged @@ -951,60 +1133,75 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2178542770819332539 +--- !u!224 &5019477492083042222 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2813024216979002289} + m_GameObject: {fileID: 2910347260937567488} 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: 8549819941865908359} - m_Father: {fileID: 7115404593487703308} - m_RootOrder: 6 + m_Children: [] + m_Father: {fileID: 238484529820959138} + m_RootOrder: 2 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: -204, y: 82.650024} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7474484270734959562 +--- !u!114 &9002756131719486307 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2813024216979002289} + m_GameObject: {fileID: 2910347260937567488} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!223 &9220630095413682140 -Canvas: +--- !u!222 &5590716612654299624 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2813024216979002289} + m_GameObject: {fileID: 2910347260937567488} + m_CullTransparentMesh: 0 +--- !u!114 &1483667778043796745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2910347260937567488} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!1 &3002866013115750954 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d05bb511ff55104f930cb9d1c27c8d7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &2933778917554337391 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1012,9 +1209,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8758196758819331479} - - component: {fileID: 5842846449815007009} - - component: {fileID: 946987770663870346} + - component: {fileID: 8520832301067649688} + - component: {fileID: 28601494771219141} + - component: {fileID: 1858388334027512052} + - component: {fileID: 6115564825664087426} m_Layer: 5 m_Name: Text(Clone) m_TagString: Untagged @@ -1022,18 +1220,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &8758196758819331479 +--- !u!224 &8520832301067649688 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3002866013115750954} + m_GameObject: {fileID: 2933778917554337391} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} m_Children: [] - m_Father: {fileID: 6187736912012284930} + m_Father: {fileID: 5060568683623666842} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1041,21 +1239,21 @@ RectTransform: m_AnchoredPosition: {x: 50, y: 50} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5842846449815007009 +--- !u!222 &28601494771219141 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3002866013115750954} + m_GameObject: {fileID: 2933778917554337391} m_CullTransparentMesh: 0 ---- !u!114 &946987770663870346 +--- !u!114 &1858388334027512052 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3002866013115750954} + m_GameObject: {fileID: 2933778917554337391} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} @@ -1081,8 +1279,21 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 0 ---- !u!1 &3031943530305043297 + m_Text: 1000 +--- !u!114 &6115564825664087426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2933778917554337391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &3094073347139848697 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1090,10 +1301,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6946259447005697818} - - component: {fileID: 4564954294185227783} - - component: {fileID: 4677640732489391990} - - component: {fileID: 8541378082052484868} + - component: {fileID: 8777112992124395435} + - component: {fileID: 5298663087155327816} + - component: {fileID: 1951176606438853383} m_Layer: 5 m_Name: item m_TagString: Untagged @@ -1101,52 +1311,124 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6946259447005697818 +--- !u!224 &8777112992124395435 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3031943530305043297} + m_GameObject: {fileID: 3094073347139848697} + 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: 5166176399575111378} + m_Father: {fileID: 326760644030275416} + m_RootOrder: 4 + 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: -204, y: 16.649994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5298663087155327816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3094073347139848697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!223 &1951176606438853383 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3094073347139848697} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!1 &3225379822133852023 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9141795986060461115} + - component: {fileID: 3211034756543271536} + - component: {fileID: 2745021363870258822} + - component: {fileID: 3286771754061074670} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9141795986060461115 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3225379822133852023} 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: 182636268937576404} - m_RootOrder: 3 + m_Father: {fileID: 238484529820959138} + 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: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4564954294185227783 +--- !u!114 &3211034756543271536 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3031943530305043297} + m_GameObject: {fileID: 3225379822133852023} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &4677640732489391990 +--- !u!222 &2745021363870258822 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3031943530305043297} + m_GameObject: {fileID: 3225379822133852023} m_CullTransparentMesh: 0 ---- !u!114 &8541378082052484868 +--- !u!114 &3286771754061074670 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3031943530305043297} + m_GameObject: {fileID: 3225379822133852023} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7d05bb511ff55104f930cb9d1c27c8d7, type: 3} @@ -1169,7 +1451,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &3172435137849138363 +--- !u!1 &3228163038401445503 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1177,69 +1459,90 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6187736912012284930} - - component: {fileID: 7353201899916073109} - - component: {fileID: 7585884232636846122} + - component: {fileID: 7139969330913427965} + - component: {fileID: 3831356663581369098} + - component: {fileID: 6733623244369975376} + - component: {fileID: 8325962462804828279} m_Layer: 5 - m_Name: item + m_Name: Text(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6187736912012284930 +--- !u!224 &7139969330913427965 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3172435137849138363} + m_GameObject: {fileID: 3228163038401445503} 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: 8758196758819331479} - m_Father: {fileID: 7115404593487703308} + m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} + m_Children: [] + m_Father: {fileID: 6931242137256574622} 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: -204, y: -115.349976} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 50} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7353201899916073109 +--- !u!222 &3831356663581369098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3228163038401445503} + m_CullTransparentMesh: 0 +--- !u!114 &6733623244369975376 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3172435137849138363} + m_GameObject: {fileID: 3228163038401445503} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!223 &7585884232636846122 -Canvas: + 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_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 400 +--- !u!114 &8325962462804828279 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3172435137849138363} + m_GameObject: {fileID: 3228163038401445503} m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: --- !u!1 &3266406826061482403 GameObject: m_ObjectHideFlags: 0 @@ -1358,6 +1661,169 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &3278501150571223568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6830057141433802507} + - component: {fileID: 4574827382895608289} + - component: {fileID: 4431919245606991854} + - component: {fileID: 4926691652993230999} + m_Layer: 5 + m_Name: Text(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6830057141433802507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3278501150571223568} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} + m_Children: [] + m_Father: {fileID: 3206193790585330384} + 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: 50, y: 50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4574827382895608289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3278501150571223568} + m_CullTransparentMesh: 0 +--- !u!114 &4431919245606991854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3278501150571223568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 0 +--- !u!114 &4926691652993230999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3278501150571223568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &3339292471276567486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6931242137256574622} + - component: {fileID: 3550665860815043796} + - component: {fileID: 2371687070549030686} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6931242137256574622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3339292471276567486} + 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: 7139969330913427965} + m_Father: {fileID: 326760644030275416} + m_RootOrder: 2 + 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: -204, y: -49.350006} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3550665860815043796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3339292471276567486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!223 &2371687070549030686 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3339292471276567486} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &3369658699024987384 GameObject: m_ObjectHideFlags: 0 @@ -1436,377 +1902,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ROWING TIME ---- !u!1 &3377843976590771553 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4817856901323287103} - - component: {fileID: 8420046672486107617} - - component: {fileID: 8717011105419906648} - m_Layer: 5 - m_Name: item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4817856901323287103 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3377843976590771553} - 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: 5809266323397017140} - m_Father: {fileID: 7115404593487703308} - 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: -204, y: -16.349976} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8420046672486107617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3377843976590771553} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!223 &8717011105419906648 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3377843976590771553} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!1 &3419839758977611822 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1063655824531284767} - - component: {fileID: 4805404178762966675} - - component: {fileID: 7883688600069838122} - - component: {fileID: 6722689480845886450} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1063655824531284767 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3419839758977611822} - 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: 5738695721650226213} - 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 &4805404178762966675 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3419839758977611822} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &7883688600069838122 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3419839758977611822} - m_CullTransparentMesh: 0 ---- !u!114 &6722689480845886450 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3419839758977611822} - 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 &3530453003654753579 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8549819941865908359} - - component: {fileID: 8452775035369297323} - - component: {fileID: 7776668154487416913} - m_Layer: 5 - m_Name: Text(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8549819941865908359 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3530453003654753579} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} - m_Children: [] - m_Father: {fileID: 2178542770819332539} - 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: 50, y: 50} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8452775035369297323 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3530453003654753579} - m_CullTransparentMesh: 0 ---- !u!114 &7776668154487416913 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3530453003654753579} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 1200 ---- !u!1 &3590130137485152159 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4034473370963495910} - - component: {fileID: 6942623411411192406} - - component: {fileID: 6627234674706253872} - m_Layer: 5 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4034473370963495910 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3590130137485152159} - 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: 756793808329525777} - 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: -18, y: 33.15} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &6942623411411192406 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3590130137485152159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransformOverride: {fileID: 0} - parentSet: 0 - parent: {fileID: 5977895225414350482} - Recycled: 0 - YMirror: 0 ---- !u!114 &6627234674706253872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3590130137485152159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &3643625457190236740 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 421943179922999040} - - component: {fileID: 2162186284598986670} - - component: {fileID: 783826394955886127} - m_Layer: 5 - m_Name: Text(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &421943179922999040 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3643625457190236740} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} - m_Children: [] - m_Father: {fileID: 5977895225414350482} - 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: 50, y: 50} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2162186284598986670 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3643625457190236740} - m_CullTransparentMesh: 0 ---- !u!114 &783826394955886127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3643625457190236740} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 200 --- !u!1 &3666824875315071942 GameObject: m_ObjectHideFlags: 0 @@ -1840,7 +1935,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 182636268937576404} + - {fileID: 238484529820959138} - {fileID: 1874380802909331047} m_Father: {fileID: 6902845908893712119} m_RootOrder: 0 @@ -1898,7 +1993,7 @@ MonoBehaviour: automaticVerticallView: 0 automaticcHorizontaViewGap: 0 automaticHorizontalView: 0 - horizontalViewSize: 3.5 + horizontalViewSize: 15 horizontalViewOrigin: 0 verticalViewSize: 1400 verticalViewOrigin: 0 @@ -2128,6 +2223,72 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aa4e07579b1f9574788e0b83b1fac799, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &3794504358424311455 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7908821040839415242} + - component: {fileID: 704979455927656764} + - component: {fileID: 2238490326738747706} + m_Layer: 5 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7908821040839415242 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3794504358424311455} + 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: 1764245029811365376} + 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: -18, y: 99.15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &704979455927656764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3794504358424311455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} + m_Name: + m_EditorClassIdentifier: + RectTransformOverride: {fileID: 0} + parentSet: 0 + parent: {fileID: 6659733187623110574} + Recycled: 0 + YMirror: 0 +--- !u!114 &2238490326738747706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3794504358424311455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &251861803051136508 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2141,7 +2302,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mType: 2 ---- !u!1 &4614733087197311076 +--- !u!1 &5002237337235076984 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2149,256 +2310,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3168144425281408105} - - component: {fileID: 3174554922017127700} - - component: {fileID: 6429043869143005468} + - component: {fileID: 8181242006719178365} + - component: {fileID: 5282776732975358806} + - component: {fileID: 4136279244831846033} + - component: {fileID: 2312177620696333644} m_Layer: 5 - m_Name: New Game Object + m_Name: Text(Clone) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &3168144425281408105 +--- !u!224 &8181242006719178365 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4614733087197311076} + m_GameObject: {fileID: 5002237337235076984} 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_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} m_Children: [] - m_Father: {fileID: 756793808329525777} - m_RootOrder: 4 - 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: -18, y: 132.15} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3174554922017127700 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4614733087197311076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransformOverride: {fileID: 0} - parentSet: 0 - parent: {fileID: 4528960658837347503} - Recycled: 0 - YMirror: 0 ---- !u!114 &6429043869143005468 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4614733087197311076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &4689314885349389140 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 182636268937576404} - - component: {fileID: 5923542928517306089} - 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 &182636268937576404 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4689314885349389140} - 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: 9201044070982506388} - - {fileID: 756793808329525777} - - {fileID: 2902750159622789783} - - {fileID: 6946259447005697818} - - {fileID: 5738695721650226213} - - {fileID: 7115404593487703308} - m_Father: {fileID: 7709334729231744868} + m_Father: {fileID: 6659733187623110574} 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: 372, y: 231} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5923542928517306089 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4689314885349389140} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &4928237417433494075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7115404593487703308} - - component: {fileID: 4354691977575873620} - - component: {fileID: 1763919986900451823} - m_Layer: 5 - m_Name: textController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7115404593487703308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4928237417433494075} - 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: 6187736912012284930} - - {fileID: 5977895225414350482} - - {fileID: 3683649784781322604} - - {fileID: 4817856901323287103} - - {fileID: 4528960658837347503} - - {fileID: 1438291785404480553} - - {fileID: 2178542770819332539} - m_Father: {fileID: 182636268937576404} - 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} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4354691977575873620 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4928237417433494075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1763919986900451823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4928237417433494075} - 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 &5133535913499126462 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8523086518535161760} - - component: {fileID: 3421940476789728624} - - component: {fileID: 8600629663422218960} - - component: {fileID: 1920474081202863489} - m_Layer: 5 - m_Name: Lines - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8523086518535161760 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5133535913499126462} - 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: 5738695721650226213} - 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_AnchoredPosition: {x: 50, y: 50} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3421940476789728624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5133535913499126462} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!222 &8600629663422218960 +--- !u!222 &5282776732975358806 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5133535913499126462} + m_GameObject: {fileID: 5002237337235076984} m_CullTransparentMesh: 0 ---- !u!114 &1920474081202863489 +--- !u!114 &4136279244831846033 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5133535913499126462} + m_GameObject: {fileID: 5002237337235076984} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2408,7 +2367,290 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - Thickness: 3 + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 600 +--- !u!114 &2312177620696333644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5002237337235076984} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &5056779708033308238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1179532921585830886} + - component: {fileID: 8382154547978798340} + - component: {fileID: 8673542972909647415} + - component: {fileID: 5460717695237585431} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1179532921585830886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056779708033308238} + 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: 238484529820959138} + m_RootOrder: 3 + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8382154547978798340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056779708033308238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &8673542972909647415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056779708033308238} + m_CullTransparentMesh: 0 +--- !u!114 &5460717695237585431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5056779708033308238} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d05bb511ff55104f930cb9d1c27c8d7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + 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 &5145999782200306077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136932621139917463} + - component: {fileID: 4924208126289297829} + - component: {fileID: 3863920952090169860} + - component: {fileID: 4273899909021930103} + - component: {fileID: 8376502860318534217} + 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 &136932621139917463 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145999782200306077} + 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: 7315422122198282610} + - {fileID: 7626577941067044118} + - {fileID: 7774701517065333348} + m_Father: {fileID: 238484529820959138} + m_RootOrder: 4 + 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: 231} + m_SizeDelta: {x: 372, y: 231} + m_Pivot: {x: 0, y: 1} +--- !u!114 &4924208126289297829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145999782200306077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!222 &3863920952090169860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145999782200306077} + m_CullTransparentMesh: 0 +--- !u!114 &4273899909021930103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145999782200306077} + 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 &8376502860318534217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5145999782200306077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5213622239075964576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 406996094746600084} + - component: {fileID: 2891039632683732111} + - component: {fileID: 3150584408154786610} + m_Layer: 5 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &406996094746600084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5213622239075964576} + 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: 1764245029811365376} + 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: -18, y: 0.15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2891039632683732111 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5213622239075964576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} + m_Name: + m_EditorClassIdentifier: + RectTransformOverride: {fileID: 0} + parentSet: 0 + parent: {fileID: 3206193790585330384} + Recycled: 0 + YMirror: 0 +--- !u!114 &3150584408154786610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5213622239075964576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5366400591781272439 GameObject: m_ObjectHideFlags: 0 @@ -2601,77 +2843,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5456620132820551501 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1438291785404480553} - - component: {fileID: 3288119465265818669} - - component: {fileID: 4596479150856752779} - m_Layer: 5 - m_Name: item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1438291785404480553 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5456620132820551501} - 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: 6137175612636235404} - m_Father: {fileID: 7115404593487703308} - 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} - m_AnchoredPosition: {x: -204, y: 49.650024} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3288119465265818669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5456620132820551501} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!223 &4596479150856752779 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5456620132820551501} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 --- !u!1 &5515427443441339157 GameObject: m_ObjectHideFlags: 0 @@ -2747,7 +2918,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &5607038759545363921 +--- !u!1 &5572605650429787303 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2755,303 +2926,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5809266323397017140} - - component: {fileID: 8614230661331115216} - - component: {fileID: 5771270275011557844} - m_Layer: 5 - m_Name: Text(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5809266323397017140 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5607038759545363921} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} - m_Children: [] - m_Father: {fileID: 4817856901323287103} - 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: 50, y: 50} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8614230661331115216 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5607038759545363921} - m_CullTransparentMesh: 0 ---- !u!114 &5771270275011557844 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5607038759545363921} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 600 ---- !u!1 &5956609850160430564 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2136269147129065220} - - component: {fileID: 603611664515686889} - - component: {fileID: 7801054154339242728} - m_Layer: 5 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2136269147129065220 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5956609850160430564} - 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: 756793808329525777} - 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} - m_AnchoredPosition: {x: -18, y: 198.15} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &603611664515686889 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5956609850160430564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransformOverride: {fileID: 0} - parentSet: 0 - parent: {fileID: 2178542770819332539} - Recycled: 0 - YMirror: 0 ---- !u!114 &7801054154339242728 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5956609850160430564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &6038004550965492058 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5977895225414350482} - - component: {fileID: 1078806965256760852} - - component: {fileID: 7300845987439496544} - m_Layer: 5 - m_Name: item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5977895225414350482 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6038004550965492058} - 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: 421943179922999040} - m_Father: {fileID: 7115404593487703308} - 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: -204, y: -82.349976} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1078806965256760852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6038004550965492058} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!223 &7300845987439496544 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6038004550965492058} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!1 &6100001294084719522 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8373171710396268635} - - component: {fileID: 2971425666502693808} - - component: {fileID: 8023692694426989462} - m_Layer: 5 - m_Name: Text(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8373171710396268635 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6100001294084719522} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} - m_Children: [] - m_Father: {fileID: 4528960658837347503} - 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: 50, y: 50} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2971425666502693808 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6100001294084719522} - m_CullTransparentMesh: 0 ---- !u!114 &8023692694426989462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6100001294084719522} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 800 ---- !u!1 &6455984423629890753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7514633768374641636} - - component: {fileID: 450050600846366345} - - component: {fileID: 3472696166549967906} - - component: {fileID: 6730828646113092487} + - component: {fileID: 7315422122198282610} + - component: {fileID: 3235071657811185463} + - component: {fileID: 1424436104565922876} + - component: {fileID: 1712273310069108472} m_Layer: 5 m_Name: Lines m_TagString: Untagged @@ -3059,52 +2937,52 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7514633768374641636 +--- !u!224 &7315422122198282610 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6455984423629890753} + m_GameObject: {fileID: 5572605650429787303} 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: 5738695721650226213} - m_RootOrder: 2 + m_Father: {fileID: 136932621139917463} + 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 &450050600846366345 +--- !u!114 &3235071657811185463 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6455984423629890753} + m_GameObject: {fileID: 5572605650429787303} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &3472696166549967906 +--- !u!222 &1424436104565922876 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6455984423629890753} + m_GameObject: {fileID: 5572605650429787303} m_CullTransparentMesh: 0 ---- !u!114 &6730828646113092487 +--- !u!114 &1712273310069108472 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6455984423629890753} + m_GameObject: {fileID: 5572605650429787303} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2032ee9ddbfbfb74da66a209b05d468d, type: 3} @@ -3118,7 +2996,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] Thickness: 2 ---- !u!1 &6651105448511173583 +--- !u!1 &5914980495223314537 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3126,224 +3004,142 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 584612406312352217} - - component: {fileID: 7978988669425728504} - - component: {fileID: 8403996734282975164} + - component: {fileID: 7626577941067044118} + - component: {fileID: 472640167119667730} + - component: {fileID: 205092468377001707} + - component: {fileID: 1510208706673359119} m_Layer: 5 - m_Name: New Game Object + m_Name: Lines m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &584612406312352217 +--- !u!224 &7626577941067044118 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6651105448511173583} + m_GameObject: {fileID: 5914980495223314537} 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: 756793808329525777} - m_RootOrder: 2 - 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: -18, y: 66.15} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7978988669425728504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6651105448511173583} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransformOverride: {fileID: 0} - parentSet: 0 - parent: {fileID: 3683649784781322604} - Recycled: 0 - YMirror: 0 ---- !u!114 &8403996734282975164 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6651105448511173583} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &6775745968694696525 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6013066611228663500} - - component: {fileID: 8167174930808985926} - - component: {fileID: 4561558355814100403} - m_Layer: 5 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6013066611228663500 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6775745968694696525} - 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: 756793808329525777} - 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: -18, y: 99.15} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8167174930808985926 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6775745968694696525} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransformOverride: {fileID: 0} - parentSet: 0 - parent: {fileID: 4817856901323287103} - Recycled: 0 - YMirror: 0 ---- !u!114 &4561558355814100403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6775745968694696525} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &6901271797200267060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 756793808329525777} - - component: {fileID: 8028584615433370485} - - component: {fileID: 3117250709921437370} - - component: {fileID: 1005701966682841988} - m_Layer: 5 - m_Name: item - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &756793808329525777 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6901271797200267060} - 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: 781085996890271118} - - {fileID: 4034473370963495910} - - {fileID: 584612406312352217} - - {fileID: 6013066611228663500} - - {fileID: 3168144425281408105} - - {fileID: 5727021386734965873} - - {fileID: 2136269147129065220} - m_Father: {fileID: 182636268937576404} + m_Father: {fileID: 136932621139917463} 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: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8028584615433370485 +--- !u!114 &472640167119667730 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6901271797200267060} + m_GameObject: {fileID: 5914980495223314537} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &3117250709921437370 +--- !u!222 &205092468377001707 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6901271797200267060} + m_GameObject: {fileID: 5914980495223314537} m_CullTransparentMesh: 0 ---- !u!114 &1005701966682841988 +--- !u!114 &1510208706673359119 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6901271797200267060} + m_GameObject: {fileID: 5914980495223314537} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7d05bb511ff55104f930cb9d1c27c8d7, type: 3} + 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: 0 + m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - 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 + Thickness: 3 +--- !u!1 &6580907858517574467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2069109959882835638} + - component: {fileID: 4288368951160310463} + - component: {fileID: 3747055840468642031} + m_Layer: 5 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2069109959882835638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580907858517574467} + 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: 1764245029811365376} + m_RootOrder: 4 + 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: -18, y: 132.15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4288368951160310463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580907858517574467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} + m_Name: + m_EditorClassIdentifier: + RectTransformOverride: {fileID: 0} + parentSet: 0 + parent: {fileID: 8777112992124395435} + Recycled: 0 + YMirror: 0 +--- !u!114 &3747055840468642031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6580907858517574467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6902845908893712120 GameObject: m_ObjectHideFlags: 0 @@ -4208,6 +4004,7 @@ RectTransform: - {fileID: 386558059855836293} - {fileID: 1750455046143848137} - {fileID: 693397868103561169} + - {fileID: 5616129665370729450} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4236,6 +4033,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 406120aa4593dd340844428cea64a7bc, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} --- !u!225 &3979242640080802380 CanvasGroup: m_ObjectHideFlags: 0 @@ -4895,6 +4693,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e84219e49caa1f46be9f0277fd3b7c5, type: 3} m_Name: m_EditorClassIdentifier: + newNav: {fileID: 0} isFinish: 0 --- !u!1 &6902845910353967181 GameObject: @@ -6068,6 +5867,131 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: BPM +--- !u!1 &6991592069642104767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 238484529820959138} + - component: {fileID: 5568415376889850632} + 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 &238484529820959138 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991592069642104767} + 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: 9141795986060461115} + - {fileID: 1764245029811365376} + - {fileID: 5019477492083042222} + - {fileID: 1179532921585830886} + - {fileID: 136932621139917463} + - {fileID: 326760644030275416} + m_Father: {fileID: 7709334729231744868} + 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: 372, y: 231} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5568415376889850632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991592069642104767} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6991629982934811009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4611258717269864919} + - component: {fileID: 7567184101816339889} + - component: {fileID: 6798087132653682606} + m_Layer: 5 + m_Name: item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4611258717269864919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991629982934811009} + 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: 8482325629772612527} + m_Father: {fileID: 326760644030275416} + 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} + m_AnchoredPosition: {x: -204, y: 82.649994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7567184101816339889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991629982934811009} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!223 &6798087132653682606 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6991629982934811009} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &7211605632106018478 GameObject: m_ObjectHideFlags: 0 @@ -6098,7 +6022,7 @@ Transform: m_Father: {fileID: 1874380802909331047} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7295433640815235417 +--- !u!1 &7986690326230657971 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6106,10 +6030,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2902750159622789783} - - component: {fileID: 1844420652131145852} - - component: {fileID: 8615701985451651529} - - component: {fileID: 1273371233182268946} + - component: {fileID: 1764245029811365376} + - component: {fileID: 560746503714767808} + - component: {fileID: 2636712224091496184} + - component: {fileID: 375525684540131835} m_Layer: 5 m_Name: item m_TagString: Untagged @@ -6117,52 +6041,59 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2902750159622789783 +--- !u!224 &1764245029811365376 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7295433640815235417} + m_GameObject: {fileID: 7986690326230657971} 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: 182636268937576404} - m_RootOrder: 2 + m_Children: + - {fileID: 406996094746600084} + - {fileID: 1441204771881112435} + - {fileID: 4133606464887294421} + - {fileID: 7908821040839415242} + - {fileID: 2069109959882835638} + - {fileID: 7168175655652908439} + - {fileID: 927529457441695804} + m_Father: {fileID: 238484529820959138} + 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: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1844420652131145852 +--- !u!114 &560746503714767808 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7295433640815235417} + m_GameObject: {fileID: 7986690326230657971} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!222 &8615701985451651529 +--- !u!222 &2636712224091496184 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7295433640815235417} + m_GameObject: {fileID: 7986690326230657971} m_CullTransparentMesh: 0 ---- !u!114 &1273371233182268946 +--- !u!114 &375525684540131835 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7295433640815235417} + m_GameObject: {fileID: 7986690326230657971} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7d05bb511ff55104f930cb9d1c27c8d7, type: 3} @@ -6216,7 +6147,7 @@ Transform: m_Father: {fileID: 7709334729231744868} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &8962106800375398945 +--- !u!1 &8137917268019847257 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -6224,9 +6155,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4528960658837347503} - - component: {fileID: 5008233693795826841} - - component: {fileID: 1165998181481471717} + - component: {fileID: 3206193790585330384} + - component: {fileID: 9043516981850809542} + - component: {fileID: 2218982416733507987} m_Layer: 5 m_Name: item m_TagString: Untagged @@ -6234,45 +6165,45 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4528960658837347503 +--- !u!224 &3206193790585330384 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8962106800375398945} + m_GameObject: {fileID: 8137917268019847257} 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: 8373171710396268635} - m_Father: {fileID: 7115404593487703308} - m_RootOrder: 4 + - {fileID: 6830057141433802507} + m_Father: {fileID: 326760644030275416} + 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: -204, y: 16.650024} + m_AnchoredPosition: {x: -204, y: -115.350006} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &5008233693795826841 +--- !u!114 &9043516981850809542 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8962106800375398945} + m_GameObject: {fileID: 8137917268019847257} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!223 &1165998181481471717 +--- !u!223 &2218982416733507987 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8962106800375398945} + m_GameObject: {fileID: 8137917268019847257} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 @@ -6287,6 +6218,242 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1 &8283756406363188906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1441204771881112435} + - component: {fileID: 8124387926092967621} + - component: {fileID: 3831167145977110053} + m_Layer: 5 + m_Name: New Game Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1441204771881112435 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8283756406363188906} + 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: 1764245029811365376} + 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: -18, y: 33.15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8124387926092967621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8283756406363188906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} + m_Name: + m_EditorClassIdentifier: + RectTransformOverride: {fileID: 0} + parentSet: 0 + parent: {fileID: 5139653051851993301} + Recycled: 0 + YMirror: 0 +--- !u!114 &3831167145977110053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8283756406363188906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &9005618196056779426 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8482325629772612527} + - component: {fileID: 2309223411133230060} + - component: {fileID: 7554137058848071087} + - component: {fileID: 7574910915894470748} + m_Layer: 5 + m_Name: Text(Clone) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8482325629772612527 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005618196056779426} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.33333334, y: 0.33333334, z: 1} + m_Children: [] + m_Father: {fileID: 4611258717269864919} + 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: 50, y: 50} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2309223411133230060 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005618196056779426} + m_CullTransparentMesh: 0 +--- !u!114 &7554137058848071087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005618196056779426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 1200 +--- !u!114 &7574910915894470748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9005618196056779426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e47f6ee11b78f3247a0b474b6c36e2cd, type: 3} + m_Name: + m_EditorClassIdentifier: + key: +--- !u!1 &9114379686159896170 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7774701517065333348} + - component: {fileID: 8645243393661892612} + - component: {fileID: 2695464488269755880} + - component: {fileID: 1781925114859692600} + m_Layer: 5 + m_Name: Lines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7774701517065333348 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114379686159896170} + 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: 136932621139917463} + m_RootOrder: 2 + 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 &8645243393661892612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114379686159896170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!222 &2695464488269755880 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114379686159896170} + m_CullTransparentMesh: 0 +--- !u!114 &1781925114859692600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9114379686159896170} + 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 &9165909320491486160 GameObject: m_ObjectHideFlags: 0 @@ -6376,72 +6543,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 26 ---- !u!1 &9204500606917870262 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5727021386734965873} - - component: {fileID: 3019573808215177561} - - component: {fileID: 5721640922637798171} - m_Layer: 5 - m_Name: New Game Object - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5727021386734965873 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9204500606917870262} - 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: 756793808329525777} - 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} - m_AnchoredPosition: {x: -18, y: 165.15} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3019573808215177561 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9204500606917870262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6664fc8f2f18cc147bbdc9790ab8e9ac, type: 3} - m_Name: - m_EditorClassIdentifier: - RectTransformOverride: {fileID: 0} - parentSet: 0 - parent: {fileID: 1438291785404480553} - Recycled: 0 - YMirror: 0 ---- !u!114 &5721640922637798171 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9204500606917870262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55b5a59897c650342a9b23ff348a9992, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6004787887509517581 PrefabInstance: m_ObjectHideFlags: 0 @@ -6562,7 +6663,7 @@ PrefabInstance: - target: {fileID: 6542106740173953757, guid: f161296c0ad4a2047a2d64918bb11cf5, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6542106740370086310, guid: f161296c0ad4a2047a2d64918bb11cf5, type: 3} @@ -6572,7 +6673,7 @@ PrefabInstance: - target: {fileID: 6542106740370086311, guid: f161296c0ad4a2047a2d64918bb11cf5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6542106740516171144, guid: f161296c0ad4a2047a2d64918bb11cf5, type: 3} @@ -6672,12 +6773,12 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6687,13 +6788,18 @@ PrefabInstance: - target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_Name value: MainNav objectReference: {fileID: 0} + - target: {fileID: 2638424933752433026, guid: a1999d0576fee6248a9c5a507ae8d10e, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2638424933752433027, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_Pivot.x @@ -6872,12 +6978,12 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6887,7 +6993,7 @@ PrefabInstance: - target: {fileID: 5249748558008090706, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5972488954695143433, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6897,12 +7003,12 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6912,17 +7018,17 @@ PrefabInstance: - target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6932,17 +7038,17 @@ PrefabInstance: - target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -9 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -6952,7 +7058,7 @@ PrefabInstance: - target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} propertyPath: m_AnchoredPosition.y - value: -2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9135822971364406318, guid: a1999d0576fee6248a9c5a507ae8d10e, type: 3} @@ -7607,6 +7713,591 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6902845910638294383} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7596747196136702569 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6902845909725794297} + m_Modifications: + - target: {fileID: 485508193206389098, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 972574968444736182, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1409429025663639838, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -282 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1450106334936664745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -182 + objectReference: {fileID: 0} + - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1592441871873768741, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 1617869899094122649, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2004034070328387769, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2004396901057112773, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2054923810110871857, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2401890155248940689, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2401890155248940689, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2401890155248940689, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2401890155248940689, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -82 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433026, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_Name + value: MainNav-mobile + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433026, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 64 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.y + value: 564 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3068819108013337933, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -232 + objectReference: {fileID: 0} + - target: {fileID: 3319170174453971756, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3511827664771645704, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3991752987403741024, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 4027836304468151454, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4027836304468151454, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4027836304468151454, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4027836304468151454, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -382 + objectReference: {fileID: 0} + - target: {fileID: 4050334335733771918, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4204578097682859198, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -482 + objectReference: {fileID: 0} + - target: {fileID: 4586126367539938617, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4834968900665809806, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5249748558008090706, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5972488954695143433, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5976554196684205079, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5976554196684205079, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5976554196684205079, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5976554196684205079, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -332 + objectReference: {fileID: 0} + - target: {fileID: 6136707506785487487, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6136707506785487487, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6136707506785487487, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 6136707506785487487, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -32 + objectReference: {fileID: 0} + - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6172683569922498945, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6176415319428293629, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6347209353323850145, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 6376947731341292573, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7793409217181307314, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_VerticalFit + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8197454007437855745, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8382612560249065530, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -432 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 8526344065104504758, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 8719966614707449432, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8763288661036287962, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8763288661036287962, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8763288661036287962, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8763288661036287962, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -532 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 9135822971364406318, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -132 + objectReference: {fileID: 0} + - target: {fileID: 9140761301233977392, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + propertyPath: m_SizeDelta.x + value: 40 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 240a4465e4dc90848a0efc1a9520c658, type: 3} +--- !u!224 &5616129665370729450 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2638424933752433027, guid: 240a4465e4dc90848a0efc1a9520c658, + type: 3} + m_PrefabInstance: {fileID: 7596747196136702569} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7756902593242647440 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Devices/Ant/Interfaces/IRowerDevice.cs b/Assets/Scripts/Devices/Ant/Interfaces/IRowerDevice.cs index eb72ebe6..1ab32317 100644 --- a/Assets/Scripts/Devices/Ant/Interfaces/IRowerDevice.cs +++ b/Assets/Scripts/Devices/Ant/Interfaces/IRowerDevice.cs @@ -11,5 +11,6 @@ namespace Assets.Scripts.Devices.Ant.Interfaces { FtmsRowerData rowerData { get; } void Reset(); + void SetResistanceLevel(ushort v); } } diff --git a/Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs b/Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs index 59bc4ae9..e522b554 100644 --- a/Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs +++ b/Assets/Scripts/Devices/Ble/Devices/FtmsRower.cs @@ -77,5 +77,11 @@ namespace Assets.Scripts.Devices.Ble.Devices Debug.Log("发送重置命令"+this.controlPointCharacteristic.ToString()); hwInterface.WriteCharacteristic(this.controlPointCharacteristic, new byte[] { 0x01 }); } + public void SetResistanceLevel(ushort v) + { + var r = new byte[] { 0x04 }.Concat(BitConverter.GetBytes(v)).ToArray(); + Debug.Log($"设置阻力{v}, {string.Join(",", r)}"); + hwInterface.WriteCharacteristic(this.controlPointCharacteristic, r); + } } } diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index f66a247e..c642dfe3 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -295,18 +295,18 @@ public class MainController : BaseScene //{ // UIManager.ShowHomePanel(); //}); - //#if UNITY_ANDROID || UNITY_IOS - // if (!App.IsRowerMode.HasValue) - // { - // UIManager.ShowRowerSelector(); - // return; - // } - // if (App.IsRowerMode == true) - // { - // UIManager.ShowRowerPanel(); - // return; - // } - //#endif +#if UNITY_ANDROID || UNITY_IOS + if (!App.IsRowerMode.HasValue) + { + UIManager.ShowRowerSelector(); + return; + } + if (App.IsRowerMode == true) + { + UIManager.ShowRowerPanel(); + return; + } +#endif LastRide();//检查本地异常中断的骑行并弹窗提示继续 if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"])) { diff --git a/Assets/Scripts/UI/Control/PFUISlider.cs b/Assets/Scripts/UI/Control/PFUISlider.cs index 53e47344..beca311c 100644 --- a/Assets/Scripts/UI/Control/PFUISlider.cs +++ b/Assets/Scripts/UI/Control/PFUISlider.cs @@ -17,6 +17,16 @@ public class PFUISlider : MonoBehaviour text.text = $"{(f * 100).ToString("#0")}%"; }); } + public void SetValueChanged(System.Action a) + { + slider = transform.GetComponent(); + slider.onValueChanged.RemoveAllListeners(); + slider.onValueChanged.AddListener((f) => + { + text.text = $"{(f * 100).ToString("#0")}%"; + a.Invoke(f); + }); + } // Start is called before the first frame update void Start() { diff --git a/Assets/Scripts/UI/Prefab/NewMainNav.cs b/Assets/Scripts/UI/Prefab/NewMainNav.cs index 5d378e33..6ec0c11f 100644 --- a/Assets/Scripts/UI/Prefab/NewMainNav.cs +++ b/Assets/Scripts/UI/Prefab/NewMainNav.cs @@ -62,7 +62,7 @@ public class NewMainNav : MonoBehaviour SetExpand(false); } - + /// /// true:展开 false:关闭 /// @@ -75,7 +75,7 @@ public class NewMainNav : MonoBehaviour types = typeArray.Where((x, i) => indexs.Contains(i)).ToList(); } string shrinkName = null; - if (shrinkIndex.HasValue && (shrinkIndex == 0 || shrinkIndex == 2)) + if (shrinkIndex.HasValue && isShrinkIndex(shrinkIndex.Value)) { shrinkName = typeArray[shrinkIndex.Value]; } @@ -115,7 +115,7 @@ public class NewMainNav : MonoBehaviour public void ShowButton(string v) { var i = typeArray.FindIndex((x)=>x == v); - if (i == -1 || i == 0 || i == 2) + if (i == -1 || isShrinkIndex(i)) { return; } @@ -125,7 +125,7 @@ public class NewMainNav : MonoBehaviour public void HideButton(string v) { var i = typeArray.FindIndex((x) => x == v); - if (i == -1 || i == 0 || i == 2) + if (i == -1 || isShrinkIndex(i)) { return; } @@ -230,7 +230,10 @@ public class NewMainNav : MonoBehaviour transform.Find("Home").gameObject.SetActive(false); } } - + private bool isShrinkIndex(int ind) + { + return ind == 0 || ind == 2; + } // Start is called before the first frame update void Start() { diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index bc16b9ff..5006624c 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -42,7 +42,10 @@ public class HomeController : PFUIPanel #if UNITY_ANDROID || UNITY_IOS var nav = transform.Find("MainNav-mobile").GetComponent(); - nav.SetButtonActive(new List { 1, 3, 4, 6 }); + nav.SetButtonActive(new List { 1, 3, 4, 6 },null,new NewMainNav.CustomButton(Resources.Load("Images/Rower/划船"), () => + { + UIManager.ShowRowerPanel(); + })); newNav = nav; UIManager.AddEvent(transform.Find("TodayData/Datas/Distance").gameObject, EventTriggerType.PointerClick, b => { diff --git a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs index 7d35a8a2..8c809984 100644 --- a/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs +++ b/Assets/Scripts/UI/Prefab/Panel/RowerHomeScript.cs @@ -93,6 +93,14 @@ public class RowerHomeScript : PFUIPanel /// int stopSeconds = 0; uint totalDistance = 0; + protected override void Start() + { + var nav = transform.Find("MainNav-mobile").GetComponent(); + nav.SetButtonActive(new List {1,4,6 }, null, new NewMainNav.CustomButton(Resources.Load("Images/Rower/骑行"), () => + { + ReturnHome(); + })); + } protected override void Awake() { spriteDict = new Dictionary() @@ -127,6 +135,15 @@ public class RowerHomeScript : PFUIPanel left = transform.Find("Left"); bottom = transform.Find("Bottom"); PaintPullCurveDelegate = new EventHandler(PaintPullCurve); + transform.Find("PFUISlider").GetComponent().SetValueChanged(r => + { + var v = (ushort)(r * 65535); + if (Rower != null) + { + Rower.SetResistanceLevel(v); + //RowerData. + } + }); Init(); } diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index ef682017..c2cee6dc 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -22,7 +22,7 @@ - + \ No newline at end of file diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e6472eab..a8d0cf47 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2.1.2 + bundleVersion: 100.0.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -256,7 +256,7 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 3 + AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 1 + Android: 0 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0 From 3b0ffd78e764285a0162c30cdb1e363966f8968f Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 24 Feb 2022 08:58:03 +0800 Subject: [PATCH 02/38] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/UI/language.json | 8 ++++++-- Assets/Scripts/UI/Prefab/Activity/ActivityController.cs | 7 ++++--- ProjectSettings/ProjectSettings.asset | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Assets/Resources/UI/language.json b/Assets/Resources/UI/language.json index b9287025..af90099d 100644 --- a/Assets/Resources/UI/language.json +++ b/Assets/Resources/UI/language.json @@ -317,7 +317,9 @@ "NO RIDERS": "暂无用户", "Current Version:": "当前版本：", "Latest Version:": "最新版本：", - "Confirm participation": "确认参加活动" + "Confirm participation": "确认参加活动", + "Light up China Share": "快来和我一起点亮中国吧！", + "Copy Success": "复制成功" }, "en": { "HOT ROUTES": "HOT ROUTES", @@ -629,6 +631,8 @@ "NO RIDERS": "NO RIDERS", "Current Version:": "Current Version:", "Latest Version:": "Latest Version:", - "Confirm participation": "Confirm participation" + "Confirm participation": "Confirm participation", + "Light up China Share": "Come and light up China with me!", + "Copy Success": "Copy successfully" } } diff --git a/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs b/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs index 4435e940..2875cbef 100644 --- a/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs +++ b/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs @@ -76,6 +76,7 @@ public class ActivityController : PFUIPanel { if (action == null) { + //webView.UserAgent = "tes "+ App.GetLocalLanguage(); webView.LoadURL(url, true); } else @@ -130,18 +131,18 @@ public class ActivityController : PFUIPanel { if (App.weChatController.IsWeChatAppInstalled()) { - App.weChatController.ShareWebpageToWX(type, url, "点亮中国活动", "by " + App.CurrentUser.Nickname, null); + App.weChatController.ShareWebpageToWX(type, url, App.GetLocalString("Light up China Share"), "by " + App.CurrentUser.Nickname, null); } } else if (type == 2) { UnityEngine.GUIUtility.systemCopyBuffer = url; - RunJavaScript("window.postMessage(\"webview;复制成功\")"); + RunJavaScript($"window.postMessage(\"webview;{App.GetLocalString("Copy Success")}\")"); } else { Facebook.Unity.FB.ShareLink(contentURL: new Uri(url), - contentTitle: "点亮中国活动", + contentTitle: App.GetLocalString("Light up China Share"), contentDescription: "By " + App.CurrentUser.Nickname, photoURL: new Uri(App.CurrentUser.WxHeadImg)); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 62ee12c4..682bf7b9 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -179,7 +179,7 @@ PlayerSettings: applicationIdentifier: Android: com.ZhiXingPai.PowerFunUnity buildNumber: - iPhone: 2.1.2.3 + iPhone: 2.1.3.0 AndroidBundleVersionCode: 16 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 30 From 7e67184248296f51b28b9aafb65ba302c9c68110 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 24 Feb 2022 09:18:53 +0800 Subject: [PATCH 03/38] =?UTF-8?q?=E4=B8=8D=E7=BB=99=E5=8A=9F=E7=8E=87?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=AF=94=E8=B5=9B=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E6=9C=89=E6=B5=B7=E6=8B=94=E5=9B=BE=E7=9A=84=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab | 2 +- Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs | 4 ++-- Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab b/Assets/Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab index b9ed6ee8..6b32deee 100644 --- a/Assets/Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/Race/Mobile/ItemSmall-Mobile.prefab @@ -1551,7 +1551,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5521075338908913119 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs index 0f65b620..1a67ba82 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/CyclingController.cs @@ -822,9 +822,9 @@ public BaseUIManager singleUIManager; Camera.main.transform.DOLocalMove(neareast, 1f); //StartCoroutine(MoveCamera(far, near));//初始摄像头 var check = CheckAnt(); -//#if UNITY_EDITOR +#if UNITY_EDITOR check = true; -//#endif +#endif if (check || isWatch) { singleUIManager.StartRide(); diff --git a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs index 695f54fc..71a98de1 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/PlayerController.cs @@ -60,9 +60,9 @@ namespace Assets.Scenes.Ride.Scripts cadance = mainController.UpdateCadence(); weight = App.CurrentUser.Weight; bicycleWeight = App.CurrentUser.BicycleWeight; -//#if UNITY_EDITOR +#if UNITY_EDITOR power = 300; -//#endif +#endif mainController.TrackResistance(currentSlope * App.RideSetting.Sensitivity / 100); } catch (Exception ex) From b039388a596f2e695aaf4b22ef020083136d7129 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 24 Feb 2022 14:49:13 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BA=BF=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/App.cs | 12 ++++++------ ProjectSettings/AndroidResolverDependencies.xml | 4 ++-- ProjectSettings/EditorBuildSettings.asset | 4 ++-- ProjectSettings/GraphicsSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 8 ++++---- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index ac75f51b..388c4cdc 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -203,13 +203,13 @@ public static class App InitLanguage(); #if !UNITY_EDITOR //测试服务器 - Host = "http://pf.juze.pro/"; - UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); - TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); + //Host = "http://pf.juze.pro/"; + //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); + //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); //线上 - //Host = "https://wx.powerfun.com.cn/"; - //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); - //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + Host = "https://wx.powerfun.com.cn/"; + UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); + TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); //本地 //Host = "http://192.168.0.101:5085/"; //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index c2cee6dc..b7cdca94 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - + \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c5b8a1b5..999e430b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Login.unity - guid: 6dce3e17997730b4492f91dd8fede429 + path: Assets/Scenes/Login-Mobile.unity + guid: 4be878da00cf764499988cf403faf94d - enabled: 1 path: Assets/Scenes/MainScene.unity guid: ab586a3c1bacd4a48a55178eb06fe0cc diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4706883c..9b996cb4 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 682bf7b9..669f8140 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -179,8 +179,8 @@ PlayerSettings: applicationIdentifier: Android: com.ZhiXingPai.PowerFunUnity buildNumber: - iPhone: 2.1.3.0 - AndroidBundleVersionCode: 16 + iPhone: 2.1.3.1 + AndroidBundleVersionCode: 18 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1 @@ -256,7 +256,7 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 0 + Android: 1 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0 From 01df2992511776077ec13bd5dd5ec7cb9ffe211d Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Wed, 2 Mar 2022 17:03:29 +0800 Subject: [PATCH 05/38] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/mail.meta | 8 + Assets/Resources/Images/mail/邮件2.png | Bin 0 -> 2655 bytes Assets/Resources/Images/mail/邮件2.png.meta | 128 + Assets/Resources/Images/mail/邮件4.png | Bin 0 -> 499 bytes Assets/Resources/Images/mail/邮件4.png.meta | 128 + Assets/Resources/UI/Prefab/Mail.meta | 8 + .../Resources/UI/Prefab/Mail/MailItem.prefab | 412 +++ .../UI/Prefab/Mail/MailItem.prefab.meta | 7 + Assets/Resources/UI/Prefab/MainNav.prefab | 280 +- .../UI/Prefab/Panel/BigMapPanel.prefab | 48 +- .../UI/Prefab/Panel/EarthPanel.prefab | 888 +++--- .../UI/Prefab/Panel/MailDetailPanel.prefab | 978 +++++++ .../Prefab/Panel/MailDetailPanel.prefab.meta | 7 + .../UI/Prefab/Panel/MailListPanel.prefab | 1040 +++++++ .../UI/Prefab/Panel/MailListPanel.prefab.meta | 7 + .../UI/Prefab/Panel/MapListPanel.prefab | 47 +- .../Prefab/Panel/NewRouteOverviewPanel.prefab | 53 +- .../UI/Prefab/Panel/NewsModal.prefab | 1 + .../UI/Prefab/Panel/RaceHomePanel.prefab | 50 +- .../UI/Prefab/Panel/RaceListPanel.prefab | 48 +- Assets/Resources/UI/language.json | 12 +- Assets/Scenes/Login.unity | 2495 +++++++++-------- Assets/Scenes/Test2.unity | 465 ++- Assets/Scripts/Apis/MailApi.cs | 32 + Assets/Scripts/Apis/MailApi.cs.meta | 11 + Assets/Scripts/Apis/MapApi.cs | 3 +- Assets/Scripts/Apis/Models/MailModel.cs | 20 + Assets/Scripts/Apis/Models/MailModel.cs.meta | 11 + Assets/Scripts/App.cs | 18 +- Assets/Scripts/ConfigHelper.cs | 10 + Assets/Scripts/Scenes/MainController.cs | 1 + Assets/Scripts/UI/Prefab/Mail.meta | 8 + .../UI/Prefab/Mail/MailDetailController.cs | 59 + .../Prefab/Mail/MailDetailController.cs.meta | 11 + .../UI/Prefab/Mail/MailItemController.cs | 37 + .../UI/Prefab/Mail/MailItemController.cs.meta | 11 + .../UI/Prefab/Mail/MailListController.cs | 56 + .../UI/Prefab/Mail/MailListController.cs.meta | 11 + Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs | 64 + .../UI/Prefab/Mail/MailReceiver.cs.meta | 11 + Assets/Scripts/UI/Prefab/MainNav.cs | 12 +- Assets/Scripts/UIManager.cs | 32 + 42 files changed, 5747 insertions(+), 1781 deletions(-) create mode 100644 Assets/Resources/Images/mail.meta create mode 100644 Assets/Resources/Images/mail/邮件2.png create mode 100644 Assets/Resources/Images/mail/邮件2.png.meta create mode 100644 Assets/Resources/Images/mail/邮件4.png create mode 100644 Assets/Resources/Images/mail/邮件4.png.meta create mode 100644 Assets/Resources/UI/Prefab/Mail.meta create mode 100644 Assets/Resources/UI/Prefab/Mail/MailItem.prefab create mode 100644 Assets/Resources/UI/Prefab/Mail/MailItem.prefab.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/MailDetailPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/MailDetailPanel.prefab.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/MailListPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/MailListPanel.prefab.meta create mode 100644 Assets/Scripts/Apis/MailApi.cs create mode 100644 Assets/Scripts/Apis/MailApi.cs.meta create mode 100644 Assets/Scripts/Apis/Models/MailModel.cs create mode 100644 Assets/Scripts/Apis/Models/MailModel.cs.meta create mode 100644 Assets/Scripts/UI/Prefab/Mail.meta create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs.meta create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailItemController.cs create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailItemController.cs.meta create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailListController.cs create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailListController.cs.meta create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs create mode 100644 Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs.meta diff --git a/Assets/Resources/Images/mail.meta b/Assets/Resources/Images/mail.meta new file mode 100644 index 00000000..88f9a990 --- /dev/null +++ b/Assets/Resources/Images/mail.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9dc3c02036dcc184ea06acdea6af7adb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/mail/邮件2.png b/Assets/Resources/Images/mail/邮件2.png new file mode 100644 index 0000000000000000000000000000000000000000..5efc0512d0d053473f4d1ecc86382028ed5f2dbd GIT binary patch literal 2655 zcmV-l3ZV6gP)QZ)fC^EY(#CnKppH;KAVh?zqO_^fq$YNSKy4%E zlD-H9rJ`RTsiCo*xZy);pIsv2D!#kn`S0D@d$+si+qb(t-;Lz#?##|J&;0JmGc!B0 zvw{K=_U_%Qy!YP4b}8fhmux2z?IdIyt5+{2)d)c~9LIkM@;b*|=eX;9F+);(#Bn1+ zDEt>1S-<{EBP=he-df~;L@~?XeE&mhL_$VLQbbC*iFIl4NS|pT#M>k&Dyu~F%v&e_ z>5*L9VhRp8^1$|1nw#rls9g-T#kR%{GBE5>hJBR6;iJ(vPF!*z!f}>@0PgJUtct~w zk1)_DB+0Kk*4BfJg2Z1L_@Tx|<<)_KfrJMlbBgd4FoUh0oK8M2r0gk_wdSm?E)iBO zh3IQ;P>wL@o4O=VPkjTtc}vF*A;m8l>&JQpR$4>FO@8ytT+kr z!m8HhXZ!p6=e#J_6Tn-ycCL&k5+~Rle9a4`iY?CqrE?crR~-7|SInr^CkZ7bCO^TvLSgU;{>`sp-g^KDf62wqNnHg|h07<$`6Bwjwq?yKH>y z;;>1Y8fEDs@KkIrP9N}HrTXB;s?J`=$HO7|s?}3COBaDhjup6h{T87#E7O}z0pnqL zsXfm%tzCg4!3xaGiZi$fbtoK5j0Sxs!mKjIjKj=GQ)5+2_E6g3UonTq4V$BBp6cpq z3WW?Ji&<~mW#71Q!*(8IfI+J4i2C&cGAtOgzf-Zqzxd`B{Z09vfAbsn(~cdb+v(u` zK7IdtPtyNx%;sC=jQcQ=%2vEuKUTT9PBzngCR;ui{1o>qv)H06VN=2S~4#8FWc74qYcecRXK0QX?u zZfb9DGn6ws>$8hWGgUB&$0ohWpn*pb=g)sYhYlT~WHNKXIUqm!=(or($Z$n~yLxr2 zp(c})F*^3DzY{cI3byL9eb&IY(LqhkEi~}QKhcXXzCv*xDd~e>kO8-k-GUX|o~IAc zxpVL9Rq^Az0k1@`^~U*q2>-+J6R*?Z!^eDwTvu1KDBQ8p%e=OCm z7I*gnGQ!TC-^q9=q**f3j=Xdn2S*_Vw>O97?x(TQD~@D4$pp6CP2;zDu&km$!7s=u zw*a^;hMG)HPEmKy0U94K9Nd%=f&t@IslxG9%k>&^szKXBt5&TH5L{M;*`J2T}lVFhahT+|ZD+Tr0TUJ^Sf$@qDfU zCO2{tFH|=fQi>3`Rdm=R!$Mh+Gns9@zT%-~+THW^5`01CF~2hRkGZdw^DOV;bE!M$?j zsy;eM=QB!bGm9YUw4jTXCF2eiZudS4FkE)Q;v?=w$dQFA1@FuZ@;uy$z*=q^q#Oxh z8y0@*6Fjmyjr8tfiWi4G#g_Z=#D8>m1oISZ8E|NXq;K0Lcvf>jP9&0a?r-mx1YA@c zY!z%E#OKqVk?>IvW=1ATz;e?Frok3-a!G!=|F(}@%2G6#f^BN3%)2v{B?Uh#oo1>6 z4k_}CpJkP!Y-}fndSjqLSb-9`ZyQ#%x8T~#(A?a}&kk;Pu_)9_Z5CviJuF&Cb$5n! z!qN0zZ7N_@9QGBHw8x!jWA5hWCi+AF3&w<{90Qi=kn+K};7!}K$jZ?r0UgVEz}OKF zo3^IJ%Sc>w4Gs7n{UgOHJVBCbg9NCI{ z*@|tyD+de4UpWT0-m6W_F1zkk*%22mTu9vBddDRHm>t<^mFpY?6#CI${(KVqYGee1 zi_lUd_jSC(b4nYu>&nrZ08b6Q8$CU=(d>?lUWEPzY?R5@?!3NU;L<&hr&*cS(BLAp zyDnY&@Y>3jJ8$9Zd$qXA(S(2yzdk)Ybj&10jk2_0q+%CRcHZZ$GM9Ti*nm+k4wgPx z%T(DENh4u6y5AHDBC)Fy5C3)=#Fu#lm@KyA6cAbZU_HOFv5OyKGdAwJMfCCIdM*^P zJ9>IBV?bfWA}_$mj4fVQwye38r}^)(5>^iJ4EMLu;lZc#t!vIkE?dZ^4R`&Ro%UF4IgOJv&z zn+b#>yq(p0o^v|L>81RD2p=jr*w)&7uNQE^$`cFLL$7>lM^D2Cz?%5V$D&dsJaG{k zRQ(ZOx58eI#Pd{`4AiFu;at^;b%Tz6eTfV8^xQ?5!NZn~l@Iork?|p}^2tdbpjwGk z8$|4Q#ZT$5#|_`-)z&uiA5F!|Q7mq>(!uZeg1Cr$DuE4zmf~lB{|~rXCAEA(dFcQE N002ovPDHLkV1jE`7dQX_ literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/mail/邮件2.png.meta b/Assets/Resources/Images/mail/邮件2.png.meta new file mode 100644 index 00000000..544462e2 --- /dev/null +++ b/Assets/Resources/Images/mail/邮件2.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 495fe3f31f7098b4bb80a319f9dce410 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/mail/邮件4.png b/Assets/Resources/Images/mail/邮件4.png new file mode 100644 index 0000000000000000000000000000000000000000..b00fc5ee602b522abcbe2534ee6ba4c8d760719d GIT binary patch literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Eu!3HE}2mdz#QY`6?zK#qG8~eHcB(ehe7O4@Q zX}-P;T0k}j17mw80}GJF2*grA%)r33fC(<5uz(rPmH!^;3C!*jYfyA1)S3k@a8>nVRc-@9_3-Ngq<&hL8!)U_r#eMZ0`jO zr_Gu9(fFPCvi_x+yC03evU}??2oDP@h=q0 zzgw-aJ$!iMeSzDDx7My-a7pl;ap3Wps!jWfZB+K>8UAG|a&bAayh+t<-~5JcCrvpI zs2`iW{^VxX3ZU@%CE?N6SgaUkB~RX=@VzlRdzW2p(1m(d#)giFEVajZleqnS8h-Cz zu>> GetList(int pageIndex,int pageSize, int type) + { + var result = await GetAsync>>($"Message/GetList?pageIndex={pageIndex}&pageSize={pageSize}&type={type}"); + return result; + } + + public async Task> MarkRead(int id) + { + var result = await PostAsync>("Message/MarkRead",new { id}); + return result; + } + + public async Task> Delete(int id) + { + var result = await PostAsync>("Message/Delete", new { id }); + return result; + } + } +} diff --git a/Assets/Scripts/Apis/MailApi.cs.meta b/Assets/Scripts/Apis/MailApi.cs.meta new file mode 100644 index 00000000..77b2f386 --- /dev/null +++ b/Assets/Scripts/Apis/MailApi.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 593b04d43282490459537d561d16096d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Apis/MapApi.cs b/Assets/Scripts/Apis/MapApi.cs index 7aa68be7..d1c115d3 100644 --- a/Assets/Scripts/Apis/MapApi.cs +++ b/Assets/Scripts/Apis/MapApi.cs @@ -1,5 +1,4 @@ - -using Assets.Scenes.Ride.Scripts.Model; +using Assets.Scenes.Ride.Scripts.Model; using Assets.Scripts.Apis.Models; using System; using System.Collections.Generic; diff --git a/Assets/Scripts/Apis/Models/MailModel.cs b/Assets/Scripts/Apis/Models/MailModel.cs new file mode 100644 index 00000000..1faf77ee --- /dev/null +++ b/Assets/Scripts/Apis/Models/MailModel.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Assets.Scripts.Apis.Models +{ + public class MailModel + { + public int Id { get; set; } + public string Title { get; set; } + public string Desc { get; set; } + public bool IsRead { get; set; } + public DateTime CreateTime { get; set; } + public int Type { get; set; } + public int SendUserId { get; set; } + public string SendNickName { get; set; } + } +} diff --git a/Assets/Scripts/Apis/Models/MailModel.cs.meta b/Assets/Scripts/Apis/Models/MailModel.cs.meta new file mode 100644 index 00000000..561db5b1 --- /dev/null +++ b/Assets/Scripts/Apis/Models/MailModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3dd81357979eb03468cc496795d1e8fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 388c4cdc..292079ec 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -20,7 +20,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:5087/"; public static string AppVersion = Application.version; @@ -191,6 +191,22 @@ public static class App } } + public static List CurrentUserMails { get; set; } + //public static event hasNotReadEvent; + public static event EventHandler HasNotReadChanged; + public static bool _hasNotRead; + public static bool hasNotRead + { + get => _hasNotRead; + set + { + _hasNotRead = value; + if (HasNotReadChanged != null) + { + HasNotReadChanged(value, new EventArgs()); + } + } + } public static bool CanOpenAd = false; public static Dictionary websiteDict = new Dictionary() diff --git a/Assets/Scripts/ConfigHelper.cs b/Assets/Scripts/ConfigHelper.cs index 805d90a8..4885bba6 100644 --- a/Assets/Scripts/ConfigHelper.cs +++ b/Assets/Scripts/ConfigHelper.cs @@ -78,5 +78,15 @@ namespace Assets.Scripts return _rowerApi; } } + + private static MailApi _mailApi; + internal static MailApi mailApi + { + get + { + if (_mailApi == null) _mailApi = new MailApi(); + return _mailApi; + } + } } } diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index fdd04487..3b2a8439 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -29,6 +29,7 @@ public class MainController : BaseScene Loom.Initialize(); msg = transform.Find("GameObject/Message").GetComponent(); InitialMessage(); + MailReceiver.Instance().GetMessage(); #if UNITY_ANDROID || UNITY_IOS transform.GetComponent().referenceResolution = new Vector2(844, 390); //transform.Find("Panel").GetComponent().sizeDelta = new Vector2(844, 390); diff --git a/Assets/Scripts/UI/Prefab/Mail.meta b/Assets/Scripts/UI/Prefab/Mail.meta new file mode 100644 index 00000000..28a14059 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fa036e3dd69a3a4686ffb7a3bfb530a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs b/Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs new file mode 100644 index 00000000..bf992bfb --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs @@ -0,0 +1,59 @@ +using Assets.Scripts; +using Assets.Scripts.Apis.Models; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MailDetailController : PFUIPanel +{ + // Start is called before the first frame update + ScrollRect scroll; + protected override void Awake() + { + UIManager.AddEvent(transform.Find("Container/Exit").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, async b => + { + CloseSelf(); + }); + UIManager.AddEvent(transform.Find("Container/BtnDelete").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + UIManager.ShowConfirm(App.GetLocalString("Delete"), App.GetLocalString("Are you sure you want to delete this email?"), async () => + { + if (mail != null) + { + await ConfigHelper.mailApi.Delete(mail.Id); + Utils.showToast(null, "Success", type: 1); + UIManager.CloseConfirm(); + CloseSelf(); + } + }); + }); + scroll = transform.Find("Container/Content/Scroll View").GetComponent(); + } + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + MailModel mail; + public async void Initial(MailModel item) + { + this.mail = item; + await ConfigHelper.mailApi.MarkRead(item.Id); + transform.Find("Container/Title").GetComponent().text = item.Title; + scroll.content.Find("Text").GetComponent().text = $"{item.Desc}\n\n{item.SendNickName}"; + } + + private async void CloseSelf() + { + Close(); + await MailReceiver.Instance().GetMessage(); + UIManager.Instance.MailListController.Show(); + } +} diff --git a/Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs.meta b/Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs.meta new file mode 100644 index 00000000..563015b0 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailDetailController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 74fe80f225b0aff448f240dde817f640 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Prefab/Mail/MailItemController.cs b/Assets/Scripts/UI/Prefab/Mail/MailItemController.cs new file mode 100644 index 00000000..95c259e7 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailItemController.cs @@ -0,0 +1,37 @@ +using Assets.Scripts; +using Assets.Scripts.Apis.Models; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MailItemController : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + public void Initial(MailModel item) + { + var color = item.IsRead ? Utils.HexToColorHtml("#5C5C6E") : Utils.HexToColorHtml("#ffffff"); + Text title = transform.Find("Content/Title").GetComponent(), time = transform.Find("Content/Time").GetComponent(); + title.text = item.Title; + time.text = item.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"); + title.color = color; + time.color = color; + transform.Find("Content/MailImage").GetComponent().color = color; + UIManager.AddEvent(gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + UIManager.ShowMailDetailPanel(item); + }); + } +} diff --git a/Assets/Scripts/UI/Prefab/Mail/MailItemController.cs.meta b/Assets/Scripts/UI/Prefab/Mail/MailItemController.cs.meta new file mode 100644 index 00000000..f2419d05 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailItemController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 896523cde19693d4ca337b93a7880c8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Prefab/Mail/MailListController.cs b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs new file mode 100644 index 00000000..72db510a --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs @@ -0,0 +1,56 @@ +using Assets.Scripts.Apis.Models; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MailListController : PFUIPanel +{ + // Start is called before the first frame update + ScrollRect scroll; + GameObject mail; + protected override void Awake() + { + UIManager.AddEvent(transform.Find("Container/Exit").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b => + { + Close(); + }); + scroll = transform.Find("Container/Content/Right/Scroll View").GetComponent(); +#if UNITY_STANDALONE_WIN + mail = Resources.Load("UI/Prefab/Mail/MailItem"); +#endif + } + public override void Show() + { + base.Show(); + DisplayMails(App.CurrentUserMails); + } + + private void DisplayMails(List list) + { + scroll.content.DetachChildren(); + if (mail != null) + { + foreach (var item in list) + { + var obj = Instantiate(mail); + obj.GetComponent().Initial(item); + //obj.SendMessage("Initial", ); + obj.transform.SetParent(scroll.content.transform); + obj.transform.localScale = new Vector3(1, 1, 1); + } + } + } + + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/UI/Prefab/Mail/MailListController.cs.meta b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs.meta new file mode 100644 index 00000000..7943181d --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cdfbce372733cb8438be420f311cb56e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs b/Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs new file mode 100644 index 00000000..aaa36fbb --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs @@ -0,0 +1,64 @@ +using Assets.Scripts; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using UnityEngine; +using UnityEngine.UI; + +public class MailReceiver : MonoBehaviour +{ + // Start is called before the first frame update + private static MailReceiver _instance = null; + + public static bool Exists() + { + return _instance != null; + } + + public static MailReceiver Instance() + { + if (!Exists()) + { + throw new Exception("UnityMainThreadDispatcher could not find the UnityMainThreadDispatcher object. Please ensure you have added the MainThreadExecutor Prefab to your scene."); + } + return _instance; + } + + void Awake() + { + if (_instance == null) + { + _instance = this; + } + DontDestroyOnLoad(gameObject); + } + + void Start() + { + + } + + float timer = 10f; + // Update is called once per frame + void Update() + { + timer -= Time.deltaTime; + if (timer < 0) + { + GetMessage(); + timer += 10; + } + } + + public async Task GetMessage() + { + var res = await ConfigHelper.mailApi.GetList(0, 100, 0); + if (res.result) + { + App.CurrentUserMails = res.data; + App.hasNotRead = res.data.Count(x => !x.IsRead) > 0; + } + } +} diff --git a/Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs.meta b/Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs.meta new file mode 100644 index 00000000..f70d4469 --- /dev/null +++ b/Assets/Scripts/UI/Prefab/Mail/MailReceiver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 227da2d8b06aad34ca648aa8c2ab5f05 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Prefab/MainNav.cs b/Assets/Scripts/UI/Prefab/MainNav.cs index fb0040e7..c6629684 100644 --- a/Assets/Scripts/UI/Prefab/MainNav.cs +++ b/Assets/Scripts/UI/Prefab/MainNav.cs @@ -3,6 +3,7 @@ using DG.Tweening; using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; @@ -81,7 +82,17 @@ public class MainNav : MonoBehaviour { UIManager.ShowFeedBackModal(); }); + UIManager.AddEvent(transform.Find("Mail").gameObject, EventTriggerType.PointerClick, x => + { + UIManager.ShowMailListPanel(); + }); + App.HasNotReadChanged -= ShowMailDot; + App.HasNotReadChanged += ShowMailDot; + } + private void ShowMailDot(object sender, EventArgs e) + { + transform.Find("Mail/Dot").gameObject.SetActive((bool)sender); } public void ShowRowerTab() @@ -126,7 +137,6 @@ public class MainNav : MonoBehaviour } #endif } - public void ShowExit() { if (exit) diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index ae88df08..22a71572 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -425,7 +425,39 @@ public class UIManager : MonoBehaviour { UIManager.Show(UIManager.Instance.AddressController, null, true); } + #region 邮件相关 + MailListController mMailListController; + public MailListController MailListController + { + get + { + return this.GetPanelInstance("MailListPanel", ref this.mMailListController); + } + } + public static void ShowMailListPanel() + { + UIManager.Show(UIManager.Instance.MailListController, null, true); + } + MailDetailController mMailDetailController; + public MailDetailController MailDetailController + { + get + { + return this.GetPanelInstance("MailDetailPanel", ref this.mMailDetailController); + } + } + public static void ShowMailDetailPanel(MailModel item) + { + UIManager.Instance.MailDetailController.Initial(item); + UIManager.Instance.Invoke("ShowMailDetailPanel", 0.1f); + + } + public void ShowMailDetailPanel() + { + UIManager.Show(UIManager.Instance.MailDetailController, null, true); + } + #endregion #region 比赛点击弹窗 private RaceModalScript mRaceModalScript; public RaceModalScript RaceDetailModal From c3514df331288b7ceca1c7b42ef457154fead1ca Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 3 Mar 2022 14:38:51 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=85=AC=E5=BC=80?= =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9B=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/upload.meta | 8 + Assets/Resources/Images/upload/1.png | Bin 0 -> 3282 bytes Assets/Resources/Images/upload/1.png.meta | 128 + Assets/Resources/Images/upload/2.png | Bin 0 -> 3695 bytes Assets/Resources/Images/upload/2.png.meta | 128 + .../UI/Prefab/Mail/MailItem-mob.prefab | 412 +++ .../UI/Prefab/Mail/MailItem-mob.prefab.meta | 7 + .../Resources/UI/Prefab/MainNav-mobile.prefab | 328 ++- .../Panel/Mobile/MailDetailPanel.prefab | 979 +++++++ .../Panel/Mobile/MailDetailPanel.prefab.meta | 7 + .../Prefab/Panel/Mobile/MailListPanel.prefab | 1040 +++++++ .../Panel/Mobile/MailListPanel.prefab.meta | 7 + Assets/Resources/UI/language.json | 12 +- Assets/Scenes/Login-Mobile.unity | 2595 +++++++++-------- Assets/Scripts/Apis/MapApi.cs | 8 + Assets/Scripts/Apis/Models/MapRoute.cs | 2 + Assets/Scripts/App.cs | 14 +- .../UI/Prefab/Mail/MailListController.cs | 2 + Assets/Scripts/UI/Prefab/MainNav.cs | 5 +- Assets/Scripts/UI/Prefab/MapList/MapItem.cs | 39 +- Assets/Scripts/UI/Prefab/NewMainNav.cs | 19 +- Assets/Scripts/UIManager.cs | 6 + ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/GraphicsSettings.asset | 1 - 24 files changed, 4429 insertions(+), 1322 deletions(-) create mode 100644 Assets/Resources/Images/upload.meta create mode 100644 Assets/Resources/Images/upload/1.png create mode 100644 Assets/Resources/Images/upload/1.png.meta create mode 100644 Assets/Resources/Images/upload/2.png create mode 100644 Assets/Resources/Images/upload/2.png.meta create mode 100644 Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab create mode 100644 Assets/Resources/UI/Prefab/Mail/MailItem-mob.prefab.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailDetailPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailDetailPanel.prefab.meta create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailListPanel.prefab create mode 100644 Assets/Resources/UI/Prefab/Panel/Mobile/MailListPanel.prefab.meta diff --git a/Assets/Resources/Images/upload.meta b/Assets/Resources/Images/upload.meta new file mode 100644 index 00000000..bbae8390 --- /dev/null +++ b/Assets/Resources/Images/upload.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 16abb669b1430e7499bf9f4fd7c2ddc7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Images/upload/1.png b/Assets/Resources/Images/upload/1.png new file mode 100644 index 0000000000000000000000000000000000000000..85167252497016f813fe5f714dfc40724aab04af GIT binary patch literal 3282 zcmV;@3@!7CP))7j000a{Nkl(S(ejwiXw5!YT8-pQQWR|pqSQ)T zAEn@nM=dcxAb=YJ+1-2koh+M8?m2g#cOT<;X71d3{&UWM{_~yx{P#cqxtB;OPLxvO zbhcinD82;{mIZgrT8G8uLv(ztTo7ISn8W| zawa}uvCQd@l}j}35)NQpUGtX-@wour+-L-guP!-&rCnjQmc1PxpYW{{3ZUKIv=kcm zEUvNPMH#B0VDLS#i`|k$di-q(Y$Tn48W}^i!aP6|2Vh?x28h1}KN_Zb%*6=<&}M7= z6$bxcILX*R0n}@#*O8GS?=YE4-nUqYPu&i@$d)Z_`ChMQKH4lqn|Yv(R@dY6WZTrK zW0xoDjhzqx?e>PXiXuJ24<<-~R-6J5Pi1Fcw#j0-^=z;tvM2UJ>hA8Z0Uu^p^Fy~H z^=5Nfg=k_zw+mmYJAid{O#n_=tKBt$yFu2O&0{uNEJbeZdXbg*U83HVu(3}9$S-NP zB7XviEA<9ZR{(9chPyG4%^?QyZ<9&Bv$C@EKiYL-E3w(y;ecP*g4VZaae%gNwpzj>U4C*jH`aFCZ-}^TU*`&EqqnoH-I$^40u+n>Cxun0uY^jU(_LN z-!rLQx@xJ&CN;&Mr_tDA{o418dsPtW&rV$xIrWk zW_q`Xo@yE1>`At1XP! zk-l^gR098LDQ0sqI^<$;p!>#;H;qo!0Z+I|!WQoXO#C#Bdf3{LR|t_^H8myM#bEO- z!!BU}MG#qDe)#a|1B#+-gWX#$0?*HyypyirT^f2Q^OB3PSt#|jV!ZFLF|)Drkd35- z1kh${n+8Vv0NfwZ?3$5H`5b0|I2z7BIkpn6k}oZ(Jdgh+E?T4;|1t zG~~(x3;9>AL_5)SD96B@T1F|-dv<$BQo-a}Y2zYN6>vaCmtR+n&;x*waZ zxd3ls2k75Wm-+ML0FEYR2973%Y@njJajK;WUVBc?^x269kDVol1CI>?n)wshBz9mw zB)@pD(NnF~()Y~f+_{*fzldAYulDtI53PVf4P>8RK=4B%8^9Rl1Ee*V~%i8wU($2xlfBAv}kM9ybrWlX84DDJs5gFYPf@dgwEo-!I~ zWg@|22U2)(A@m*{cx+Gre%X;DryJQ|`9a1yarfPvs^FPeSffGx*cQgw!J2eu7yqnkEb63QH_4d zakxtemCXC7sdsfDe|iy_CUA z+6{gfAlZez^1RB*MFRU7E%%Z2(FgZ(0!}9gwoh;3ZSu{L)g{SjG@Glc7WAp<$;#K& zHGGV|u2%Ku256V5XbI0Um+R!o0S*gH+TWpp(h;!)eT8Cra;TVblANBx_tMkjnJcbE zyRZVJ{h~qyRF{e9$)aImX|no?pdSsdLEZ~D#;A2p@ZFY{mZUG2z+lov1MBN|C@Iw% zh+lB0N|LV`a&X&1V08@t<85F73<6kEQt}ym8jZh-=p_6d^s>Xz_?3hrredB-4P>j% z=kxp(B27?(D%n zRY&&VeAy8gali($|0n3EQHDEk7amc9>1ga@U%>Yzd(g?e0E5rNodJgp#X|NK29(8) zD_b-!tct@3<(B~?B~Z>etB9w~KuBm0Drjx`FSRBA1H*P)uOZyih4bN0b8?n^sMoJl zn5aY00@$GuDej#Jz>;0A)@dG(Z!&z~E0LcI{FVT;yb(R|nX@L7VUGGQD-J-`4j|s( z^-4`(8ttC=EcT)sU=HGTe-Z&8PVyecq}&hCIJbnyD@cKou!wXS{y%vuNcBGrE#ct> zh;;11fyzv%D%W6mJ;C$kI2?ME*%3imR3r>k*PRHn-|QE#7{Gf&lCla#;IRP-0b~X2 zKn2H{H$tPHMmE|XWfn0W>68FmR5C&9`k_Ei=Hy&kWVJ39xp;%aGlm-ErQ^)|@LK;J z0pN^(X$#z^up0~iVOc)7j000f*NklI2lC zmTGbd5d;ii5v+#^#|y$L=M|VsMNPDDh~z3C?G;!p89S@ zv@M7TC_zZ>?%th#v*CuD-PyellH5S=IbnDHf99WmzM1*wpMPedB*#C_IWX=_r;>9ss!;CgD*n zFYj);?sv`E$jG!zrvu1K?*D-i*B7E;BQjMk>->~{Oap;ywAz{PWi2Dkf}IMWSroa< zBIF59_>pPqBaAYN(Ct__w%SiZjubW$^gieWmVq3dD&%&xE_^>mCPZ}3uhRgG6;(!{ za(ODXp@0t5R-=haRZV-1^y~L2ec_6@vz%D1N$Gtj8fF}ejx`qLM!_WHJM&4>FKPut zuI{WAyHfy+g(~mCIJ!g9m^Knd#ST>dpi1dnT3^1ajgjVyy&!$PcM^a_C;2Z(SYV!K zr}V!@)-h>T=b5d;0W^xDcUZ)_$E!v(W-q|IS3Nxc5n6Ne_g?wZr3;tHXj*qI;WP?U zag0|vO6W7J|0&mYG>9DvpdN}$hKus3XCo;2fHCb#x_>FgOq$ zxl_u|kf>ysUz*+geB(@S@W`|5qVk)h1v`m|Y5I_&&^x8#IX}*bwRoBtX&E2l0gu3a zw&x4jo}jZH818qN(z^`%RKv;ZinLx7nGe0Lm(_)lGn6$}tdsFFp&jrD)Xn&05Ab44 zVK?LoJOKhL$eRiu^D7x37Nxhz=$XT*B;8oRen#2%@SO9@K8RB7*O7d;0AwXXbSbmkk*s$sJOhQ+5k z>6xYv2tY(uel4p|Al$Rzk>%x4@>|WSHg`D-kWieEi z_a`Skm+8RCC%p<=_#dYZu-!)*OREMt>6xUn2GHDYmcrLkot0rqze3kf{n|;-W!m1p zaWYS;gF!|}>1h(P1`uK3VX`_9IeJ@0&oxa61lGuOKxC)u0mRNjw|rVv$>IvG9J zG&RqvgI|gX(*B3l_#8b{S(>daOxuwbQIGhpcgI_VTn0UUE{ny%{>5>?lb@>tp7zkV zQ?a7RKVi2AxH$;j60#Hjti%GiFi<~hG1}q++oPO}yq|{Up6Vshs}SG28z*S}_jBBD za2Fb|jdCq4?wq-y=tY%J0+kz5)ei99$J!jxYRjKZ1*ESHyz!OSg zR4z`XTrT-aKzS*h`Y~t*iZ-L|Z}8Hp6a30}0%#7Zy4*0#I)GB_C!mc-$wsZ9V0K%& z8@|A)UWO6%RJy96?IR7{`iB{+y4b6X6hJ)`y)_<>zaX=7PC>1PnJ(2>&$Bxs!t9ja z(P>16CLvN&0h^bWt0jCzi(4}>Ec>M^y0`Q>@fa}f-YV{0D7?*wqymsTh0RP z6m(1c4<#PCSFEw)vuDfus~-DtxShLm_Egk8@>( ztkA(m6Z?5$Sg%WG*}leL%YdtN-akcAm&&-f0Wm~@cYVB*iTSOw{K4HauIJR%FD<+a z-H5M58-4F!E1W;+C&#|fZr@vMp9_QUI0aEJm;FPJ>^Rt`FCRMl7~RxYV!`OwzS+(c zeOc|_|6wOJIlT{yZ<1;DJH93mZj1{+&~~{pA4CLR_TUjlv$-7m+*AG37Cx?4*z3x4 zuDoFj`<+`BKSBWL@^j$(9PQ40a8SgS)M#p13Y&L^pT;m#8?fUTpRSLKnd-WGh=pmJ z0Pss^MPi9=J+^dmx_8>Xwfc>@NVa=O)*L&D4_IE_xOBsBJoH#k*&+lRxJAJ^z!%BF z6Yu7?d{E;3V0hXe?`+-k92$DAuf7QUGTLKICfD0czEgT~hqYo0+&$$(S%ut+UnQe= zM;b;PHJaX?2b(wES3hw#P-Q>Mba#bLkw&C(0JToB6e2$-;A8?nyXtUXg}Mn7fzi1D zaiX6(VqdQ@fVW}BCck`69^!<(vE{qcNf&8VwH7JC+VT&vXt+ip6go<8=6A{pb|;$n zoC3N|_R|UA?Iv6qo6X&9BNn>@e&i7@`ILMj!h3c!1{FN*$^Zh4Ycw>OCNQc6Yyg5-{@>Ah- zzDU~usy*l<2%5UKGw4~ySwifV_l1 z6$f88S(X*?%Z1g}gpr@XYG=OXmrusygJ++_O=}TGpC;jNR`Y^$1if_xuAQ|Thbp2s z-9OwZ);V9!2Uq$!rS5|5Ddz5XXTTVjB~zi?VZ@@#L>N7pp6cB`A@lj1LX?M}XK{sI zr`DG*NhQz87qd<`%^K*}$H^0EbjA9w3;_Nee;MtGMJ4FHIl;!T%l#4CEdA>}i!e3Dwr^7V6zod_V~35T z>!&m&IN}@wp?KINN#s0{2~VofKWg=1>7{a!4WsOKv}roP@}3Pz@{(RRQXaiyd`vjLd}8wSN|tHcZ=8Q5)6#i|kNgf(1DDa-nJzCyly9?vPGRCeg%$Q1j;-E9 z7+Hps@0;f2d>Oy>r0Xaw0^}_jKS2Y)!}XTfOFUG4N;&~i81Tic;H>Msz!P#2ewXT$ zsMGmGo0~z4;tS7_Uf_u`o&XA_2=%}iPh%Q66$0nuFD~e*eu$lI^2#GFU$TON3jpF; zuRN`EJ`Nu*e(1FtCdy)j)M)vI6H*0$F{(XvO2`sViO_s)mU>0|8KdntfA4I_6ed=U|j z+N>U~HHxpA{K|UqvIfvgV5W4@5k^aF6*|H1QJC`~kf0NgyyTSU2MXCoh-jZUdkILD)1cppC+7JC_4)MKk`! zYjv|W> ApplyOpenRoute(int id) + { + var result = await PostAsync>($"Map/ApplyOpenRoute", new { id }); + return result; + } + + public async Task>> GetRecommendAreaList() { var result = await GetAsync>>($"MapRouteArea/GetRecommendAreaList"); diff --git a/Assets/Scripts/Apis/Models/MapRoute.cs b/Assets/Scripts/Apis/Models/MapRoute.cs index aba738c3..ac916de4 100644 --- a/Assets/Scripts/Apis/Models/MapRoute.cs +++ b/Assets/Scripts/Apis/Models/MapRoute.cs @@ -118,5 +118,7 @@ namespace Assets.Scripts.Apis.Models public int[] RouteIds { get; set; } //最近骑行列表使用 public RouteResult RecentRecord { get; set; } + + public bool IsEnabled { get; set; } } } diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 292079ec..5ad91235 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -20,7 +20,7 @@ public delegate void ChangeLanguageDelegate(); public static class App { - public static string Host = "http://192.168.0.101:5087/"; + public static string Host = "http://192.168.0.101:5083/"; public static string AppVersion = Application.version; @@ -219,13 +219,13 @@ public static class App InitLanguage(); #if !UNITY_EDITOR //测试服务器 - //Host = "http://pf.juze.pro/"; - //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); - //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); + Host = "http://pf.juze.pro/"; + UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); + TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); //线上 - Host = "https://wx.powerfun.com.cn/"; - UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); - TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + //Host = "https://wx.powerfun.com.cn/"; + //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); + //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); //本地 //Host = "http://192.168.0.101:5085/"; //UdpAddress = new IPEndPoint(IPAddress.Parse("192.168.0.97"), 11000); diff --git a/Assets/Scripts/UI/Prefab/Mail/MailListController.cs b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs index 72db510a..23f73d41 100644 --- a/Assets/Scripts/UI/Prefab/Mail/MailListController.cs +++ b/Assets/Scripts/UI/Prefab/Mail/MailListController.cs @@ -19,6 +19,8 @@ public class MailListController : PFUIPanel scroll = transform.Find("Container/Content/Right/Scroll View").GetComponent(); #if UNITY_STANDALONE_WIN mail = Resources.Load("UI/Prefab/Mail/MailItem"); +#else + mail = Resources.Load("UI/Prefab/Mail/MailItem-mob"); #endif } public override void Show() diff --git a/Assets/Scripts/UI/Prefab/MainNav.cs b/Assets/Scripts/UI/Prefab/MainNav.cs index c6629684..e06cdcfd 100644 --- a/Assets/Scripts/UI/Prefab/MainNav.cs +++ b/Assets/Scripts/UI/Prefab/MainNav.cs @@ -92,7 +92,10 @@ public class MainNav : MonoBehaviour private void ShowMailDot(object sender, EventArgs e) { - transform.Find("Mail/Dot").gameObject.SetActive((bool)sender); + if (transform) + { + transform.Find("Mail/Dot").gameObject.SetActive((bool)sender); + } } public void ShowRowerTab() diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs index 74f8be03..c5d4ffc1 100644 --- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs +++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs @@ -114,10 +114,21 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler, if (!isModal) { transform.Find("CollectImg").GetComponent