From d033d86a9542702e39957d1f5c8744361199cadb Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Wed, 26 Jun 2024 15:33:42 +0800 Subject: [PATCH] ss --- .../Assets/Scenes/MainScene.unity | 387 +++++++++++++----- .../Assets/Scripts/Item/TabItem.cs | 19 + .../Assets/Scripts/Model/v_model_version.cs | 72 ++-- 3 files changed, 341 insertions(+), 137 deletions(-) diff --git a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity index 72ea3120..b5d659c5 100644 --- a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity +++ b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity @@ -446,22 +446,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1225.6 + value: 265.6001 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 533.4 + value: -6.600342 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -476,12 +476,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -629,6 +629,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2403617721991577370} - {fileID: 1422851841} - {fileID: 754353476} - {fileID: 1038566681} @@ -639,10 +640,10 @@ RectTransform: m_Father: {fileID: 1630019883} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &408945111 GameObject: @@ -858,6 +859,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 1421219887} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.2478646 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.5925926 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -901,7 +912,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -921,12 +932,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -484.09998 + value: 475.90002 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: 100 + value: 640 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -941,22 +952,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1093,7 +1104,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 736029547} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: @@ -1188,6 +1199,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 243258183} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.2875 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.7592593 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -1231,7 +1252,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1251,12 +1272,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -408 + value: 552 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: 280 + value: 820 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1271,22 +1292,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1442,22 +1463,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1235.4 + value: 275.40002 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 685.5 + value: 145.5 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -1472,12 +1493,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -1512,6 +1533,104 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 802089282} m_PrefabAsset: {fileID: 0} +--- !u!1 &817463565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 817463569} + - component: {fileID: 817463568} + - component: {fileID: 817463567} + - component: {fileID: 817463566} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &817463566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817463565} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &817463567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817463565} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &817463568 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817463565} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + 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!224 &817463569 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 817463565} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &824912921 GameObject: m_ObjectHideFlags: 0 @@ -1603,6 +1722,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 1618120019} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.2434896 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.537037 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -1646,7 +1775,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1666,12 +1795,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -492.5 + value: 467.5 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: 40 + value: 580 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1686,22 +1815,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -1893,22 +2022,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 916.3 + value: -43.700317 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 615.8 + value: 75.799805 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -1923,12 +2052,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -2183,6 +2312,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 1509770262} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.2689062 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.7037037 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -2226,7 +2365,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2246,12 +2385,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -443.7 + value: 516.3 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: 220 + value: 760 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2266,22 +2405,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2373,6 +2512,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 1358083984} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.2429688 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.4814815 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -2416,7 +2565,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2436,12 +2585,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -493.5 + value: 466.5 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 520 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2456,22 +2605,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2561,22 +2710,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1197.1 + value: 237.1001 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 563.1 + value: 23.100098 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -2591,12 +2740,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -2889,6 +3038,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 922291666} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.2563021 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.6481481 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -2932,7 +3091,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2952,12 +3111,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -467.90002 + value: 492.09998 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: 160 + value: 700 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -2972,22 +3131,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -3256,7 +3415,6 @@ RectTransform: - {fileID: 736029548} - {fileID: 1234750085} - {fileID: 331429612} - - {fileID: 2403617721991577370} m_Father: {fileID: 1750630380} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3376,12 +3534,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -3497,22 +3655,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 971.8 + value: 11.799805 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 877.5 + value: 337.5 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -3527,12 +3685,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -3687,10 +3845,10 @@ RectTransform: m_Father: {fileID: 1038666920} m_RootOrder: 7 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: 412.9, y: 81} - m_SizeDelta: {x: 269, y: 85} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 412.90002, y: 81} + m_SizeDelta: {x: -1651, y: -995} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1837879640 MonoBehaviour: @@ -3799,22 +3957,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 1152.7 + value: 192.6997 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 458.7 + value: -81.30005 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -3829,12 +3987,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -4179,22 +4337,22 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.x - value: 984.4 + value: 24.40039 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchoredPosition.y - value: 689.3 + value: 149.29993 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.x - value: 1 + value: -1919 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_SizeDelta.y - value: 1 + value: -1079 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -4209,12 +4367,12 @@ PrefabInstance: - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8856219313163689186, guid: 06acf0d7bf4af584f97c5720760b436e, type: 3} @@ -4378,6 +4536,16 @@ PrefabInstance: propertyPath: customItem value: objectReference: {fileID: 1103658802} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.x + value: 0.3134896 + objectReference: {fileID: 0} + - target: {fileID: 552651400290170770, guid: cafcce2d67c06934d8ffdce1ae1059fc, + type: 3} + propertyPath: posPercent.y + value: 0.8148148 + objectReference: {fileID: 0} - target: {fileID: 552651400290170774, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_Name @@ -4421,7 +4589,7 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -4441,12 +4609,12 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.x - value: -358.09998 + value: 601.9 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchoredPosition.y - value: 340 + value: 880 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -4461,22 +4629,22 @@ PrefabInstance: - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 552651400290170775, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -4621,18 +4789,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2403617721991577345} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2403617721991577373} - {fileID: 2403617721991577372} - m_Father: {fileID: 1630019883} - m_RootOrder: 4 + m_Father: {fileID: 331429612} + 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: -303, y: 400} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 657, y: 940} m_SizeDelta: {x: 10, y: 10} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &2403617721991577372 @@ -4721,6 +4889,7 @@ MonoBehaviour: choseSprite: {fileID: 21300000, guid: 4ced2e7e9bfb6264c8d023a85800ac43, type: 3} nochoseFont: {fileID: 0} choseFont: {fileID: 0} + posPercent: {x: 0.3421875, y: 0.8703704} --- !u!114 &2403617721991577379 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs index 62bcb8fe..5c5ec8c7 100644 --- a/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs +++ b/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs @@ -15,6 +15,25 @@ public class TabItem : MonoBehaviour public Font nochoseFont; public Font choseFont; + + public Vector2 posPercent; + private RectTransform parentRectTransform; + private RectTransform rectTransform; + void Awake() + { + parentRectTransform = transform.parent.GetComponent(); + rectTransform=GetComponent(); + //posPercent = new Vector2(); + //posPercent.x = rectTransform.anchoredPosition.x / parentRectTransform.rect.width; + //posPercent.y= rectTransform.anchoredPosition.y / parentRectTransform.rect.height; + //print(gameObject.name +" "+ posPercent.x+" "+ posPercent.y); + } + + void Update() + { + rectTransform.anchoredPosition = new Vector2(posPercent.x * parentRectTransform.rect.width, posPercent.y * parentRectTransform.rect.height); + } + public void PointIn(BaseEventData data) { showIcon.gameObject.SetActive(true); diff --git a/FuZhou_FirstPage/Assets/Scripts/Model/v_model_version.cs b/FuZhou_FirstPage/Assets/Scripts/Model/v_model_version.cs index 238f2a73..5dcda5e6 100644 --- a/FuZhou_FirstPage/Assets/Scripts/Model/v_model_version.cs +++ b/FuZhou_FirstPage/Assets/Scripts/Model/v_model_version.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -* V0.01 2024/6/14 10:15:18 N/A 初版 +* V0.01 2024/6/25 18:12:00 N/A 初版 * * Copyright (c) 2012 Maticsoft Corporation. All rights reserved. *┌──────────────────────────────────┐ @@ -24,7 +24,7 @@ namespace Competition.Mysql.Model public partial class v_model_version { public v_model_version() - {} + { } #region Model private string _modelid; private string _monitor_id; @@ -39,109 +39,125 @@ namespace Competition.Mysql.Model private string _remark2; private string _remark3; private string _registryname; + private string _modelresourcespath; + private string _custom_code; /// /// /// public string ModelId { - set{ _modelid=value;} - get{return _modelid;} + set { _modelid = value; } + get { return _modelid; } } /// /// /// public string MONITOR_ID { - set{ _monitor_id=value;} - get{return _monitor_id;} + set { _monitor_id = value; } + get { return _monitor_id; } } /// /// /// public string ModelName { - set{ _modelname=value;} - get{return _modelname;} + set { _modelname = value; } + get { return _modelname; } } /// /// /// public string VersionNumber { - set{ _versionnumber=value;} - get{return _versionnumber;} + set { _versionnumber = value; } + get { return _versionnumber; } } /// /// /// public string MapLongitude { - set{ _maplongitude=value;} - get{return _maplongitude;} + set { _maplongitude = value; } + get { return _maplongitude; } } /// /// /// public string MapLatitude { - set{ _maplatitude=value;} - get{return _maplatitude;} + set { _maplatitude = value; } + get { return _maplatitude; } } /// /// /// public string TrainingSize { - set{ _trainingsize=value;} - get{return _trainingsize;} + set { _trainingsize = value; } + get { return _trainingsize; } } /// /// /// public string ModelResources { - set{ _modelresources=value;} - get{return _modelresources;} + set { _modelresources = value; } + get { return _modelresources; } } /// /// /// public DateTime UpdateTime { - set{ _updatetime=value;} - get{return _updatetime;} + set { _updatetime = value; } + get { return _updatetime; } } /// /// /// public string Remark1 { - set{ _remark1=value;} - get{return _remark1;} + set { _remark1 = value; } + get { return _remark1; } } /// /// /// public string Remark2 { - set{ _remark2=value;} - get{return _remark2;} + set { _remark2 = value; } + get { return _remark2; } } /// /// /// public string Remark3 { - set{ _remark3=value;} - get{return _remark3;} + set { _remark3 = value; } + get { return _remark3; } } /// /// /// public string RegistryName { - set{ _registryname=value;} - get{return _registryname;} + set { _registryname = value; } + get { return _registryname; } + } + /// + /// + /// + public string ModelResourcesPath + { + set { _modelresourcespath = value; } + get { return _modelresourcespath; } + } + + public string CUSTOMS_CODE + { + set { _custom_code = value; } + get{ return _custom_code; } } #endregion Model