Przeglądaj źródła

优化通用提示框

lzx 1 dzień temu
rodzic
commit
b2af742266

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.50849044
+    - _Alpha: 0.009337337
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Ints: []
     m_Floats:
     m_Floats:
-    - _Alpha: 0.21287966
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _ColorMask: 0
     - _EnableExternalAlpha: 0
     - _EnableExternalAlpha: 0

+ 72 - 0
Assets/Res/UI/TipMessagePanel/TipMessagePanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1102 &-2243743873803255587
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: showTips
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 6338071ae19698349baf2871fb50fc52, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: TipMessagePanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 8971930629035168008}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &8971930629035168008
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2243743873803255587}
+    m_Position: {x: 270, y: 50, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -2243743873803255587}

+ 8 - 0
Assets/Res/UI/TipMessagePanel/TipMessagePanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WXtK4XylU3tM1F/bKTT0SXP8D7QAHxWvqP9t1KYiSYaXmpNq/NqLc+vkxnMV
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 38 - 3
Assets/Res/UI/TipMessagePanel/TipMessagePanel.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 8939363238171972854}
   - component: {fileID: 8939363238171972854}
   - component: {fileID: 6560399385940932289}
   - component: {fileID: 6560399385940932289}
+  - component: {fileID: 2256782516058644794}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: TipMessagePanel
   m_Name: TipMessagePanel
@@ -73,6 +74,27 @@ MonoBehaviour:
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
+--- !u!95 &2256782516058644794
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 880950410469998858}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f1edf800366771144b7323c7fe314dd4, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &2463588081883955419
 --- !u!1 &2463588081883955419
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -109,8 +131,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 3.4199}
-  m_SizeDelta: {x: 542.1544, y: 76.4785}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 542.1544, y: 49.8192}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &607144206561970494
 --- !u!222 &607144206561970494
 CanvasRenderer:
 CanvasRenderer:
@@ -182,7 +204,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6862210015852255166
 --- !u!224 &6862210015852255166
 RectTransform:
 RectTransform:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -382,6 +404,7 @@ GameObject:
   serializedVersion: 7
   serializedVersion: 7
   m_Component:
   m_Component:
   - component: {fileID: 6582327781870859720}
   - component: {fileID: 6582327781870859720}
+  - component: {fileID: 2252102652261273102}
   m_Layer: 5
   m_Layer: 5
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: dotPoint
   m_Name: dotPoint
@@ -411,6 +434,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &2252102652261273102
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5357924637379588896}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &8464601678468247561
 --- !u!1 &8464601678468247561
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0

+ 196 - 0
Assets/Res/UI/TipMessagePanel/showTips.anim

@@ -0,0 +1,196 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: showTips
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 150
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: dotPoint
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: dotPoint
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 1820862926
+      attribute: 538195251
+      script: {fileID: 0}
+      typeID: 224
+      customType: 28
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1820862926
+      attribute: 1574349066
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.6666666
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 150
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_AnchoredPosition.y
+    path: dotPoint
+    classID: 224
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.6666666
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: dotPoint
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

+ 8 - 0
Assets/Res/UI/TipMessagePanel/showTips.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CXkcvSqqUioqqed/vA1jIWlqVUuGPIaKk8ROwwBsrWcXzQb8kCXRzl6sKu24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -128,7 +128,7 @@ namespace Fort23.Mono
         /// <summary>
         /// <summary>
         /// 展示文字提示长度
         /// 展示文字提示长度
         /// </summary>
         /// </summary>
-        public int ShowTextCount;
+        public long ShowTextTime;
 
 
         /// <summary>
         /// <summary>
         /// 展示文字提示最大长度
         /// 展示文字提示最大长度

+ 7 - 6
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -680,13 +680,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 {
                 {
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                     TipMessagePanel tipMessagePanel = await TipMessagePanel.OpenTipMessagePanel(
                         $"该任务需要先解锁[{LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName)}], 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁.");
                         $"该任务需要先解锁[{LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName)}], 完成{lastSmallPlacesConfig.CompletionEventCount}个任务后, 可解锁.");
-                    tipMessagePanel.UIClosed(() =>
+                    // tipMessagePanel.UIClosed(() =>
+                    // {
+                    //   
+                    // });
+                    if (PlayerGuideManager.Instance.GuideIsCanDo(3))
                     {
                     {
-                        if (PlayerGuideManager.Instance.GuideIsCanDo(3))
-                        {
-                            PlayerGuideManager.Instance.SetGuid(3);
-                        }
-                    });
+                        PlayerGuideManager.Instance.SetGuid(3);
+                    }
 
 
                     return;
                     return;
                 }
                 }

+ 24 - 8
Assets/Scripts/GameUI/UI/TipMessagePanel/TipMessagePanel.cs

@@ -6,20 +6,34 @@ using UnityEngine.UI;
 namespace Fort23.Mono
 namespace Fort23.Mono
 {
 {
     [UIBinding(prefab = "TipMessagePanel")]
     [UIBinding(prefab = "TipMessagePanel")]
-    public partial class TipMessagePanel : UIPanel
+    public partial class TipMessagePanel : UIComponent
     {
     {
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default)
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(string meg, Vector2 worldPos = default)
         {
         {
+            if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
+            {
+                return null;
+            }
+
+            UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
+                    UIManager.Instance.GetLayer(UILayer.Top));
             tipMessagePanel.SetTipMessage(meg, worldPos);
             tipMessagePanel.SetTipMessage(meg, worldPos);
             return tipMessagePanel;
             return tipMessagePanel;
         }
         }
 
 
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(int meg, Vector2 worldPos = default)
         public static async CTask<TipMessagePanel> OpenTipMessagePanel(int meg, Vector2 worldPos = default)
         {
         {
+            if (PlayerManager.Instance.serverTime - UIManager.Instance.ShowTextTime < 700)
+            {
+                return null;
+            }
+
+            UIManager.Instance.ShowTextTime = PlayerManager.Instance.serverTime;
             TipMessagePanel tipMessagePanel =
             TipMessagePanel tipMessagePanel =
-                await UIManager.Instance.LoadAndOpenPanel<TipMessagePanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.CreateGComponent<TipMessagePanel>(null,
+                    UIManager.Instance.GetLayer(UILayer.Top));
             tipMessagePanel.SetTipMessage(LanguageManager.Instance.Text(meg), worldPos);
             tipMessagePanel.SetTipMessage(LanguageManager.Instance.Text(meg), worldPos);
             return tipMessagePanel;
             return tipMessagePanel;
         }
         }
@@ -32,14 +46,13 @@ namespace Fort23.Mono
 
 
         private void Init()
         private void Init()
         {
         {
-            isAddStack = false;
         }
         }
 
 
-        protected override void AddEvent()
+        public override void AddEvent()
         {
         {
         }
         }
 
 
-        protected override void DelEvent()
+        public override void DelEvent()
         {
         {
         }
         }
 
 
@@ -50,7 +63,7 @@ namespace Fort23.Mono
 
 
         private void OnClickButton_bg()
         private void OnClickButton_bg()
         {
         {
-            UIManager.Instance.HideUIUIPanel(this);
+            // UIManager.Instance.HideUIUIPanel(this);
         }
         }
 
 
         public async void SetTipMessage(string msg, Vector2 pos)
         public async void SetTipMessage(string msg, Vector2 pos)
@@ -73,7 +86,7 @@ namespace Fort23.Mono
             LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
             LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
             RectTransform bgTran = bg_icon.GetComponent<RectTransform>();
             RectTransform bgTran = bg_icon.GetComponent<RectTransform>();
 
 
-            float y = rectTransform.sizeDelta.y + 40;
+            float y = rectTransform.sizeDelta.y + 20;
             if (y < 100)
             if (y < 100)
             {
             {
                 y = 100;
                 y = 100;
@@ -96,6 +109,9 @@ namespace Fort23.Mono
 
 
             dotPoint.anchoredPosition = pos;
             dotPoint.anchoredPosition = pos;
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
+
+            Animator.Play("showTips");
+            TimerComponent.Instance.AddTimer(1450, () => { UIManager.Instance.DormancyGComponent(this); });
         }
         }
     }
     }
 }
 }