添加一些音效

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
+    - _Alpha: 0.1924724
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _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.22674286
+    - _Alpha: 0.20872194
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.1803962
+    - _MainTexOffsetU: 0.20165503
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -228,7 +228,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1314726045328197282
 RectTransform:
   m_ObjectHideFlags: 0
@@ -582,7 +582,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 107.707}
+  m_SizeDelta: {x: 0, y: 25}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &4603564870567916663
 MonoBehaviour:
@@ -2229,7 +2229,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 552283852197464311, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2031025586594099529, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
       propertyPath: m_Pivot.x
@@ -2388,22 +2388,42 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 550907275937320223, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 550907275937320223, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
+      propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1345748785835710251, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1345748785835710251, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
+      propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2555085128047509775, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2555085128047509775, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
+      propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2763274918334455231, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2763274918334455231, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
+      propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3451264475322620922, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3451264475322620922, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
+      propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6155729980047365336, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
@@ -2440,15 +2460,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6155729980047365336, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6155729980047365336, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6155729980047365336, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6155729980047365336, guid: 31091e822c41d344bb66ffe9ba3ec016, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Common.Utility.CombatEvent;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -696,7 +697,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     {
                         PlayerGuideManager.Instance.SetGuid(3);
                     }
-
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
@@ -711,6 +712,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                         TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10380,
                             LanguageManager.Instance.Text(lastSmallPlacesConfig.placeName),
                             LanguageManager.Instance.Text(econfig.EventName)));
+                        AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                         return;
                     }
                 }

Assets/Scripts/GameUI/UI/ComBatFrontPanel/ComBatFrontPanel.cs

@@ -78,11 +78,11 @@ namespace Fort23.Mono
                     combatHeroInfo.InitMonster(heroModelConfig.ID, heroPowerUpConfig.ID);
                 }
 
-                if (PlayerManager.Instance.myHero.hp > combatHeroInfo.hp)
+                if (PlayerManager.Instance.myHero.powerUpConfig.ID > combatHeroInfo.powerUpConfig.ID)
                 {
                     csc.ChangeState(0);
                 }
-                else if (PlayerManager.Instance.myHero.hp == combatHeroInfo.hp)
+                else if (PlayerManager.Instance.myHero.powerUpConfig.ID == combatHeroInfo.powerUpConfig.ID)
                 {
                     csc.ChangeState(1);
                 }

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -49,10 +49,8 @@ namespace Fort23.Mono
             Btn_Cancel.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
 
             Btn_Player.onClick.AddListener(() => { UpdateInfo(1); });
-        
         }
 
-     
 
         List<GongFaWidgetType2> gongFaWidgetType2s = new List<GongFaWidgetType2>();
 
@@ -65,7 +63,13 @@ namespace Fort23.Mono
 
         public async CTask CustomInit(int levebattleId, AccountFileInfo.EventList eventList)
         {
-          
+            foreach (var bossInfoHeadWidget in BossInfoHeadWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(bossInfoHeadWidget);
+            }
+
+            BossInfoHeadWidgets.Clear();
+
             levelbattleConfig = ConfigComponent.Instance.Get<LevelbattleConfig>(levebattleId);
             groupConfig = ConfigComponent.Instance.Get<GroupConfig>(levelbattleConfig.Group[0]);
             for (var i = 0; i < groupConfig.GroupMonster.Length; i++)
@@ -287,8 +291,6 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel(int levebattleId, AccountFileInfo.EventList CurrentEventList)
         {
-          
-
             BossInfoPanel bossInfoPanel = await UIManager.Instance.LoadAndOpenPanel<BossInfoPanel>(null, UILayer.Top,
                 uiData: new object[] { levebattleId, CurrentEventList, }, isShowBG: true);
             // bossInfoPanel.CustomInit(levebattleId, result);

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -58,6 +59,7 @@ namespace Fort23.Mono
                     divineSenseConfig.MaxNum)
                 {
                     TipMessagePanel.OpenTipMessagePanel(10335);
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
@@ -72,6 +74,7 @@ namespace Fort23.Mono
                 if (AccountFileInfo.Instance.playerData.divineSensePoint <
                     PlayerManager.Instance.gameConstantConfig.DetectEventCount)
                 {
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     DivineSenceRestoredPanel divineSenceRestoredPanel = await DivineSenceRestoredPanel.OpenPanel();
                     await divineSenceRestoredPanel.UIClosed();
                     CustomInit(callback);

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -93,6 +94,7 @@ namespace Fort23.Mono
 
             if (_skillInfo.SkillData.star > _gongFaUpgradeInfoWidgets.Count)
             {
+                AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                 TipMessagePanel.OpenTipMessagePanel("已经满星！");
                 return;
             }
@@ -105,8 +107,9 @@ namespace Fort23.Mono
 
             if (!PlayerManager.Instance.BagController.DeductItem(_skillInfo.skillConfig.PieceID, count))
             {
+                AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                 ItemSourcePanel.OpenPanel(_skillInfo.skillConfig.PieceID);
-                TipMessagePanel.OpenTipMessagePanel("道具不足！");
+
                 return;
             }
 
@@ -125,7 +128,7 @@ namespace Fort23.Mono
                     break;
                 }
             }
-
+            AudioManager.Instance.PlayAudio("ui_tycg.wav");
             AccountFileInfo.Instance.SavePlayerData();
         }
 
@@ -146,11 +149,13 @@ namespace Fort23.Mono
             if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Count)
             {
                 TipMessagePanel.OpenTipMessagePanel("已经满级！");
+                AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                 return;
             }
 
             if (PlayerManager.Instance.myHero.level.Value < _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
             {
+                AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                 HeroPowerUpConfig heroPowerUpConfig =
                     ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
                 TipMessagePanel.OpenTipMessagePanel(
@@ -163,8 +168,8 @@ namespace Fort23.Mono
                 if (!PlayerManager.Instance.BagController.IsEnough(_skillInfo.SkillPowerupConfig.LevelupItem[i],
                         _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
                 {
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     ItemSourcePanel.OpenPanel(_skillInfo.SkillPowerupConfig.LevelupItem[i]);
-                    TipMessagePanel.OpenTipMessagePanel("道具不足！");
                     return;
                 }
             }
@@ -178,6 +183,7 @@ namespace Fort23.Mono
 
             fx_ui_gongfa_shengji.gameObject.SetActive(true);
             fx_ui_gongfa_shengji.Play();
+            AudioManager.Instance.PlayAudio("ui_fbgfsj.wav");
 
 
             _skillInfo.SkillData.level++;

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

@@ -108,6 +108,7 @@ namespace Fort23.Mono
                 if (PlayerManager.Instance.myHero.heroData.exp + allexp <
                     PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
                 {
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -119,6 +119,7 @@ namespace Fort23.Mono
                     ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().Length)
                 {
                     TipMessagePanel.OpenTipMessagePanel(10338);
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
@@ -131,6 +132,7 @@ namespace Fort23.Mono
                             .jingjieLanIDs[1]) +
                         LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
                     TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10337, jingjie));
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
@@ -140,6 +142,7 @@ namespace Fort23.Mono
                             selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i],
                             selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemCosts[i]))
                     {
+                        AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                         ItemSourcePanel.OpenPanel(selectedFaBaoInfo.FabaoPowerupConfig.PowerupItemIDs[i]);
                         // TipMessagePanel.OpenTipMessagePanel("道具不足");
                         return;
@@ -156,7 +159,7 @@ namespace Fort23.Mono
                             selectedFaBaoInfo.FabaoPowerupConfig.PromotePieceNum[itemConfig2.quality - 1]))
                     {
                         ItemSourcePanel.OpenPanel(itemConfig.associateVlaue[0]);
-                        TipMessagePanel.OpenTipMessagePanel("道具不足");
+                        AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                         return;
                     }
                 }

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -190,13 +190,9 @@ namespace Fort23.Mono
                 DivineSenceEventPreviewPanel.OpenPanel();
             });
             Btn_Map.onClick.AddListener(() => { LevelChoosePanel.OpenPanel(); });
-            // Btn_DaoYou.onClick.AddListener(() => { DaoYouPanel.OpenPanel(); });
-            //
-            // Btn_Tower.onClick.AddListener(() => { TowerPanel.OpenPanel(1); });
-            Debug.Log("zhuce click Btn_QianKunDai");
+        
             Btn_QianKunDai.onClick.AddListener(() =>
             {
-                Debug.Log("click Btn_QianKunDai");
                 QiankundaiPanel.OpenPanel();
             });
 

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -91,12 +92,14 @@ namespace Fort23.Mono
                 if (currentSentimentEffectWidget.lastSentimentWidget != null && currentSentimentEffectWidget.lastSentimentWidget.sentimentProperty.level < currentSentimentEffectWidget.sentimentEffectConfig.unlockLevel)
                 {
                     TipMessagePanel.OpenTipMessagePanel("前置节点没有解锁");
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
                 if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)
                 {
                     TipMessagePanel.OpenTipMessagePanel("已经达到最大等级");
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
@@ -106,12 +109,11 @@ namespace Fort23.Mono
 
                 if (PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount))
                 {
-                    TipMessagePanel.OpenTipMessagePanel("道具不足");
+                    ItemSourcePanel.OpenPanel(sentimentEffectConfig.upConstItemId);
+                    AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
-                //扣除道具
-                // sentimentEffectConfig.upConstItemId.
-                // s
+                AudioManager.Instance.PlayAudio("ui_tycg.wav");
 
                 curretnSentimentProperty.level++;