lzx 1 week ago
parent
commit
92a27ee396

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.21030664
+    - _Alpha: 0.21220803
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.1997621
+    - _MainTexOffsetU: 0.19749725
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

+ 1 - 1
Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -3521,7 +3521,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0

+ 23 - 18
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -17,6 +17,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DialoguePanel")]
     public partial class DialoguePanel : UIPanel
     {
+        private bool isShowAnima;
         private int[] dialogueMessaga;
         private ShowDialogueEventData.MessageShowType messageShowType;
         private Action<int?> finish;
@@ -51,14 +52,14 @@ namespace Fort23.Mono
         {
             DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top,
                 uiData: new object[] { CurrentEventList, id, icon, messageShowType, finish, isShowAnima });
-            if (isShowAnima)
-            {
-                dialoguePanel.DialgueType1Anim.Play("DialgueType1open");
-            }
-            else
-            {
-                dialoguePanel.DialgueType1Anim.Play("DialgueType1idle1");
-            }
+            // if (isShowAnima)
+            // {
+            //     dialoguePanel.DialgueType1Anim.Play("DialgueType1open");
+            // }
+            // else
+            // {
+            //     dialoguePanel.DialgueType1Anim.Play("DialgueType1idle1");
+            // }
 
             // dialoguePanel.ShowPanel(CurrentEventList, id, icon, messageShowType, finish);
         }
@@ -72,10 +73,20 @@ namespace Fort23.Mono
             dialoguePanel.ShowPanel(LanID, icon, messageShowType, finish);
         }
 
-        public override CTask Show()
+        public async override CTask Show()
         {
             EventManager.Instance.Dispatch(CustomEventType.DialoguePanelOpen, null);
-            return base.Show();
+
+
+            base.Show();
+            if (isShowAnima)
+            {
+                DialgueType1Anim.Play("DialgueType1open");
+            }
+            else
+            {
+                DialgueType1Anim.Play("DialgueType1idle1");
+            }
         }
 
         public async override CTask<bool> AsyncInit(object[] uiData)
@@ -149,14 +160,8 @@ namespace Fort23.Mono
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish, bool isShowAnima)
         {
-            if (isShowAnima)
-            {
-                DialgueType1Anim.Play("DialgueType1open");
-            }
-            else
-            {
-                DialgueType1Anim.Play("DialgueType1idle1");
-            }
+            this.isShowAnima = isShowAnima;
+
 
             this.CurrentEventList = CurrentEventList;
             eventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(id);

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


File diff suppressed because it is too large
+ 601 - 214
UserSettings/Layouts/default-2022.dwlt


Some files were not shown because too many files changed in this diff