From 4cedd7c17b21f2c3f21cf06cad3f4ec8293260c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=CE=A9?= <3291875824@qq.com> Date: Sat, 7 Jun 2025 01:32:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A4=E5=9C=BA=E6=99=AF=E7=BC=96=E9=98=9F?= =?UTF-8?q?=E9=A1=B5=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Songs_Select.unity | 479 +++++++++++++----- .../scripts/Songs_Select/teamSettingPanel.cs | 32 ++ .../Songs_Select/teamSettingPanel.cs.meta | 11 + 3 files changed, 397 insertions(+), 125 deletions(-) create mode 100644 Assets/scripts/Songs_Select/teamSettingPanel.cs create mode 100644 Assets/scripts/Songs_Select/teamSettingPanel.cs.meta diff --git a/Assets/Scenes/Songs_Select.unity b/Assets/Scenes/Songs_Select.unity index 977ab62c..a357c97a 100644 --- a/Assets/Scenes/Songs_Select.unity +++ b/Assets/Scenes/Songs_Select.unity @@ -209,7 +209,7 @@ GameObject: - component: {fileID: 12180242} - component: {fileID: 12180241} - component: {fileID: 12180240} - m_Layer: 0 + m_Layer: 5 m_Name: isLeader m_TagString: Untagged m_Icon: {fileID: 0} @@ -329,13 +329,13 @@ GameObject: - component: {fileID: 16906200} - component: {fileID: 16906199} - component: {fileID: 16906198} - m_Layer: 0 + m_Layer: 5 m_Name: team_SettingPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &16906197 RectTransform: m_ObjectHideFlags: 0 @@ -416,10 +416,10 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 2 + m_SortingOrder: 3 m_TargetDisplay: 0 --- !u!1 &54722882 GameObject: @@ -548,7 +548,7 @@ GameObject: - component: {fileID: 60732561} - component: {fileID: 60732560} - component: {fileID: 60732562} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -936,7 +936,7 @@ GameObject: - component: {fileID: 110153634} - component: {fileID: 110153633} - component: {fileID: 110153632} - m_Layer: 0 + m_Layer: 5 m_Name: down m_TagString: Untagged m_Icon: {fileID: 0} @@ -1055,7 +1055,7 @@ GameObject: - component: {fileID: 113301348} - component: {fileID: 113301350} - component: {fileID: 113301349} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -1131,7 +1131,7 @@ GameObject: - component: {fileID: 125806606} - component: {fileID: 125806605} - component: {fileID: 125806604} - m_Layer: 0 + m_Layer: 5 m_Name: isLeader m_TagString: Untagged m_Icon: {fileID: 0} @@ -1518,7 +1518,7 @@ GameObject: - component: {fileID: 160585425} - component: {fileID: 160585427} - component: {fileID: 160585426} - m_Layer: 0 + m_Layer: 5 m_Name: middle m_TagString: Untagged m_Icon: {fileID: 0} @@ -1591,7 +1591,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 171769547} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard (5) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1615,10 +1615,10 @@ RectTransform: - {fileID: 960238621} m_Father: {fileID: 1704085229} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 276, y: -366} + m_SizeDelta: {x: 180, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &190161137 GameObject: @@ -1789,7 +1789,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 212928031} - m_Layer: 0 + m_Layer: 5 m_Name: formation m_TagString: Untagged m_Icon: {fileID: 0} @@ -1944,7 +1944,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 265276639} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1968,10 +1968,10 @@ RectTransform: - {fileID: 1400477542} m_Father: {fileID: 1704085229} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 94, y: -366} + m_SizeDelta: {x: 180, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &269656317 GameObject: @@ -1984,7 +1984,7 @@ GameObject: - component: {fileID: 269656318} - component: {fileID: 269656320} - component: {fileID: 269656319} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -2228,6 +2228,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &277129985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 277129986} + - component: {fileID: 277129988} + - component: {fileID: 277129987} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &277129986 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277129985} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1235967463} + 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: 688.8983, y: 510.76746} + m_SizeDelta: {x: 542.1954, y: 50.7239} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &277129987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277129985} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Formation Details + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} + m_sharedMaterial: {fileID: 4492750392876140565, guid: c95ab61f13e39254e8e3cbf4059d88c5, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &277129988 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 277129985} + m_CullTransparentMesh: 1 --- !u!1 &285792168 GameObject: m_ObjectHideFlags: 0 @@ -2312,7 +2446,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 290113372} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2336,10 +2470,10 @@ RectTransform: - {fileID: 269656318} m_Father: {fileID: 1704085229} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 458, y: -124} + m_SizeDelta: {x: 180, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &323084114 GameObject: @@ -2352,7 +2486,7 @@ GameObject: - component: {fileID: 323084115} - component: {fileID: 323084117} - component: {fileID: 323084116} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -2427,7 +2561,7 @@ GameObject: - component: {fileID: 341481672} - component: {fileID: 341481674} - component: {fileID: 341481673} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -3183,7 +3317,7 @@ GameObject: - component: {fileID: 435270336} - component: {fileID: 435270335} - component: {fileID: 435270334} - m_Layer: 0 + m_Layer: 5 m_Name: team2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3378,7 +3512,7 @@ GameObject: - component: {fileID: 443831639} - component: {fileID: 443831638} - component: {fileID: 443831637} - m_Layer: 0 + m_Layer: 5 m_Name: left m_TagString: Untagged m_Icon: {fileID: 0} @@ -3495,7 +3629,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 449127339} - m_Layer: 0 + m_Layer: 5 m_Name: move m_TagString: Untagged m_Icon: {fileID: 0} @@ -3611,7 +3745,7 @@ GameObject: - component: {fileID: 452649153} - component: {fileID: 452649152} - component: {fileID: 452649151} - m_Layer: 0 + m_Layer: 5 m_Name: up m_TagString: Untagged m_Icon: {fileID: 0} @@ -3728,7 +3862,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 456326458} - m_Layer: 0 + m_Layer: 5 m_Name: FormationSelect m_TagString: Untagged m_Icon: {fileID: 0} @@ -3769,7 +3903,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 471720401} - m_Layer: 0 + m_Layer: 5 m_Name: move m_TagString: Untagged m_Icon: {fileID: 0} @@ -4091,7 +4225,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 497519935} - m_Layer: 0 + m_Layer: 5 m_Name: move m_TagString: Untagged m_Icon: {fileID: 0} @@ -4132,7 +4266,7 @@ GameObject: - component: {fileID: 499463727} - component: {fileID: 499463726} - component: {fileID: 499463725} - m_Layer: 0 + m_Layer: 5 m_Name: up m_TagString: Untagged m_Icon: {fileID: 0} @@ -4252,7 +4386,7 @@ GameObject: - component: {fileID: 502876363} - component: {fileID: 502876362} - component: {fileID: 502876364} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -4369,7 +4503,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 509937589} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -4793,7 +4927,7 @@ GameObject: - component: {fileID: 550323529} - component: {fileID: 550323531} - component: {fileID: 550323530} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -5389,7 +5523,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 615836163} - m_Layer: 0 + m_Layer: 5 m_Name: top_topPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -5504,7 +5638,7 @@ GameObject: - component: {fileID: 627848357} - component: {fileID: 627848356} - component: {fileID: 627848355} - m_Layer: 0 + m_Layer: 5 m_Name: down m_TagString: Untagged m_Icon: {fileID: 0} @@ -5769,7 +5903,7 @@ GameObject: - component: {fileID: 662666256} - component: {fileID: 662666258} - component: {fileID: 662666257} - m_Layer: 0 + m_Layer: 5 m_Name: middle m_TagString: Untagged m_Icon: {fileID: 0} @@ -6337,7 +6471,7 @@ GameObject: - component: {fileID: 724593484} - component: {fileID: 724593486} - component: {fileID: 724593485} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -6622,7 +6756,7 @@ GameObject: - component: {fileID: 745151885} - component: {fileID: 745151884} - component: {fileID: 745151883} - m_Layer: 0 + m_Layer: 5 m_Name: Viewport m_TagString: Untagged m_Icon: {fileID: 0} @@ -6725,16 +6859,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 755002826} - 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 928623237} + m_Father: {fileID: 1467062573} 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: 190.89, y: -76.01} + m_AnchoredPosition: {x: -0.000015258789, y: 0} m_SizeDelta: {x: 113, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &755002828 @@ -6786,7 +6920,7 @@ GameObject: - component: {fileID: 758722711} - component: {fileID: 758722713} - component: {fileID: 758722712} - m_Layer: 0 + m_Layer: 5 m_Name: Fifth m_TagString: Untagged m_Icon: {fileID: 0} @@ -6864,7 +6998,7 @@ GameObject: - component: {fileID: 767757091} - component: {fileID: 767757090} - component: {fileID: 767757089} - m_Layer: 0 + m_Layer: 5 m_Name: team4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -7277,7 +7411,7 @@ GameObject: - component: {fileID: 794441816} - component: {fileID: 794441815} - component: {fileID: 794441814} - m_Layer: 0 + m_Layer: 5 m_Name: team1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -7396,7 +7530,7 @@ GameObject: - component: {fileID: 797414966} - component: {fileID: 797414968} - component: {fileID: 797414967} - m_Layer: 0 + m_Layer: 5 m_Name: title m_TagString: Untagged m_Icon: {fileID: 0} @@ -7606,7 +7740,7 @@ GameObject: - component: {fileID: 823759301} - component: {fileID: 823759300} - component: {fileID: 823759299} - m_Layer: 0 + m_Layer: 5 m_Name: down m_TagString: Untagged m_Icon: {fileID: 0} @@ -7724,6 +7858,7 @@ GameObject: m_Component: - component: {fileID: 827262132} - component: {fileID: 827262131} + - component: {fileID: 827262133} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -7768,6 +7903,30 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &827262133 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 827262130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc980b2fad60d68478fe827374aaf209, type: 3} + m_Name: + m_EditorClassIdentifier: + teamSettingPanelObj: {fileID: 16906196} + teamElementsObj: + - {fileID: 1712599086} + - {fileID: 1559911322} + - {fileID: 1035003397} + - {fileID: 1731149482} + - {fileID: 758722710} + teamCharactersObj: + - {fileID: 1987368277} + - {fileID: 918299813} + - {fileID: 290113371} + - {fileID: 265276638} --- !u!1 &827888148 GameObject: m_ObjectHideFlags: 0 @@ -7855,7 +8014,7 @@ GameObject: - component: {fileID: 832883487} - component: {fileID: 832883486} - component: {fileID: 832883485} - m_Layer: 0 + m_Layer: 5 m_Name: isLeader m_TagString: Untagged m_Icon: {fileID: 0} @@ -8169,7 +8328,7 @@ GameObject: - component: {fileID: 874378661} - component: {fileID: 874378660} - component: {fileID: 874378659} - m_Layer: 0 + m_Layer: 5 m_Name: Scroll View m_TagString: Untagged m_Icon: {fileID: 0} @@ -8351,7 +8510,7 @@ GameObject: - component: {fileID: 886066766} - component: {fileID: 886066768} - component: {fileID: 886066767} - m_Layer: 0 + m_Layer: 5 m_Name: partSmall m_TagString: Untagged m_Icon: {fileID: 0} @@ -8427,7 +8586,7 @@ GameObject: - component: {fileID: 888783200} - component: {fileID: 888783199} - component: {fileID: 888783198} - m_Layer: 0 + m_Layer: 5 m_Name: down m_TagString: Untagged m_Icon: {fileID: 0} @@ -8815,7 +8974,7 @@ GameObject: - component: {fileID: 914802491} - component: {fileID: 914802490} - component: {fileID: 914802489} - m_Layer: 0 + m_Layer: 5 m_Name: isLeader m_TagString: Untagged m_Icon: {fileID: 0} @@ -9141,7 +9300,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 918299814} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9165,10 +9324,10 @@ RectTransform: - {fileID: 341481672} m_Father: {fileID: 1704085229} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 276, y: -124} + m_SizeDelta: {x: 180, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &928623233 GameObject: @@ -9266,7 +9425,6 @@ RectTransform: m_Children: - {fileID: 522732287} - {fileID: 1467062573} - - {fileID: 755002827} - {fileID: 2145804833} - {fileID: 1900229337} - {fileID: 618372338} @@ -9291,7 +9449,7 @@ GameObject: - component: {fileID: 932312736} - component: {fileID: 932312738} - component: {fileID: 932312737} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -9366,7 +9524,7 @@ GameObject: - component: {fileID: 960238621} - component: {fileID: 960238623} - component: {fileID: 960238622} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -9650,7 +9808,7 @@ GameObject: - component: {fileID: 1005912080} - component: {fileID: 1005912082} - component: {fileID: 1005912081} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -10127,7 +10285,7 @@ GameObject: - component: {fileID: 1035003398} - component: {fileID: 1035003400} - component: {fileID: 1035003399} - m_Layer: 0 + m_Layer: 5 m_Name: Third m_TagString: Untagged m_Icon: {fileID: 0} @@ -10338,7 +10496,7 @@ GameObject: - component: {fileID: 1061392961} - component: {fileID: 1061392963} - component: {fileID: 1061392962} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -11710,7 +11868,7 @@ GameObject: - component: {fileID: 1207567682} - component: {fileID: 1207567681} - component: {fileID: 1207567683} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -11904,7 +12062,7 @@ GameObject: - component: {fileID: 1224014391} - component: {fileID: 1224014393} - component: {fileID: 1224014392} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -11977,7 +12135,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1235967463} - m_Layer: 0 + m_Layer: 5 m_Name: bottomRight m_TagString: Untagged m_Icon: {fileID: 0} @@ -11997,6 +12155,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 550323529} + - {fileID: 277129986} m_Father: {fileID: 615836163} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -12015,7 +12174,7 @@ GameObject: - component: {fileID: 1245531102} - component: {fileID: 1245531104} - component: {fileID: 1245531103} - m_Layer: 0 + m_Layer: 5 m_Name: partSmall m_TagString: Untagged m_Icon: {fileID: 0} @@ -12091,7 +12250,7 @@ GameObject: - component: {fileID: 1246584660} - component: {fileID: 1246584659} - component: {fileID: 1246584658} - m_Layer: 0 + m_Layer: 5 m_Name: down m_TagString: Untagged m_Icon: {fileID: 0} @@ -12211,7 +12370,7 @@ GameObject: - component: {fileID: 1288717260} - component: {fileID: 1288717259} - component: {fileID: 1288717261} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -12330,7 +12489,7 @@ GameObject: - component: {fileID: 1351419048} - component: {fileID: 1351419050} - component: {fileID: 1351419049} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -12540,7 +12699,7 @@ GameObject: - component: {fileID: 1368691134} - component: {fileID: 1368691133} - component: {fileID: 1368691135} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -12735,7 +12894,7 @@ GameObject: - component: {fileID: 1387409703} - component: {fileID: 1387409702} - component: {fileID: 1387409701} - m_Layer: 0 + m_Layer: 5 m_Name: up m_TagString: Untagged m_Icon: {fileID: 0} @@ -12854,7 +13013,7 @@ GameObject: - component: {fileID: 1400477542} - component: {fileID: 1400477544} - component: {fileID: 1400477543} - m_Layer: 0 + m_Layer: 5 m_Name: RightIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -13002,7 +13161,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1409841503} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard m_TagString: Untagged m_Icon: {fileID: 0} @@ -13117,7 +13276,7 @@ GameObject: - component: {fileID: 1450497756} - component: {fileID: 1450497758} - component: {fileID: 1450497757} - m_Layer: 0 + m_Layer: 5 m_Name: partBig m_TagString: Untagged m_Icon: {fileID: 0} @@ -13190,7 +13349,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1450602927} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard (6) m_TagString: Untagged m_Icon: {fileID: 0} @@ -13214,10 +13373,10 @@ RectTransform: - {fileID: 1224014391} m_Father: {fileID: 1704085229} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 458, y: -366} + m_SizeDelta: {x: 180, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1466300096 GameObject: @@ -13305,6 +13464,7 @@ GameObject: - component: {fileID: 1467062573} - component: {fileID: 1467062575} - component: {fileID: 1467062574} + - component: {fileID: 1467062576} m_Layer: 5 m_Name: teamSettings_Set m_TagString: Untagged @@ -13323,7 +13483,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 755002827} m_Father: {fileID: 928623237} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -13369,6 +13530,62 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1467062572} m_CullTransparentMesh: 1 +--- !u!114 &1467062576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1467062572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1467062574} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 827262133} + m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp + m_MethodName: openTeamSettingPanel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1469822599 GameObject: m_ObjectHideFlags: 0 @@ -13380,7 +13597,7 @@ GameObject: - component: {fileID: 1469822600} - component: {fileID: 1469822602} - component: {fileID: 1469822601} - m_Layer: 0 + m_Layer: 5 m_Name: partSmall m_TagString: Untagged m_Icon: {fileID: 0} @@ -14022,7 +14239,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1553367978} - m_Layer: 0 + m_Layer: 5 m_Name: move m_TagString: Untagged m_Icon: {fileID: 0} @@ -14062,7 +14279,7 @@ GameObject: - component: {fileID: 1553631138} - component: {fileID: 1553631140} - component: {fileID: 1553631139} - m_Layer: 0 + m_Layer: 5 m_Name: middle m_TagString: Untagged m_Icon: {fileID: 0} @@ -14346,7 +14563,7 @@ GameObject: - component: {fileID: 1559911323} - component: {fileID: 1559911325} - component: {fileID: 1559911324} - m_Layer: 0 + m_Layer: 5 m_Name: Second m_TagString: Untagged m_Icon: {fileID: 0} @@ -14424,7 +14641,7 @@ GameObject: - component: {fileID: 1579379738} - component: {fileID: 1579379737} - component: {fileID: 1579379736} - m_Layer: 0 + m_Layer: 5 m_Name: team3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -14618,7 +14835,7 @@ GameObject: - component: {fileID: 1611812540} - component: {fileID: 1611812542} - component: {fileID: 1611812541} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -14827,7 +15044,7 @@ GameObject: - component: {fileID: 1625312941} - component: {fileID: 1625312943} - component: {fileID: 1625312942} - m_Layer: 0 + m_Layer: 5 m_Name: partBig (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15186,7 +15403,7 @@ GameObject: - component: {fileID: 1659413736} - component: {fileID: 1659413738} - component: {fileID: 1659413737} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -15663,7 +15880,7 @@ GameObject: - component: {fileID: 1687375883} - component: {fileID: 1687375885} - component: {fileID: 1687375884} - m_Layer: 0 + m_Layer: 5 m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -15813,7 +16030,7 @@ GameObject: - component: {fileID: 1704085229} - component: {fileID: 1704085230} - component: {fileID: 1704085231} - m_Layer: 0 + m_Layer: 5 m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} @@ -15843,7 +16060,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0.00082605326} - m_SizeDelta: {x: -0.000061035, y: 0} + m_SizeDelta: {x: -0.000061035, y: 486} m_Pivot: {x: 0, y: 1} --- !u!114 &1704085230 MonoBehaviour: @@ -15969,7 +16186,7 @@ GameObject: - component: {fileID: 1705669001} - component: {fileID: 1705669003} - component: {fileID: 1705669002} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -16121,7 +16338,7 @@ GameObject: - component: {fileID: 1712599087} - component: {fileID: 1712599089} - component: {fileID: 1712599088} - m_Layer: 0 + m_Layer: 5 m_Name: Leader m_TagString: Untagged m_Icon: {fileID: 0} @@ -16198,7 +16415,7 @@ GameObject: - component: {fileID: 1731149483} - component: {fileID: 1731149485} - component: {fileID: 1731149484} - m_Layer: 0 + m_Layer: 5 m_Name: Fourth m_TagString: Untagged m_Icon: {fileID: 0} @@ -16276,7 +16493,7 @@ GameObject: - component: {fileID: 1734497828} - component: {fileID: 1734497827} - component: {fileID: 1734497826} - m_Layer: 0 + m_Layer: 5 m_Name: up m_TagString: Untagged m_Icon: {fileID: 0} @@ -16618,7 +16835,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1765070894} - m_Layer: 0 + m_Layer: 5 m_Name: move m_TagString: Untagged m_Icon: {fileID: 0} @@ -16793,7 +17010,7 @@ GameObject: - component: {fileID: 1791262372} - component: {fileID: 1791262371} - component: {fileID: 1791262373} - m_Layer: 0 + m_Layer: 5 m_Name: leftIcon m_TagString: Untagged m_Icon: {fileID: 0} @@ -16987,7 +17204,7 @@ GameObject: - component: {fileID: 1841216040} - component: {fileID: 1841216042} - component: {fileID: 1841216041} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -17060,7 +17277,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1853914745} - m_Layer: 0 + m_Layer: 5 m_Name: teamList m_TagString: Untagged m_Icon: {fileID: 0} @@ -17103,7 +17320,7 @@ GameObject: - component: {fileID: 1857750214} - component: {fileID: 1857750213} - component: {fileID: 1857750212} - m_Layer: 0 + m_Layer: 5 m_Name: right m_TagString: Untagged m_Icon: {fileID: 0} @@ -17326,7 +17543,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1859635374} - m_Layer: 0 + m_Layer: 5 m_Name: container m_TagString: Untagged m_Icon: {fileID: 0} @@ -17366,7 +17583,7 @@ GameObject: - component: {fileID: 1864505730} - component: {fileID: 1864505732} - component: {fileID: 1864505731} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -17439,7 +17656,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1874530023} - m_Layer: 0 + m_Layer: 5 m_Name: character m_TagString: Untagged m_Icon: {fileID: 0} @@ -17554,7 +17771,7 @@ GameObject: - component: {fileID: 1904952785} - component: {fileID: 1904952787} - component: {fileID: 1904952786} - m_Layer: 0 + m_Layer: 5 m_Name: image m_TagString: Untagged m_Icon: {fileID: 0} @@ -17914,7 +18131,7 @@ GameObject: - component: {fileID: 1941329058} - component: {fileID: 1941329057} - component: {fileID: 1941329056} - m_Layer: 0 + m_Layer: 5 m_Name: isLeader m_TagString: Untagged m_Icon: {fileID: 0} @@ -18287,7 +18504,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1987368278} - m_Layer: 0 + m_Layer: 5 m_Name: chacterCard (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18311,10 +18528,10 @@ RectTransform: - {fileID: 1005912080} m_Father: {fileID: 1704085229} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 94, y: -124} + m_SizeDelta: {x: 180, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1987921078 GameObject: @@ -18325,7 +18542,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1987921079} - m_Layer: 0 + m_Layer: 5 m_Name: bottomLeft m_TagString: Untagged m_Icon: {fileID: 0} @@ -18363,7 +18580,7 @@ GameObject: - component: {fileID: 1991707756} - component: {fileID: 1991707758} - component: {fileID: 1991707757} - m_Layer: 0 + m_Layer: 5 m_Name: partBig m_TagString: Untagged m_Icon: {fileID: 0} @@ -18722,7 +18939,7 @@ GameObject: - component: {fileID: 2032594369} - component: {fileID: 2032594371} - component: {fileID: 2032594370} - m_Layer: 0 + m_Layer: 5 m_Name: middle m_TagString: Untagged m_Icon: {fileID: 0} @@ -19211,7 +19428,7 @@ GameObject: - component: {fileID: 2081596341} - component: {fileID: 2081596343} - component: {fileID: 2081596342} - m_Layer: 0 + m_Layer: 5 m_Name: partBig m_TagString: Untagged m_Icon: {fileID: 0} @@ -19495,7 +19712,7 @@ GameObject: - component: {fileID: 2124661376} - component: {fileID: 2124661378} - component: {fileID: 2124661377} - m_Layer: 0 + m_Layer: 5 m_Name: middle m_TagString: Untagged m_Icon: {fileID: 0} @@ -19571,7 +19788,7 @@ GameObject: - component: {fileID: 2128554242} - component: {fileID: 2128554241} - component: {fileID: 2128554240} - m_Layer: 0 + m_Layer: 5 m_Name: up m_TagString: Untagged m_Icon: {fileID: 0} @@ -19691,7 +19908,7 @@ GameObject: - component: {fileID: 2143665092} - component: {fileID: 2143665091} - component: {fileID: 2143665090} - m_Layer: 0 + m_Layer: 5 m_Name: backButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -19798,7 +20015,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2143665090} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 827262133} + m_TargetAssemblyTypeName: teamSettingPanel, Assembly-CSharp + m_MethodName: closeTeamSettingPanel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2145804832 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/scripts/Songs_Select/teamSettingPanel.cs b/Assets/scripts/Songs_Select/teamSettingPanel.cs new file mode 100644 index 00000000..c3b3fdd6 --- /dev/null +++ b/Assets/scripts/Songs_Select/teamSettingPanel.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class teamSettingPanel : MonoBehaviour +{ + [SerializeField] + public GameObject teamSettingPanelObj; + [SerializeField] + public GameObject[] teamElementsObj; + [SerializeField] + public GameObject[] teamCharactersObj; + + void Start() + { + // teamSettingPanelObj.SetActive(false); + } + public void openTeamSettingPanel() + { + Debug.Log("打开编队设置面板"); + //todo:向编队管理类拉取已有编队信息,把视图初始化为对应的编队信息 + //可在此补充ui动画信息 + teamSettingPanelObj.SetActive(true); + } + public void closeTeamSettingPanel()=>teamSettingPanelObj.SetActive(false); + + public void updateTeamSettingElements() + { + //todo:向保存编队信息的类获取编队信息,然后重新处理teamElementsObj的信息 + + } +} diff --git a/Assets/scripts/Songs_Select/teamSettingPanel.cs.meta b/Assets/scripts/Songs_Select/teamSettingPanel.cs.meta new file mode 100644 index 00000000..58aa7b6f --- /dev/null +++ b/Assets/scripts/Songs_Select/teamSettingPanel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc980b2fad60d68478fe827374aaf209 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: