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

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/Config/SentimentConfig.json

@@ -4,7 +4,7 @@
       "ID": 1,
       "name": 3078,
       "icon": "icon_xinjing1",
-      "icon_Text": "icon_xinjing1",
+      "icon_Text": "icon_xinjing1zi",
       "mainSentimentEffect": 1,
       "sentimentEffect": [
         111,
@@ -19,7 +19,7 @@
       "ID": 2,
       "name": 3079,
       "icon": "icon_xinjing2",
-      "icon_Text": "icon_xinjing2",
+      "icon_Text": "icon_xinjing2zi",
       "mainSentimentEffect": 2,
       "sentimentEffect": [
         121,
@@ -34,7 +34,7 @@
       "ID": 3,
       "name": 3080,
       "icon": "icon_xinjing3",
-      "icon_Text": "icon_xinjing3",
+      "icon_Text": "icon_xinjing3zi",
       "mainSentimentEffect": 3,
       "sentimentEffect": [
         131,
@@ -49,7 +49,7 @@
       "ID": 4,
       "name": 3081,
       "icon": "icon_xinjing4",
-      "icon_Text": "icon_xinjing4",
+      "icon_Text": "icon_xinjing4zi",
       "mainSentimentEffect": 4,
       "sentimentEffect": [
         141,
@@ -64,7 +64,7 @@
       "ID": 5,
       "name": 3082,
       "icon": "icon_xinjing5",
-      "icon_Text": "icon_xinjing5",
+      "icon_Text": "icon_xinjing5zi",
       "mainSentimentEffect": 5,
       "sentimentEffect": [
         151,
@@ -79,7 +79,7 @@
       "ID": 6,
       "name": 3083,
       "icon": "icon_xinjing6",
-      "icon_Text": "icon_xinjing6",
+      "icon_Text": "icon_xinjing6zi",
       "mainSentimentEffect": 6,
       "sentimentEffect": [
         161,
@@ -94,7 +94,7 @@
       "ID": 7,
       "name": 3084,
       "icon": "icon_xinjing7",
-      "icon_Text": "icon_xinjing7",
+      "icon_Text": "icon_xinjing7zi",
       "mainSentimentEffect": 7,
       "sentimentEffect": [
         171,

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/Res/UI/DaoYouPanel/DaoYouIdleEarningsWidget.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 68.29999, y: 235.4986}
-  m_SizeDelta: {x: 107, y: 3}
+  m_SizeDelta: {x: 107, y: 4}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &566111804867399921
 CanvasRenderer:

Assets/Res/UI/DaoYouPanel/DaoYouInfoPanel.prefab

@@ -1232,7 +1232,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: 197.0892, y: -38}
+  m_AnchoredPosition: {x: 197.0892, y: -53}
   m_SizeDelta: {x: 394.1784, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8219955351092879517

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -2303,8 +2303,8 @@ RectTransform:
   - {fileID: 7692224466086610}
   - {fileID: 870851736323112643}
   - {fileID: 502004080859018007}
-  - {fileID: 2834830722424334932}
   - {fileID: 2042784205301195018}
+  - {fileID: 2834830722424334932}
   - {fileID: 2094779113935113657}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/SentimentPanel/SentimentWidget.prefab

@@ -32,6 +32,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2899708151964561830}
+  - {fileID: 3560124095871830324}
   m_Father: {fileID: 4108690741632151610}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -155,7 +156,101 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Icon_Zi
+    gameObject: {fileID: 7803743681013278044}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
+--- !u!1 &3168137222820875410
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3560124095871830324}
+  - component: {fileID: 3042345631558780466}
+  - component: {fileID: 7803743681013278044}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Zi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3560124095871830324
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3168137222820875410}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6739432532670260918}
+  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, y: 0}
+  m_SizeDelta: {x: 38, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3042345631558780466
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3168137222820875410}
+  m_CullTransparentMesh: 1
+--- !u!114 &7803743681013278044
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3168137222820875410}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_xinjing1zi
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e09f56329289dea619e61cb78606497c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4116890335121659091
 GameObject:
   m_ObjectHideFlags: 0
@@ -310,7 +405,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2899708151964561830
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/TipMessagePanel/showTips.anim

@@ -30,6 +30,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.75
+        value: 15
+        inSlope: 36
+        outSlope: 36
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.6666666
         value: 150
@@ -60,6 +69,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.6666666
         value: 0
@@ -138,6 +156,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.75
+        value: 15
+        inSlope: 36
+        outSlope: 36
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.6666666
         value: 150
@@ -168,6 +195,15 @@ AnimationClip:
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
       - serializedVersion: 3
         time: 1.6666666
         value: 0

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/SentimentEffectWidget.cs

@@ -43,13 +43,16 @@ namespace Fort23.Mono
             sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
             var _sentimentEffectConfigs = ConfigComponent.Instance.GetAll<SentimentEffectConfig>();
-            var currentGroupSentimentEffectConfigs = _sentimentEffectConfigs.Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
+            var currentGroupSentimentEffectConfigs = _sentimentEffectConfigs
+                .Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
             if (sentimentProperty.level == 0)
             {
                 Text_Level.text = "未激活";
+                transform.Gray();
             }
             else
             {
+                transform.RecoverColor();
                 Text_Level.text = level + "/" + currentGroupSentimentEffectConfigs.Count;
             }
         }
@@ -59,7 +62,8 @@ namespace Fort23.Mono
             this.lastSentimentWidget = lastSentimentWidget;
 
 
-            SentimentXianWidget sentimentXianWidget = await UIManager.Instance.CreateGComponent<SentimentXianWidget>(null, root);
+            SentimentXianWidget sentimentXianWidget =
+                await UIManager.Instance.CreateGComponent<SentimentXianWidget>(null, root);
             _sentimentXianWidgets.Add(sentimentXianWidget);
             var lineRect = sentimentXianWidget.transform;
             Vector2 localPointA = root.worldToLocalMatrix.MultiplyPoint3x4(lastSentimentWidget.own.transform.position);

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;
@@ -61,7 +62,9 @@ namespace Fort23.Mono
                     int itemid = 0;
                     for (int i = 0; i < sentimentDataSentimentProperty.level; i++)
                     {
-                        int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
+                        int level1 = sentimentData.sentimentProperties[0].level <= 0
+                            ? 1
+                            : sentimentData.sentimentProperties[0].level;
                         int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
                         var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
                         itemid = sentimentEffectConfig1.upConstItemId;
@@ -78,7 +81,13 @@ namespace Fort23.Mono
                 {
                     sentimentEffectWidget.CustomInit(sentimentEffectWidget.sentimentProperty);
                 }
+                
+                foreach (var sentimentEffectWidget in sentimentEffectWidgets)
+                {
+                    sentimentEffectWidget.UpdateXian();
+                }
 
+                UpdateRestBtn();
                 AccountFileInfo.Instance.SavePlayerData();
             });
             Btn_LingWu.onClick.AddListener(() =>
@@ -88,30 +97,36 @@ namespace Fort23.Mono
                     return;
                 }
 
-                if (currentSentimentEffectWidget.lastSentimentWidget != null && currentSentimentEffectWidget.lastSentimentWidget.sentimentProperty.level < currentSentimentEffectWidget.sentimentEffectConfig.unlockLevel)
+                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;
                 }
 
                 int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;
                 int conFigId = curretnSentimentProperty.groupId * 100 + level + 1;
-                SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
+                SentimentEffectConfig sentimentEffectConfig =
+                    ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
 
-                if (PlayerManager.Instance.BagController.DeductItem(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount))
+                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++;
 
@@ -123,6 +138,7 @@ namespace Fort23.Mono
                     sentimentEffectWidget.UpdateXian();
                 }
 
+                UpdateRestBtn();
                 UpdateUi();
                 currentSentimentEffectWidget.CustomInit(curretnSentimentProperty);
             });
@@ -152,12 +168,16 @@ namespace Fort23.Mono
         {
             sentimentData = uiData[0] as AccountFileInfo.SentimentData;
             _sentimentEffectConfigs = ConfigComponent.Instance.GetAll<SentimentEffectConfig>().ToList();
-            mainSentimentEffectWidget = await UIManager.Instance.CreateGComponentForObject<SentimentEffectWidget>(MainSentimentEffectWidget, null);
+            mainSentimentEffectWidget =
+                await UIManager.Instance.CreateGComponentForObject<SentimentEffectWidget>(MainSentimentEffectWidget,
+                    null);
             mainSentimentEffectWidget.CustomInit(sentimentData.mainSentiment);
             mainSentimentEffectWidget.OnClick = OnClick;
 
 
-            int level1 = sentimentData.sentimentProperties[0].level <= 0 ? 1 : sentimentData.sentimentProperties[0].level;
+            int level1 = sentimentData.sentimentProperties[0].level <= 0
+                ? 1
+                : sentimentData.sentimentProperties[0].level;
             int conFigId1 = sentimentData.sentimentProperties[0].groupId * 10 + level1;
             var sentimentEffectConfig1 = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId1);
             if (_titlePanel == null)
@@ -191,7 +211,8 @@ namespace Fort23.Mono
                 var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
                 int index = MapNumber(sentimentEffectConfig.pos);
 
-                SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Root[index]);
+                SentimentEffectWidget sentimentEffectWidget1 =
+                    await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Root[index]);
                 sentimentEffectWidget1.CustomInit(sentimentDataSentimentProperty);
                 sentimentEffectWidget1.OnClick = OnClick;
 
@@ -202,6 +223,8 @@ namespace Fort23.Mono
                 }
             }
 
+            UpdateRestBtn();
+
             foreach (var rectTransform in Root)
             {
                 LayoutRebuilder.ForceRebuildLayoutImmediate(rectTransform);
@@ -210,7 +233,9 @@ namespace Fort23.Mono
 
             foreach (var sentimentEffectWidget in sentimentEffectWidgets)
             {
-                int level = sentimentEffectWidget.sentimentProperty.level <= 0 ? 1 : sentimentEffectWidget.sentimentProperty.level;
+                int level = sentimentEffectWidget.sentimentProperty.level <= 0
+                    ? 1
+                    : sentimentEffectWidget.sentimentProperty.level;
                 int conFigId = sentimentEffectWidget.sentimentProperty.groupId * 10 + level;
                 var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
                 SentimentEffectWidget sentimentEffectWidget1 = null;
@@ -220,25 +245,43 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    sentimentEffectWidget1 = sentimentEffectWidgets.FirstOrDefault(s => s.sentimentEffectConfig.groupId == sentimentEffectConfig.lastSentimentEffectId);
+                    sentimentEffectWidget1 = sentimentEffectWidgets.FirstOrDefault(s =>
+                        s.sentimentEffectConfig.groupId == sentimentEffectConfig.lastSentimentEffectId);
                 }
 
                 sentimentEffectWidget.CreatXian(XianRoot, sentimentEffectWidget1);
             }
         }
 
+        private void UpdateRestBtn()
+        {
+            bool isCanRest = false;
+            foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
+            {
+                if (sentimentDataSentimentProperty.level >= 1)
+                {
+                    isCanRest = true;
+                }
+            }
+
+            Btn_Rest.gameObject.SetActive(isCanRest);
+        }
+
         private async void UpdateUi()
         {
             int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;
             int conFigId = curretnSentimentProperty.groupId * 10 + level;
             SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
-            currentGroupSentimentEffectConfigs = _sentimentEffectConfigs.Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
+            currentGroupSentimentEffectConfigs = _sentimentEffectConfigs
+                .Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
-            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(sentimentEffectConfig.massge), sentimentEffectConfig.effectVale);
+            Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(sentimentEffectConfig.massge),
+                sentimentEffectConfig.effectVale);
 
             UIManager.Instance.DormancyGComponent(_itemWidgetType1);
             _itemWidgetType1 = null;
-            _itemWidgetType1 = await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null);
+            _itemWidgetType1 =
+                await UIManager.Instance.CreateGComponentForObject<ItemWidgetType1>(ItemWidgetType1Gam, null);
             _itemWidgetType1.CustomInit(sentimentEffectConfig.upConstItemId, sentimentEffectConfig.upConstCount);
 
             if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)

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

@@ -32,6 +32,7 @@ namespace Fort23.Mono
             sentimentData = AccountFileInfo.Instance.playerData.SentimentDatas.FirstOrDefault(sd => sd.id == id);
             SentimentConfig sentimentConfig = ConfigComponent.Instance.Get<SentimentConfig>(id);
             Text_Name.text = LanguageManager.Instance.Text(sentimentConfig.name);
+            Icon_Zi.icon_name = sentimentConfig.icon_Text;
             if (sentimentData == null)
             {
                 transform.Gray();

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

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