Browse Source

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

zg 18 hours ago
parent
commit
0dfe5942b8

+ 1 - 1
Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -993,7 +993,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Content: {fileID: 8688761776621079411}
   m_Horizontal: 1
-  m_Vertical: 1
+  m_Vertical: 0
   m_MovementType: 1
   m_Elasticity: 0.1
   m_Inertia: 1

+ 2 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -353,6 +353,7 @@ namespace Fort23.Mono
                 showTextWidgets = await cTaskAwaitBuffer.WaitAll();
             }
 
+            AudioManager.Instance.PlayAudio("dujiebgm.wav");
 
             DujiePanelAnim.Play("guodu");
             fx_ui_dujie_guodu.gameObject.SetActive(true);
@@ -374,6 +375,7 @@ namespace Fort23.Mono
             {
                 fx_ui_dujie_sd.gameObject.SetActive(true);
                 fx_ui_dujie_sd.Play();
+                AudioManager.Instance.PlayAudio("dujie_pizhong.wav");
                 await TimerComponent.Instance.WaitAsync(200);
                 showTextWidgets[i].ShowUI(hpPos.transform.position, -h, HarmType.Default, false);