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

# Conflicts:
#	Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat   resolved by origin/master(远端) version

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.16755152
+    - _Alpha: 0.99909014
     - _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
+    - _Alpha: 0.99817175
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

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/DivineSence/DivineSenceInfoPanel.prefab

@@ -1652,7 +1652,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 215.4}
-  m_SizeDelta: {x: 532.04, y: 110.3}
+  m_SizeDelta: {x: 0, y: 110.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &278002706122496663
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3386,7 +3386,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 0, y: 43.2862}
+  m_SizeDelta: {x: 210, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab

@@ -330,7 +330,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1928020948802863893
 RectTransform:
   m_ObjectHideFlags: 0
@@ -347,8 +347,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 67.1, y: 24.5}
-  m_SizeDelta: {x: 61.3275, y: 34.729996}
+  m_AnchoredPosition: {x: 103.7, y: 25.037}
+  m_SizeDelta: {x: 275.4522, y: 34.73}
   m_Pivot: {x: -0.12784432, y: 1.9532585}
 --- !u!222 &4400891513561527877
 CanvasRenderer:

Assets/Scenes/testCombat.scene

@@ -1644,6 +1644,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: LoadingPanel
       objectReference: {fileID: 0}
+    - target: {fileID: 5484466371172864172, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8311278189826985699, guid: b37c08dad0bf98f42b569bf67e351455, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -424,6 +424,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int curStep;
 
         public bool isCompleted;
+        
+        public bool isCompleted1;
     }
 
     [System.Serializable]

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -654,7 +654,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     /// <summary>
     /// 其他类型事件触发
     /// </summary>
-    public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null,Action uiOpenOverCallBack = null)
+    public async CTask TriggerEvent(AccountFileInfo.EventList evt, Action oncompleteCallBack = null,
+        Action uiOpenOverCallBack = null)
     {
         // ChancleEvent();
         if (isTriggerEvent)
@@ -764,7 +765,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
         await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, () =>
         {
-            CompleteEvent(CurrentEventList);
+            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
+            if (eventConfig.EventTriggerType != 4)
+            {
+                CompleteEvent(CurrentEventList);
+            }
+            else
+            {
+                CurrentEventList.isCompleted1 = true;
+                AccountFileInfo.Instance.SavePlayerData();
+                CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
+            }
+
             cTask.SetResult();
         }, () =>
         {

Assets/Scripts/GameUI/GameApplction.cs

@@ -51,9 +51,10 @@ public class GameApplction : IGameStart
         BundleLoadType = (BundleLoadType)LoadType;
         GameObject gameObject = new GameObject("app");
         gameObject.AddComponent<GameApplctionMono>();
+       
         await InitGameApplication();
         LoadFinish?.Invoke();
-        UIManager.Instance.Canvas.gameObject.SetActive(true);
+    
 
         Debug.Log("初始化完成");
     }
@@ -115,6 +116,7 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
+        UIManager.Instance.Canvas.gameObject.SetActive(true);
         if (PlayerGuideManager.Instance.GuideIsCanDo(1))
         {
             await MarskPanel.OpenPanel(255);

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -163,7 +164,7 @@ namespace Fort23.Mono
                             daoYouData.favorabilityLv++;
                         }
                     }
-
+                    AudioManager.Instance.PlayAudio("ui_shiyonghuode");
                     AccountFileInfo.Instance.SavePlayerData();
                 }
                 //加心情

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+using Core.Audio;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -43,11 +44,13 @@ namespace Fort23.Mono
 
                 if (!PlayerManager.Instance.myHero.heroData.ImmortalBond.Contains(addDaoYouWidget._daoYouData.id))
                 {
+                    AudioManager.Instance.PlayAudio("ui_shangzhengdaolv.wav");
                     PlayerManager.Instance.myHero.heroData.ImmortalBond.Add(addDaoYouWidget._daoYouData.id);
                     PlayerManager.Instance.myHero.ComputeHeroInfo();
                     AccountFileInfo.Instance.SavePlayerData();
                     addDaoYouWidget = null;
                     UIManager.Instance.HideUIUIPanel(this);
+                    
                 }
             });
         }

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

@@ -225,6 +225,18 @@ namespace Fort23.Mono
                 return;
             }
 
+            EventConfig eventConfig =
+                ConfigComponent.Instance.Get<EventConfig>(shengShiEventWidgetType2.eventList.eventID);
+            if (eventConfig.EventTriggerType == 4)
+            {
+                if (shengShiEventWidgetType2.eventList.isCompleted1)
+                {
+                    EventSystemManager.Instance.CompleteEvent(shengShiEventWidgetType2.eventList);
+                    UpdateContent();
+                    return;
+                }
+            }
+
             isTriggerEvent = true;
 
 

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

@@ -104,7 +104,7 @@ namespace Fort23.Mono
             }
             else
             {
-                csc.ChangeState(randomEventConfig.EventQuality-1);
+                csc.ChangeState(randomEventConfig.EventQuality - 1);
             }
 
 
@@ -160,6 +160,11 @@ namespace Fort23.Mono
                 Text_Go.text = LanguageManager.Instance.Text(10240);
                 Btn_Go.image.color = new Color32(200, 199, 199, 255);
             }
+            else if (eventList.isCompleted1)
+            {
+                Text_Go.text = LanguageManager.Instance.Text(10157);
+                Btn_Go.image.color = new Color32(206, 168, 105, 255);
+            }
             else
             {
                 Btn_Go.image.color = new Color32(206, 168, 105, 255);
@@ -173,13 +178,14 @@ namespace Fort23.Mono
 
             ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId ==
                                               eventList.guid);
+
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
             if (randomEventConfig.SmallPlacesId != 0)
             {
                 SmallPlacesConfig smallPlacesConfig =
                     ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
                 PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
-                Text_Mapname.text =LanguageManager.Instance.Text(10302,
+                Text_Mapname.text = LanguageManager.Instance.Text(10302,
                     LanguageManager.Instance.Text(placesConfig.placeName),
                     LanguageManager.Instance.Text(smallPlacesConfig.placeName));
                 Text_Mapname.gameObject.SetActive(true);
@@ -230,7 +236,7 @@ namespace Fort23.Mono
 
             foreach (var eventListEventLink in eventList.eventLinks)
             {
-                if(eventListEventLink.eventLinkId <= eventList.curStep)
+                if (eventListEventLink.eventLinkId <= eventList.curStep)
                     continue;
                 EventLinkConfig eventLinkConfig =
                     ConfigComponent.Instance.Get<EventLinkConfig>(eventListEventLink.eventLinkId);

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Core.Language;
@@ -185,8 +186,8 @@ namespace Fort23.Mono
 
             UpdateStarBtn();
 
-            Text_GongFaDesc.text =
-                UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
+            // Text_GongFaDesc.text =
+            //     UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
             Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " ";
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.GetComponent<RectTransform>());
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Level.GetComponent<RectTransform>());
@@ -312,12 +313,12 @@ namespace Fort23.Mono
                     {
                         if (_skillInfo.effectValue[i] == nextSkillInfo.effectValue[i])
                         {
-                            effs[i] = _skillInfo.effectValue[i].ToString();
+                            effs[i] = FormatNumber(_skillInfo.effectValue[i]);
                         }
                         else
                         {
                             effs[i] =
-                                $"{_skillInfo.effectValue[i].ToString()}<color=green>→({nextSkillInfo.effectValue[i]})</color>";
+                                $"{FormatNumber(_skillInfo.effectValue[i])}<color=green>→({FormatNumber(nextSkillInfo.effectValue[i])})</color>";
                         }
                     }
 
@@ -438,8 +439,14 @@ namespace Fort23.Mono
                 }
 
                 Text_NextLevel.transform.parent.gameObject.SetActive(false);
+                string[] effs = new string[_skillInfo.effectValue.Length];
+                for (var i = 0; i < _skillInfo.effectValue.Length; i++)
+                {
+                    effs[i] = FormatNumber(_skillInfo.effectValue[i]);
+                }
+
                 Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(_skillInfo.skillConfig.dec),
-                    _skillInfo.effectValue);
+                    effs);
             }
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.GetComponent<RectTransform>());
@@ -484,5 +491,32 @@ namespace Fort23.Mono
             _skillInfo = null;
             await base.Close();
         }
+
+        public static string FormatNumber(double number)
+        {
+            const double tolerance = 1e-10;
+
+            // 判断是否接近整数
+            if (Math.Abs(number - Math.Round(number)) < tolerance)
+            {
+                return Math.Round(number).ToString();
+            }
+
+            double integerPart = Math.Truncate(number);
+            double fraction = number - integerPart;
+
+            // 检查小数部分是否超过一位
+            double firstDigit = Math.Truncate(fraction * 10);
+            double remainder = fraction * 10 - firstDigit;
+
+            if (Math.Abs(remainder) > tolerance)
+            {
+                return Math.Round(number, 1).ToString("0.0");
+            }
+            else
+            {
+                return integerPart.ToString();
+            }
+        }
     }
 }

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

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -61,6 +62,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.myHero.heroData.exp += elixirItemWidget.ItemConfig.associateVlaue[0];
                 AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount++;
                 AccountFileInfo.Instance.SavePlayerData();
+                AudioManager.Instance.PlayAudio("ui_shiyonghuode");
             }
             else
             {

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

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Core.Audio;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -91,6 +92,14 @@ namespace Fort23.Mono
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
             Slider_SmallJD.value = PlayerManager.Instance.CurrentsmallPlaces.completionEventCount;
+            SmallPlacesConfig smallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+
+            if (PlayerManager.Instance.CurrentsmallPlaces.completionEventCount ==
+                smallPlacesConfig.CompletionEventCount)
+            {
+                AudioManager.Instance.PlayAudio("ui_jinduwancheng");
+            }
         }
 
         public void UpdateDaoYouCoun()
@@ -164,8 +173,20 @@ namespace Fort23.Mono
                     PlayerGuideManager.Instance.NextGuide();
                 }
 
+
                 AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
                     e.guid == AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
+
+                EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                if (eventConfig.EventTriggerType == 4)
+                {
+                    if (eventList.isCompleted1)
+                    {
+                        EventSystemManager.Instance.CompleteEvent(eventList);
+                        return;
+                    }
+                }
+
                 if (eventList != null)
                 {
                     EventSystemManager.Instance.CancelEvent();