From c23a8cff6a60c1e69cc564b320541b8c46691dea Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Sun, 23 Jun 2024 17:43:06 +0800 Subject: [PATCH] sdfs --- .../Assets/Resources/prefeb/tabItem.prefab | 2 + .../Assets/Scenes/MainScene.unity | 342 +++++++++++++++++- FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs | 24 ++ .../Assets/Scripts/Item/CustomItem.cs | 1 + .../Assets/Scripts/Item/TabItem.cs | 19 +- 5 files changed, 381 insertions(+), 7 deletions(-) diff --git a/FuZhou_FirstPage/Assets/Resources/prefeb/tabItem.prefab b/FuZhou_FirstPage/Assets/Resources/prefeb/tabItem.prefab index 88c5182a..ad047607 100644 --- a/FuZhou_FirstPage/Assets/Resources/prefeb/tabItem.prefab +++ b/FuZhou_FirstPage/Assets/Resources/prefeb/tabItem.prefab @@ -290,3 +290,5 @@ MonoBehaviour: nameText: {fileID: 552651399343491238} nochoseSprite: {fileID: 21300000, guid: 38e974ed426be9a468ecc732dec5e66c, type: 3} choseSprite: {fileID: 21300000, guid: 4ced2e7e9bfb6264c8d023a85800ac43, type: 3} + nochoseFont: {fileID: 12800000, guid: dcc291d57ccc8074d92b2d97da31a875, type: 3} + choseFont: {fileID: 12800000, guid: 43ab4162a30d8984db914784438e67b4, type: 3} diff --git a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity index 9711d3fc..d588b1d2 100644 --- a/FuZhou_FirstPage/Assets/Scenes/MainScene.unity +++ b/FuZhou_FirstPage/Assets/Scenes/MainScene.unity @@ -3256,6 +3256,7 @@ RectTransform: - {fileID: 736029548} - {fileID: 1234750085} - {fileID: 331429612} + - {fileID: 2403617721991577370} m_Father: {fileID: 1750630380} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3323,6 +3324,9 @@ MonoBehaviour: - {fileID: 906758476} - {fileID: 2041827823} sheng_Panel: {fileID: 736029547} + backbtn: {fileID: 2403617721991577348} + tab: {fileID: 331429611} + citys: {fileID: 1234750084} serverIP: --- !u!1 &1750630376 GameObject: @@ -4387,12 +4391,12 @@ PrefabInstance: - target: {fileID: 552651399343491238, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_FontData.m_FontStyle - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 552651399343491238, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} propertyPath: m_FontData.m_FontSize - value: 18 + value: 15 objectReference: {fileID: 0} - target: {fileID: 552651400213636529, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} @@ -4516,3 +4520,337 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cafcce2d67c06934d8ffdce1ae1059fc, type: 3} +--- !u!1 &2403617721991577344 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2403617721991577373} + - component: {fileID: 2403617721991577367} + - component: {fileID: 2403617721991577376} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1 &2403617721991577345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2403617721991577370} + - component: {fileID: 2403617721991577364} + - component: {fileID: 2403617721991577390} + - component: {fileID: 2403617721991577377} + m_Layer: 5 + m_Name: "\u798F\u5EFA\u7701" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &2403617721991577347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2403617721991577372} + - component: {fileID: 2403617721991577366} + - component: {fileID: 2403617721991577379} + - component: {fileID: 2403617721991577384} + - component: {fileID: 2403617721991577348} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2403617721991577348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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: 2403617721991577379} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &2403617721991577364 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577345} + m_CullTransparentMesh: 0 +--- !u!222 &2403617721991577366 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577347} + m_CullTransparentMesh: 0 +--- !u!222 &2403617721991577367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577344} + m_CullTransparentMesh: 0 +--- !u!224 &2403617721991577370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577345} + 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_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_SizeDelta: {x: 10, y: 10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &2403617721991577372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577347} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2403617721991577370} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 96.1, y: 0} + m_SizeDelta: {x: 160, y: 48.455505} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &2403617721991577373 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577344} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2403617721991577370} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 207.9, y: 8} + m_SizeDelta: {x: 519, y: 139} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2403617721991577376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577344} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 34a393dc408a9c545a09ff027a7277d7, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2403617721991577377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f3b9ab3fd4183d84199c615a6543837d, type: 3} + m_Name: + m_EditorClassIdentifier: + customItem: {fileID: 0} + showIcon: {fileID: 2403617721991577376} + nameText: {fileID: 2403617721991577379} + nochoseSprite: {fileID: 21300000, guid: 38e974ed426be9a468ecc732dec5e66c, type: 3} + choseSprite: {fileID: 21300000, guid: 4ced2e7e9bfb6264c8d023a85800ac43, type: 3} +--- !u!114 &2403617721991577379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: dcc291d57ccc8074d92b2d97da31a875, type: 3} + m_FontSize: 20 + m_FontStyle: 3 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u798F\u5EFA\u7701" +--- !u!114 &2403617721991577384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2403617721991577377} + m_MethodName: PointIn + m_Mode: 0 + 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 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2403617721991577377} + m_MethodName: PointOut + m_Mode: 0 + 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!114 &2403617721991577390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2403617721991577345} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4ced2e7e9bfb6264c8d023a85800ac43, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs b/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs index cce0fe1f..7da87d45 100644 --- a/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs +++ b/FuZhou_FirstPage/Assets/Scripts/FirstPanel.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.Networking; using UnityEngine.UI; @@ -20,11 +21,25 @@ public class FirstPanel : MonoBehaviour /// 省级 /// public GameObject sheng_Panel; + /// + /// 返回福建省地图 + /// + public Button backbtn; + /// + /// 目录 + /// + public GameObject tab; + + /// + /// 市 + /// + public GameObject citys; /// /// 服务器IP /// + [HideInInspector] public string serverIP; @@ -32,6 +47,15 @@ public class FirstPanel : MonoBehaviour void Awake() { instance = this; + backbtn.onClick.AddListener(() => + { + sheng_Panel.gameObject.SetActive(true); + tab.gameObject.SetActive(true); + citys.transform.GetComponentsInChildren().ToList().ForEach(a => + { + a.gameObject.SetActive(false); + }); + }); #if UNITY_EDITOR serverIP = "172.16.1.164"; diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs index dec4940d..3d8dbe4b 100644 --- a/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs +++ b/FuZhou_FirstPage/Assets/Scripts/Item/CustomItem.cs @@ -30,6 +30,7 @@ public class CustomItem : MonoBehaviour //进入市一级 shi_Panel.gameObject.SetActive(true); shi_Panel.Init(Custom_Code); + FirstPanel.instance.tab.SetActive(false); FirstPanel.instance.sheng_Panel.SetActive(false); }); } diff --git a/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs b/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs index 5841fd01..f2c993b1 100644 --- a/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs +++ b/FuZhou_FirstPage/Assets/Scripts/Item/TabItem.cs @@ -12,23 +12,32 @@ public class TabItem : MonoBehaviour public Text nameText; public Sprite nochoseSprite; public Sprite choseSprite; + public Font nochoseFont; + public Font choseFont; public void PointIn(BaseEventData data) { showIcon.gameObject.SetActive(true); - nameText.fontSize = 18; GetComponent().sprite = choseSprite; //联动 - customItem.PointIn(null); - + if (customItem != null) + { + nameText.fontSize = 18; + nameText.font = choseFont; + customItem.PointIn(null); + } } public void PointOut(BaseEventData data) { showIcon.gameObject.SetActive(false); - nameText.fontSize = 15; GetComponent().sprite = nochoseSprite; //联动 - customItem.PointOut(null); + if(customItem != null) + { + nameText.fontSize = 15; + nameText.font = nochoseFont; + customItem.PointOut(null); + } } }