TTTN1997 1 year ago
parent
commit
855e512024

+ 3 - 3
Assets/Resources/UIPanel/CSGPanel.prefab

@@ -854,7 +854,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 162520060217145770}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -2102,9 +2102,9 @@ RectTransform:
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 748, y: 1624}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1316450464716305389
 CanvasRenderer:

+ 208 - 0
Assets/Resources/UIPanel/MainScenePanel.prefab

@@ -377,6 +377,7 @@ RectTransform:
   - {fileID: 1247748322351945538}
   - {fileID: 1247748322323062981}
   - {fileID: 1247748323308414400}
+  - {fileID: 691602787328497751}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -418,6 +419,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_Return
+    gameObject: {fileID: 967009897360276800}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!95 &8553826245328817763
 Animator:
@@ -1045,3 +1051,205 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6211\u7684"
+--- !u!1 &5236365210035749844
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1390751892591040110}
+  - component: {fileID: 4782147739163839028}
+  - component: {fileID: 6701261029159051441}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1390751892591040110
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236365210035749844}
+  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: 691602787328497751}
+  m_RootOrder: 0
+  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 &4782147739163839028
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236365210035749844}
+  m_CullTransparentMesh: 1
+--- !u!114 &6701261029159051441
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236365210035749844}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 40
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD4\u56DE"
+--- !u!1 &6373626679095841071
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 691602787328497751}
+  - component: {fileID: 7280501811168006389}
+  - component: {fileID: 1193834667888203819}
+  - component: {fileID: 967009897360276800}
+  m_Layer: 5
+  m_Name: Btn_Return
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &691602787328497751
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6373626679095841071}
+  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: 1390751892591040110}
+  m_Father: {fileID: 1247748322901743876}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -312.51807, y: 743.69995}
+  m_SizeDelta: {x: 124.3639, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7280501811168006389
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6373626679095841071}
+  m_CullTransparentMesh: 1
+--- !u!114 &1193834667888203819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6373626679095841071}
+  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: 0}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &967009897360276800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6373626679095841071}
+  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: 1193834667888203819}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

+ 7 - 2
Assets/Resources/UIPanel/StartPanel.prefab

@@ -60,7 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -136,7 +136,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -446,6 +446,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: StartPanelAni
+    gameObject: {fileID: 8631866139585597243}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!95 &8631866139585597243
 Animator:

+ 1 - 1
Assets/Scripts/Mono/UI/Core/UIBasic.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 namespace Mono
 {
-    public abstract class UIBasic
+    public abstract class UIBasic:MonoBehaviour
     {
 
         public GameObject Root;

+ 1 - 1
Assets/Scripts/Mono/UI/Core/UIManager.cs

@@ -78,7 +78,7 @@ namespace Mono
 
             if (!AllPanel.ContainsKey(name))
             {
-                uiPanel = new T();
+                uiPanel = UIRoot.AddComponent<T>();
 
                 GameObject prefab = Resources.Load<GameObject>("UIPanel/" + uiBindingAttribute.prefab);
                 GameObject gameObject = Object.Instantiate(prefab, root);

+ 8 - 0
Assets/Scripts/Mono/UI/Panel/MainScenPanel.cs

@@ -10,6 +10,7 @@ namespace Mono
         public Button Btn_Visit;
         public Button Btn_My;
         public Button Btn_CSG;
+        public Button Btn_Return;
 
         public override void GetUIData()
         {
@@ -17,6 +18,7 @@ namespace Mono
             Btn_Visit = UIData.Get<Button>("Btn_Visit");
             Btn_My = UIData.Get<Button>("Btn_My");
             Btn_CSG = UIData.Get<Button>("Btn_CSG");
+            Btn_Return = UIData.Get<Button>("Btn_Return");
         }
 
         public override void AddButtonEvent()
@@ -29,6 +31,12 @@ namespace Mono
                 UIManager.Instance.HideUIPanel<MainScenePanel>();
                 UIManager.Instance.LoadAndOpenPanel<CSGPanel>(UIManager.UILayer.Middle);
             });
+            
+            Btn_Return.onClick.AddListener(() =>
+            {
+                UIManager.Instance.HideUIPanel<MainScenePanel>();
+                UIManager.Instance.LoadAndOpenPanel<StartPanel>(UIManager.UILayer.Middle);
+            });
         }
     }
 }

+ 33 - 5
Assets/Scripts/Mono/UI/Panel/StartPanel.cs

@@ -1,4 +1,6 @@
-using UnityEngine;
+using System;
+using UnityEditor.Timeline.Actions;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace Mono
@@ -7,21 +9,47 @@ namespace Mono
     public class StartPanel : UIPanel
     {
         public Button Btn_Start;
-
+        public Animator StartPanelAni;
 
         public override void GetUIData()
         {
             Btn_Start = UIData.Get<Button>(nameof(Btn_Start));
+            StartPanelAni = UIData.Get<Animator>(nameof(StartPanelAni));
         }
 
+        private float _timer;
+        private bool _isEnable;
+
         public override void AddButtonEvent()
         {
             Btn_Start.onClick.AddListener(() =>
             {
-                Debug.Log("点击开始游览");
-                UIManager.Instance.HideUIPanel<StartPanel>();
-                UIManager.Instance.LoadAndOpenPanel<MainScenePanel>(UIManager.UILayer.Middle);
+                if (!_isEnable)
+                {
+                    _isEnable = true;
+                    StartPanelAni.Play("starBtnOpen");
+                }
             });
         }
+
+        public void Update()
+        {
+            if (_isEnable)
+            {
+                _timer += Time.deltaTime;
+                if (_timer >= 0.5f)
+                {
+                    OpenMainScenePanel();
+                    _isEnable = false;
+                    _timer = 0;
+                }
+            }
+        }
+
+        public void OpenMainScenePanel()
+        {
+            UIManager.Instance.HideUIPanel<StartPanel>();
+            UIManager.Instance.LoadAndOpenPanel<MainScenePanel>(UIManager.UILayer.Middle);
+        }
     }
 }