修改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.3
+    - _MainTexOffsetV: -0.044610858
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Res/UI/ShowItemMoveToTargetPanel.prefab

@@ -268,6 +268,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: 73bfe54518876535550be496297154c4
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -356,6 +357,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
     packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
     lasetJsonGUID: 73bfe54518876535550be496297154c4
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scripts/GameUI/GameApplction.cs

@@ -118,13 +118,6 @@ public class GameApplction : IGameStart
 
         EventSystemManager.Instance.CustomInit();
         PlayerManager.Instance.Init();
-        // SkillConfig[] skillConfigs= ConfigComponent.Instance.GetAll<SkillConfig>();
-        // for (int i = 0; i < skillConfigs.Length; i++)
-        // {
-        //     SkillInfo skillInfo = new SkillInfo(skillConfigs[i].ID, 1);
-        //     skillInfo.index = -1;
-        //     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
-        // }
         await ShowItemMoveToTargetPanel.OpenShowItemMoveToTargetPanel();
         PlayerManager.Instance.AddSentimentData(1);
         foreach (var playerDataAllSkillData in AccountFileInfo.Instance.playerData.AllSkillDatas)

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

@@ -33,7 +33,10 @@ namespace Fort23.Mono
             EventSystemManager.Instance.CancelEvent();
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-            // UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
+
+            if (eventList.isCompleted)
+                return;
+
             EventSystemManager.Instance.TriggerEvent(eventList);
         }
 

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

@@ -191,13 +191,17 @@ namespace Fort23.Mono
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
 
+            if (shengShiEventWidgetType2.eventList.isCompleted)
+            {
+                return;
+            }
+
             isTriggerEvent = true;
-            //this.GObjectPoolInterface.SetActive(false);
-            // EventSystemManager.Instance.isOpenUi = false;
+          
 
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
-                //this.GObjectPoolInterface.SetActive(true);
+             
                 isTriggerEvent = false;
                 UpdateContent();
             });
@@ -208,7 +212,8 @@ namespace Fort23.Mono
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
 
-            if (shengShiEventWidgetType2.isComplete)
+            //条件完成 任务没有完成 是最后一步就直接开始任务
+            if (shengShiEventWidgetType2.isComplete && !shengShiEventWidgetType2.eventList.isCompleted)
             {
                 if (shengShiEventWidgetType2.evenkConfig.ResultType == 0 || shengShiEventWidgetType2.evenkConfig.ResultType == 3)
                 {

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

@@ -68,7 +68,7 @@ namespace Fort23.Mono
 
         private void UpdateZuiZhongEvent(IEventData e)
         {
-            // if(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
+          
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId != eventList.guid);
 
             ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
@@ -141,12 +141,6 @@ namespace Fort23.Mono
                     {
                         Text_Go.text = "完成";
                     }
-                    // else
-                    // {
-                    //     Text_Go.text = "前往";
-                    // }
-                    
-                    
                 }
                 else
                 {

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

@@ -84,7 +84,7 @@ namespace Fort23.Mono
 
         private void ChagneShenshiBtnActive()
         {
-            Btn_Event.gameObject.SetActive(AccountFileInfo.Instance.playerData.eventList.Count > 0);
+            // Btn_Event.gameObject.SetActive(event > 0);
         }
 
         protected override void DelEvent()
@@ -154,7 +154,7 @@ namespace Fort23.Mono
             CameraSelect.value = 0.2f;
 
 
-            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
             Text_Jingjie.text =
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                 LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
@@ -191,16 +191,14 @@ namespace Fort23.Mono
 
         private void ShengShiOnClick(IEventData e)
         {
-            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            Text_EventNum.text =EventSystemManager.Instance.GetShenShiCount().ToString();
             ChagneShenshiBtnActive();
             CreatShengShiEvent();
         }
 
         public async void CreatShengShiEvent()
         {
-            // AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-            // if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
-            //     eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
+        
             foreach (var shengShiConditionWidget in _shengShiConditionWidgets)
             {
                 UIManager.Instance.DormancyGComponent(shengShiConditionWidget);
@@ -218,7 +216,6 @@ namespace Fort23.Mono
                 }
 
                 shengShiEventWidget.InitShengShiEventWidget(eventList);
-                // EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
 
                 AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
 

Assets/Scripts/GameUI/UI/ShowItemMoveToTargetPanel/ShowItemMoveToTargetPanel.cs

@@ -3,10 +3,6 @@ using CombatLibrary.CombatLibrary.CombatCore.Utility;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
 using Fort23.UTool;
-using GameLogic.Bag;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.CombatType;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UnityEngine.UI;
 using Utility.UITool;
@@ -23,7 +19,7 @@ namespace Fort23.Mono
         public static async CTask<ShowItemMoveToTargetPanel> OpenShowItemMoveToTargetPanel()
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Bottom,
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Loading,
                     isFocus: false);
             return showItemMoveToTargetPanel;
         }
@@ -32,7 +28,6 @@ namespace Fort23.Mono
         {
             await base.Show();
             Ui.sizeDelta = transform.sizeDelta;
-            // Combat.sizeDelta =  transform.sizeDelta;
         }
 
 

ProjectSettings/GraphicsSettings.asset

@@ -63,7 +63,7 @@ GraphicsSettings:
   m_FogKeepExp2: 1
   m_AlbedoSwatchInfos: []
   m_ModelImportDefaultMaterial: {fileID: 0}
-  m_LightsUseLinearIntensity: 1
+  m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 1
   m_DefaultRenderingLayerMask: 1
   m_LogWhenShaderIsCompiled: 0

ProjectSettings/ProjectSettings.asset

@@ -49,7 +49,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 1
+  m_ActiveColorSpace: 0
   unsupportedMSAAFallback: 0
   m_SpriteBatchVertexThreshold: 300
   m_MTRendering: 1