修改bug

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.29894018
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

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

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.23441064
+    - _Alpha: 0.22600108
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.17151666
+    - _MainTexOffsetU: 0.18126035
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -434,7 +434,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: 0.1, y: -47.50001}
+  m_AnchoredPosition: {x: -1.2, y: -27.6}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3274072020448486571
@@ -617,7 +617,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 22.5, y: -25.6}
+  m_AnchoredPosition: {x: 33.9, y: -25.6}
   m_SizeDelta: {x: 91, y: 67}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1937265048322601381
@@ -981,7 +981,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: 0.1, y: -47.50001}
+  m_AnchoredPosition: {x: -1.2, y: -27.6}
   m_SizeDelta: {x: 88.376205, y: 38.2085}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5311815257834640554
@@ -2555,7 +2555,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 22.5, y: -25.5}
+  m_AnchoredPosition: {x: 33.9, y: -25.5}
   m_SizeDelta: {x: 57, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4856364321762759249
@@ -2836,7 +2836,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  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
@@ -2918,7 +2918,7 @@ RectTransform:
   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: 750, y: 1334}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3779985811257230296
 CanvasRenderer:
@@ -3343,7 +3343,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 22, y: -25.6}
+  m_AnchoredPosition: {x: 33.9, y: -25.6}
   m_SizeDelta: {x: 91, y: 82}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1991973135826434428
@@ -4034,8 +4034,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 264.1, y: -43.3125}
-  m_SizeDelta: {x: 45, y: 51}
+  m_AnchoredPosition: {x: 264.1, y: -63.6}
+  m_SizeDelta: {x: 70, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4933121210035116233
 CanvasRenderer:
@@ -4174,7 +4174,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  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
@@ -4349,8 +4349,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 143.3, y: -43.3125}
-  m_SizeDelta: {x: 45, y: 51}
+  m_AnchoredPosition: {x: 145.4146, y: -63.40063}
+  m_SizeDelta: {x: 70, y: 90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7708989536689381099
 CanvasRenderer:
@@ -4489,7 +4489,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  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
@@ -4662,7 +4662,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 22.5, y: -25.5}
+  m_AnchoredPosition: {x: 33.9, y: -25.5}
   m_SizeDelta: {x: 56, y: 31}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &39534253641356633
@@ -5168,7 +5168,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  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

Assets/Res/UI/DialoguePanel/DialgueType1.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 3839951853895954167}
-    m_Position: {x: 127.500015, y: 342.50003, z: 0}
+    m_Position: {x: 400, y: 240, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 8872740536849024415}
     m_Position: {x: 134.00002, y: 413.00006, z: 0}
@@ -24,7 +24,7 @@ AnimatorStateMachine:
   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: 3839951853895954167}
+  m_DefaultState: {fileID: 8872740536849024415}
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -57,7 +57,8 @@ AnimatorState:
   m_Name: DialgueType1open
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 5739387439486862154}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -73,6 +74,28 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &5739387439486862154
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 8872740536849024415}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &8872740536849024415
 AnimatorState:
   serializedVersion: 6

Assets/Res/UI/DialoguePanel/DialgueType1idle.anim

@@ -23,7 +23,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -32,7 +32,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -53,7 +53,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -62,7 +62,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -83,7 +83,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -92,7 +92,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -233,7 +233,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -242,7 +242,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -365,7 +365,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -374,7 +374,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -395,7 +395,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -404,7 +404,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -425,7 +425,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -434,7 +434,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -575,7 +575,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -584,7 +584,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.33333334
-        value: 1
+        value: 0
         inSlope: 0
         outSlope: 0
         tangentMode: 136

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -2102,6 +2102,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: DialgueType1Anim
+    gameObject: {fileID: 7508858405402591743}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5501269362975452296
 GameObject:
@@ -3282,7 +3287,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

Assets/Res/UI/HeroInformainPanel/ExpElixirItemWidget.prefab

@@ -689,7 +689,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 43.997498, y: -12.5}
-  m_SizeDelta: {x: 24, y: 23.1372}
+  m_SizeDelta: {x: 0, y: 23.1372}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796567445027890541
 CanvasRenderer:

Assets/Res/UI/SkillInfopanel.prefab

@@ -780,8 +780,8 @@ 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: -19.7, y: 214.9}
-  m_SizeDelta: {x: 169.9389, y: 44.8777}
+  m_AnchoredPosition: {x: 60.7348, y: 214.9}
+  m_SizeDelta: {x: 330.8087, y: 44.8777}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3878207609747309761
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -2750,7 +2750,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2199692367964551178}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 

Assets/Scripts/GameLogic/Combat/Skill/SkillBasic.cs

@@ -140,7 +140,7 @@ namespace GameLogic.Combat.Skill
         private CombatParticleSystemPool _earlyWarningFx;
         private CombatHeroEntity _earlyWarningFristHero;
 
-        protected SkillInfo skillInfo;
+        public SkillInfo skillInfo;
 
         protected int ballisticsCount = 1;
 

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -43,7 +43,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
         else
         {
-            await PlayDialogue(dialogueID, true);
+            await PlayDialogue(dialogueID, true,true);
         }
 
         // EndDialogue1();
@@ -69,7 +69,7 @@ public class DialogueManager : Singleton<DialogueManager>
         }
     }
 
-    private async CTask PlayDialogue(int dialogueID, bool isShowTips = false)
+    private async CTask PlayDialogue(int dialogueID, bool isShowTips = false,bool isShowAnima = false)
     {
         currentDialogueID = dialogueID;
 
@@ -141,7 +141,7 @@ public class DialogueManager : Singleton<DialogueManager>
             {
                 await DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null,
                     ShowDialogueEventData.MessageShowType.Verbatim,
-                    FishDialogue);
+                    FishDialogue,isShowAnima);
             }
             else
             {

Assets/Scripts/GameUI/UI/CombatPanel/EnemyGf_skill.cs

@@ -79,7 +79,7 @@ namespace Fort23.Mono
             if (skillSlotsAlterEventData.SkillSlots == SkillSlots)
             {
                 SkillBasic = SkillSlots.SkillBasic;
-              
+
                 SetUIInfo();
             }
         }
@@ -88,15 +88,19 @@ namespace Fort23.Mono
         {
             mybutton.onClick.AddListener(OnClick);
         }
-        private void OnClick()
-        { 
+
+        private async void OnClick()
+        {
             SkillConfig skillConfig = SkillBasic.SelfSkillConfig;
             CombatController.currActiveCombat.isUpdate = false;
-            SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(skillConfig.name), LanguageManager.Instance.Text(skillConfig.dec),
-                delegate()
-                {
-                    CombatController.currActiveCombat.isUpdate = true;
-                });
+
+            SkillInfopanel skillInfopanel = await SkillInfopanel.OpenPanle(SkillBasic.skillInfo);
+            skillInfopanel.UIClosed(() => { CombatController.currActiveCombat.isUpdate = true; });
+            // SkillMassgePanel.OpenSkillSelectPanel(LanguageManager.Instance.Text(skillConfig.name), LanguageManager.Instance.Text(skillConfig.dec),
+            //     delegate()
+            //     {
+            //         CombatController.currActiveCombat.isUpdate = true;
+            //     });
         }
 
         private void SetUIInfo()

Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidget.cs

@@ -92,16 +92,18 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            myButton.onClick.AddListener(() =>
+            myButton.onClick.AddListener(async () =>
             {
                 if (combatMagicWeaponEntity.IsEnemy)
                 {
                     // SkillConfig skillConfig = SkillBasic.SelfSkillConfig;
                     CombatController.currActiveCombat.isUpdate = false;
-                    SkillMassgePanel.OpenSkillSelectPanel(
-                        LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.name),
-                        LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.model),
-                        delegate() { CombatController.currActiveCombat.isUpdate = true; });
+                    SkillInfopanel skillInfopanel = await SkillInfopanel.OpenPanle(combatMagicWeaponEntity.FaBaoInfo);
+                    skillInfopanel.UIClosed(() => { CombatController.currActiveCombat.isUpdate = true; });
+                    // SkillMassgePanel.OpenSkillSelectPanel(
+                    //     LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.name),
+                    //     LanguageManager.Instance.Text(combatMagicWeaponEntity.FaBaoInfo.FabaoConfig.model),
+                    //     delegate() { CombatController.currActiveCombat.isUpdate = true; });
                     return;
                 }
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -47,10 +47,16 @@ namespace Fort23.Mono
 
         public static async CTask OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
-            Action<int?> finish)
+            Action<int?> finish, bool isShowAnima)
         {
-            DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top);
-            dialoguePanel.ShowPanel(CurrentEventList, id, icon, messageShowType, finish);
+            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");
+            }
+
+            // dialoguePanel.ShowPanel(CurrentEventList, id, icon, messageShowType, finish);
         }
 
 
@@ -68,6 +74,13 @@ namespace Fort23.Mono
             return base.Show();
         }
 
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            await ShowPanel(uiData[0] as AccountFileInfo.EventList, (int)uiData[1], uiData[2] as string[],
+                (ShowDialogueEventData.MessageShowType)uiData[3], uiData[4] as Action<int?>);
+            return await base.AsyncInit(uiData);
+        }
+
         private void Init()
         {
             isAddStack = false;
@@ -128,7 +141,7 @@ namespace Fort23.Mono
             }
         }
 
-        public void ShowPanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
+        public async CTask ShowPanel(AccountFileInfo.EventList CurrentEventList, int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
@@ -228,15 +241,17 @@ namespace Fort23.Mono
             StartShowMassge();
         }
 
-        private async void StartShowMassge()
+        private async CTask StartShowMassge()
         {
             if (isOver)
                 return;
+            CTask cTask = CTask.Create();
 
             icon.onSpriteAlter = () =>
             {
                 icon.SetNativeSize();
                 icon.gameObject.SetActive(true);
+                cTask.SetResult();
             };
             if (eventConditionConfig.NPCID != 100 && eventConditionConfig.NPCID != 0)
             {
@@ -249,9 +264,12 @@ namespace Fort23.Mono
             else
             {
                 icon.gameObject.SetActive(true);
+                cTask.SetResult();
                 // icon.icon_name = "bg_lh_di1";
             }
 
+            await cTask;
+
             if (eventConditionConfig.EventID == 10000)
             {
                 Btn_Cancel.gameObject.SetActive(false);
@@ -394,6 +412,7 @@ namespace Fort23.Mono
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
                     dialogueOptionWidget.CustomInit(i, CurrentEventList, eventConditionConfig.optionPara1[i],
                         eventConditionConfig.ID, SelectOption);
+                    await TimerComponent.Instance.WaitAsync(200);
                 }
 
 
@@ -403,7 +422,8 @@ namespace Fort23.Mono
 
         private async void SelectOption(DialogueOptionWidget obj)
         {
-            if (obj.eventLinkData != null && !EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions)  )
+            if (obj.eventLinkData != null &&
+                !EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions))
             {
                 bool isOk = await EventTipsPanel.OpenPanel(obj.eventLinkData);
 

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -228,6 +228,17 @@ namespace Fort23.Mono
 	      return _Text_Name2;
 	     }
 	   }
+	  private Animator _DialgueType1Anim;
+	  public Animator DialgueType1Anim
+	   {
+	   get{
+	      if (_DialgueType1Anim == null)
+	       {
+	         _DialgueType1Anim  = GetUIUnit<Animator>("DialgueType1Anim"); 
+	       }
+	      return _DialgueType1Anim;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs

@@ -18,7 +18,7 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            IsShowAppBar = false;
+            // IsShowAppBar = false;
             isAddStack = true;
         }
 

Assets/Scripts/GameUI/UI/SkillInfopanel.cs

@@ -1,4 +1,6 @@
 using Core.Language;
+using Excel2Json;
+using Fort23.Core;
 using GameLogic.Hero;
 using UnityEngine.UI;
 using Utility;
@@ -38,6 +40,31 @@ namespace Fort23.Mono
             Icon_SkillIcon.icon_name = faBaoInfo.SkillConfig.icon;
         }
 
+        // public void CustomInit(SkillConfig skillConfig)
+        // {
+        //     Text_Name.text = LanguageManager.Instance.Text(skillInfo.skillConfig.name);
+        //     Text_Level.text = "等级：" + skillInfo.SkillPowerupConfig.ID.ToString();
+        //     Text_Tag.text = "功法";
+        //     Text_tip.text = "功法详情：";
+        //     Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.dec), skillInfo.effectValue);
+        //     Text_Power.gameObject.SetActive(false);
+        //     Icon_SkillIcon.icon_name = skillInfo.skillConfig.icon;
+        //     StarRootGam.SetActive(true);
+        //
+        //     for (var i = 0; i < StarRoot.Count; i++)
+        //     {
+        //         MyImage icon = StarRoot[i] as MyImage;
+        //         if (i < skillInfo.skillConfig.level - 1)
+        //         {
+        //             icon.gameObject.SetActive(true);
+        //         }
+        //         else
+        //         {
+        //             icon.gameObject.SetActive(false);
+        //         }
+        //     }
+        // }
+        
         public void CustomInit(SkillInfo skillInfo)
         {
             Text_Name.text = LanguageManager.Instance.Text(skillInfo.skillConfig.name);
@@ -63,16 +90,18 @@ namespace Fort23.Mono
             }
         }
 
-        public static async void OpenPanle(FaBaoInfo faBaoInfo)
+        public static async CTask<SkillInfopanel> OpenPanle(FaBaoInfo faBaoInfo)
         {
             SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
             skillInfopanel.CustomInit(faBaoInfo);
+            return skillInfopanel;
         }
 
-        public static async void OpenPanle(SkillInfo faBaoInfo)
+        public static async  CTask<SkillInfopanel> OpenPanle(SkillInfo faBaoInfo)
         {
             SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
             skillInfopanel.CustomInit(faBaoInfo);
+            return skillInfopanel;
         }
     }
 }