From abeca51be5e49b1ea9a825b99fb29a9ee6e67aef Mon Sep 17 00:00:00 2001 From: FloatGaming <3118444022@qq.com> Date: Sun, 25 Jan 2026 13:47:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E8=B4=A1=E7=8C=AE=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E5=B0=8F=E9=87=8D=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/gamePlay_gamePlay.unity | 8 +- .../settileTeam/allyHeroSlotPrefab.prefab | 516 ++++++++++++++++-- .../Team/settileTeam/settleTeamPrefab.cs | 45 ++ 3 files changed, 514 insertions(+), 55 deletions(-) diff --git a/Assets/Scenes/gamePlay_gamePlay.unity b/Assets/Scenes/gamePlay_gamePlay.unity index 3831cb84..c104d9e9 100644 --- a/Assets/Scenes/gamePlay_gamePlay.unity +++ b/Assets/Scenes/gamePlay_gamePlay.unity @@ -12228,7 +12228,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 310307531} m_HandleRect: {fileID: 310307530} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 0.9999939 m_NumberOfSteps: 0 m_OnValueChanged: @@ -24328,7 +24328,7 @@ RectTransform: 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: 1215, y: 230} + m_AnchoredPosition: {x: 1180, y: 45} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &754636335 @@ -24366,7 +24366,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 2 - m_Spacing: 300 + m_Spacing: 150 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -32798,7 +32798,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.005126719} + m_AnchoredPosition: {x: 0, y: -0.002723692} m_SizeDelta: {x: 0.00928733, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1181265789 diff --git a/Assets/scripts/Team/settileTeam/allyHeroSlotPrefab.prefab b/Assets/scripts/Team/settileTeam/allyHeroSlotPrefab.prefab index c1f90455..4bf2fb2f 100644 --- a/Assets/scripts/Team/settileTeam/allyHeroSlotPrefab.prefab +++ b/Assets/scripts/Team/settileTeam/allyHeroSlotPrefab.prefab @@ -1,5 +1,46 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &252338325803770077 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4148755058004053777} + m_Layer: 0 + m_Name: af + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4148755058004053777 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 252338325803770077} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3426810894855294520} + - {fileID: 4787860189400675959} + - {fileID: 6563389421309098651} + - {fileID: 7481797042088762975} + - {fileID: 1351079257240028571} + - {fileID: 7655426131176574856} + m_Father: {fileID: 2613971938742376913} + 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: 135.9, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &312614768471175586 GameObject: m_ObjectHideFlags: 0 @@ -323,16 +364,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1300686028162242880} - 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: 2613971938742376913} + m_Father: {fileID: 4787860189400675959} 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: -60.579468, y: 57.712265} + m_AnchoredPosition: {x: -2.5252686, y: 4.807846} m_SizeDelta: {x: 128.8411, y: 125.2335} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2417251892043802145 @@ -632,16 +673,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1803836327666263803} - 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: 2613971938742376913} + m_Father: {fileID: 4787860189400675959} 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: -60.579468, y: 58.315758} + m_AnchoredPosition: {x: -2.5252686, y: 5.411278} m_SizeDelta: {x: 103.0728, y: 103.0728} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1406633831322811249 @@ -812,8 +853,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 3 + m_ChildAlignment: 4 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -955,8 +996,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 3 + m_ChildAlignment: 4 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -989,17 +1030,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2879873275385921024} - 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: 2613971938742376913} + m_Father: {fileID: 4148755058004053777} 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: -104.10006, y: -18.500015} - m_SizeDelta: {x: 718.0001, y: 321} + m_AnchoredPosition: {x: -220.10004, y: 60.999985} + m_SizeDelta: {x: 486.0001, y: 162} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5280582095696078567 CanvasRenderer: @@ -1138,14 +1179,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2958176516572081862} - 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: - {fileID: 3360676864014209052} - {fileID: 7724917837877518295} - m_Father: {fileID: 1351079257240028571} + m_Father: {fileID: 4156360110775530010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1175,20 +1216,86 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3021633488302334975} - 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: - {fileID: 6941589593732765355} - {fileID: 2268028861633983332} - m_Father: {fileID: 1351079257240028571} + m_Father: {fileID: 4156360110775530010} 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: 230, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &3094614317787732556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4156360110775530010} + - component: {fileID: 7982449552540773536} + m_Layer: 0 + m_Name: verti + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4156360110775530010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3094614317787732556} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1813990329505698292} + - {fileID: 5278958300364593933} + - {fileID: 5213525157689929386} + - {fileID: 122756198372604741} + m_Father: {fileID: 8325120339040611070} + 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: 68, y: 15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7982449552540773536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3094614317787732556} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 1 + m_Spacing: -22.09 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3282975785572889131 GameObject: m_ObjectHideFlags: 0 @@ -1478,8 +1585,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 3 + m_ChildAlignment: 4 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1682,6 +1789,42 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u6CBB\u7597\u751F\u547D" +--- !u!1 &4396793937655543920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8325120339040611070} + m_Layer: 0 + m_Name: detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8325120339040611070 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4396793937655543920} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4156360110775530010} + m_Father: {fileID: 6563389421309098651} + 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!1 &4974313003433738603 GameObject: m_ObjectHideFlags: 0 @@ -1781,18 +1924,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5125316427623133892} - 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: - {fileID: 2723143847810275211} - {fileID: 8893420547332436633} - m_Father: {fileID: 2613971938742376913} + m_Father: {fileID: 4148755058004053777} 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: -94.5} + m_AnchoredPosition: {x: -313.46063, y: 50} m_SizeDelta: {x: 233, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4531879398774622215 @@ -1828,16 +1971,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5259468052454179458} - 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: 2613971938742376913} + m_Father: {fileID: 4148755058004053777} 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: -281.88702, y: 72.14691} + m_AnchoredPosition: {x: -284.47562, y: 95.52118} m_SizeDelta: {x: 290.97, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3659676079848674504 @@ -1882,6 +2025,85 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u89D2\u8272\u7684\u79F0\u53F7 \u89D2\u8272\u540D" +--- !u!1 &5399849010761333294 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4489091791280738956} + - component: {fileID: 7287820284985504367} + - component: {fileID: 1498119364687232760} + m_Layer: 0 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4489091791280738956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399849010761333294} + 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: 6494845825576441926} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7287820284985504367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399849010761333294} + m_CullTransparentMesh: 1 +--- !u!114 &1498119364687232760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5399849010761333294} + 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: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 12800000, guid: bd4be44636ad6c24a9b117a7108a75e9, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8BE6\u60C5" --- !u!1 &5553841775564682015 GameObject: m_ObjectHideFlags: 0 @@ -1905,14 +2127,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5553841775564682015} - 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: - {fileID: 899417396886548034} - {fileID: 6742670383706690542} - m_Father: {fileID: 1351079257240028571} + m_Father: {fileID: 4156360110775530010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1974,8 +2196,8 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 5 - m_Spacing: 3 + m_ChildAlignment: 4 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -2082,22 +2304,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6447178527273418072} - 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: - {fileID: 2418429837761252522} - {fileID: 796738331562133123} - - {fileID: 1813990329505698292} - - {fileID: 5278958300364593933} - - {fileID: 5213525157689929386} - - {fileID: 122756198372604741} - m_Father: {fileID: 2613971938742376913} + m_Father: {fileID: 4148755058004053777} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -217.1, y: 0} + m_AnchoredPosition: {x: -251.8, y: -8.57} m_SizeDelta: {x: 200, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &685427306910703188 @@ -2118,7 +2336,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: -22.09 + m_Spacing: -28.09 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2219,13 +2437,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3426810894855294520} - - {fileID: 4787860189400675959} - - {fileID: 7276837415997336770} - - {fileID: 4600183637760829555} - - {fileID: 7481797042088762975} - - {fileID: 1351079257240028571} - - {fileID: 7655426131176574856} + - {fileID: 4148755058004053777} + - {fileID: 6494845825576441926} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -2255,6 +2468,8 @@ MonoBehaviour: this_allyDamageTook: {fileID: 6710859829210588663} this_allyHealthRestored: {fileID: 4747908444235164775} this_allyManaRestored: {fileID: 6381579454208282139} + displayDetailContributionButton: {fileID: 2479934731397186594} + detailContributionGO: {fileID: 7749677393578589965} --- !u!1 &6682492808549074205 GameObject: m_ObjectHideFlags: 0 @@ -2280,16 +2495,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6682492808549074205} - 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: 2613971938742376913} + m_Children: + - {fileID: 7276837415997336770} + - {fileID: 4600183637760829555} + m_Father: {fileID: 4148755058004053777} 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: -58.0542, y: 52.904434} + m_AnchoredPosition: {x: -58.0542, y: 61.1} m_SizeDelta: {x: 128.8411, y: 125.2335} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2643565460332953122 @@ -2686,6 +2903,203 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!1 &7749677393578589965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6563389421309098651} + - component: {fileID: 810551395488659022} + - component: {fileID: 6166333130145850564} + m_Layer: 0 + m_Name: detialPage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6563389421309098651 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749677393578589965} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8325120339040611070} + m_Father: {fileID: 4148755058004053777} + 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: -597.3, y: 60.999985} + m_SizeDelta: {x: 271.5, y: 162} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &810551395488659022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749677393578589965} + m_CullTransparentMesh: 1 +--- !u!114 &6166333130145850564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7749677393578589965} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3} + 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!1 &7889622464149315732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6494845825576441926} + - component: {fileID: 79757123884187993} + - component: {fileID: 3825967905242055876} + - component: {fileID: 2479934731397186594} + m_Layer: 0 + m_Name: displayDetail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6494845825576441926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7889622464149315732} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4489091791280738956} + m_Father: {fileID: 2613971938742376913} + 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: -30.02781, y: 51.42924} + m_SizeDelta: {x: 60.056, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &79757123884187993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7889622464149315732} + m_CullTransparentMesh: 1 +--- !u!114 &3825967905242055876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7889622464149315732} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7f3b1220317607e44bbb8f0e1998044a, type: 3} + 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: 3 +--- !u!114 &2479934731397186594 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7889622464149315732} + 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: 3825967905242055876} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8064355490890082394 GameObject: m_ObjectHideFlags: 0 @@ -2709,14 +3123,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8064355490890082394} - 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: - {fileID: 6283988937714828285} - {fileID: 6876362980204700552} - m_Father: {fileID: 1351079257240028571} + m_Father: {fileID: 4156360110775530010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/scripts/Team/settileTeam/settleTeamPrefab.cs b/Assets/scripts/Team/settileTeam/settleTeamPrefab.cs index de30a8c7..9d73cee8 100644 --- a/Assets/scripts/Team/settileTeam/settleTeamPrefab.cs +++ b/Assets/scripts/Team/settileTeam/settleTeamPrefab.cs @@ -16,4 +16,49 @@ public class settleTeamPrefab : MonoBehaviour public Text this_allyDamageTook; public Text this_allyHealthRestored; public Text this_allyManaRestored; + [Header("չʾÏêϸ¹±Ï×°´Å¥")] + public Button displayDetailContributionButton; + public GameObject detailContributionGO; + + private void Start() + { + // ³õʼ»¯£ºÏêϸ¹±Ï×Ãæ°åĬÈϲ»¼¤»î + if (detailContributionGO != null) + { + detailContributionGO.SetActive(false); + } + + // Ϊ°´Å¥Ìí¼Óµã»÷¼àÌý + if (displayDetailContributionButton != null) + { + displayDetailContributionButton.onClick.AddListener(OnDisplayDetailContributionButtonClicked); + } + } + + private void OnDestroy() + { + // ÒƳý¼àÌýÒÔ±ÜÃâÄÚ´æй© + if (displayDetailContributionButton != null) + { + displayDetailContributionButton.onClick.RemoveListener(OnDisplayDetailContributionButtonClicked); + } + } + + private void OnDisplayDetailContributionButtonClicked() + { + if (detailContributionGO == null) + { + Debug.LogWarning("[settleTeamPrefab] detailContributionGO is not assigned"); + return; + } + + // Çл»Ïêϸ¹±Ï×Ãæ°åµÄ¼¤»î״̬ + bool isCurrentlyActive = detailContributionGO.activeSelf; + detailContributionGO.SetActive(!isCurrentlyActive); + + if (GameConfig.verboseLogs) + { + Debug.Log($"[settleTeamPrefab] Detail contribution panel toggled: {!isCurrentlyActive}"); + } + } }