修改配置表

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -904,6 +904,95 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5"
+--- !u!1 &1693697974241859946
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7366721648260446241}
+  - component: {fileID: 7344172054180224780}
+  - component: {fileID: 4796918203142177971}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: MenuRoot (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7366721648260446241
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693697974241859946}
+  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: 909808399738442487}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -489.4226}
+  m_SizeDelta: {x: 0, y: -978.8452}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7344172054180224780
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693697974241859946}
+  m_CullTransparentMesh: 1
+--- !u!114 &4796918203142177971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1693697974241859946}
+  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: 0.9058824, g: 0.882353, b: 0.82745105, 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: dec_juxing_fang
+  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: 129d2dfcaa346e2c98412e94b22ff390
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1695594006432185856
 GameObject:
   m_ObjectHideFlags: 0
@@ -2944,6 +3033,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7366721648260446241}
   - {fileID: 7683181027623438140}
   - {fileID: 125996766480416986}
   - {fileID: 8155081321350717393}
@@ -2975,7 +3065,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/DaoYouPanel/DaoYouGuaJiAwardPanel.prefab

@@ -979,7 +979,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 127860418657924685}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/DaoYouPanel/DaoYouGuaJiPanel.prefab

@@ -1298,7 +1298,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 127860418657924685}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Res/UI/DivineSence/DivineSenceInfoPanel.prefab

@@ -3032,9 +3032,9 @@ MonoBehaviour:
   m_HandleRect: {fileID: 8533921185249700406}
   m_Direction: 0
   m_MinValue: 0
-  m_MaxValue: 10
+  m_MaxValue: 1
   m_WholeNumbers: 1
-  m_Value: 0
+  m_Value: 1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []

Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 9038909209650068214}
   - component: {fileID: 8716106857723075353}
   - component: {fileID: 3325575368469019477}
-  - component: {fileID: 6442938463589831810}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Btn_XaiXuan (1)
@@ -19,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &9038909209650068214
 RectTransform:
   m_ObjectHideFlags: 0
@@ -32,11 +31,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 1383581214779233778}
   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: 342.9, y: -646.6}
+  m_AnchoredPosition: {x: -12.399933, y: -3.7}
   m_SizeDelta: {x: 49, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8716106857723075353
@@ -61,7 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -84,56 +83,12 @@ MonoBehaviour:
     packName: tongyong
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+    lasetJsonGUID: 7d981d434f811102ccce93d38d2b1655
   imageH: 40
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!114 &6442938463589831810
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 236905249494988002}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 3325575368469019477}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &248163569904149107
 GameObject:
   m_ObjectHideFlags: 0
@@ -319,7 +274,6 @@ RectTransform:
   - {fileID: 1239183305622828816}
   - {fileID: 5859352838166277486}
   - {fileID: 1383581214779233778}
-  - {fileID: 9038909209650068214}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -861,13 +815,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 9038909209650068214}
   m_Father: {fileID: 8599819629026832582}
   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: 342.9, y: -646.6}
-  m_SizeDelta: {x: 49, y: 49}
+  m_AnchoredPosition: {x: 355.3, y: -641.3}
+  m_SizeDelta: {x: 127.2488, y: 82.6573}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9001316625549913926
 CanvasRenderer:
@@ -890,7 +845,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.40000004, g: 0.5137255, b: 0.5058824, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -907,7 +862,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_ty_shaixuan
+  _icon_name: dec_ty_juxing_dahu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -132,6 +132,9 @@ namespace GameLogic.Bag
         public bool AddItem(int itemId, long count, string guid = "")
         {
             string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
+            
+            if(count <= 0)
+                return false;
 
             ItemInfo item = GetItemInfo(itemId, guidStr);
             return AddItemCount(item, count);
@@ -175,6 +178,8 @@ namespace GameLogic.Bag
                 return false;
             }
 
+            if( count <= 0 )
+                return false;
             item.count += count;
 
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -140,6 +140,8 @@ public class PlayerManager : Singleton<PlayerManager>
         AccountFileInfo.Instance.SavePlayerData();
     }
 
+    List<AccountFileInfo.DaoYouData> removerDaoYou = new List<AccountFileInfo.DaoYouData>();
+
     public void RandownDaoYou(int m)
     {
         _timerEntity?.Dispose();
@@ -148,15 +150,33 @@ public class PlayerManager : Singleton<PlayerManager>
         {
             List<AccountFileInfo.DaoYouData> daoYouDatas = AccountFileInfo.Instance.playerData.daoYouDatas.ToList();
 
-            foreach (var keyValuePair in AccountFileInfo.Instance.playerData.daoYouGuaiJiDatas)
+            foreach (var daoYouData in daoYouDatas)
             {
-                AccountFileInfo.DaoYouData daoYouData = daoYouDatas.FirstOrDefault(d => d.id == keyValuePair.daoyouDataID);
-                if (daoYouData != null && daoYouData.favorabilityLv > 1)
+                if (daoYouData.favorabilityLv <= 1)
+                {
+                    removerDaoYou.Add(daoYouData);
+
+                    continue;
+                }
+
+                foreach (var keyValuePair in AccountFileInfo.Instance.playerData.daoYouGuaiJiDatas)
                 {
-                    daoYouDatas.Remove(daoYouData);
+                    if (daoYouData.id == keyValuePair.daoyouDataID)
+                    {
+                        removerDaoYou.Add(daoYouData);
+                        break;
+                    }
                 }
             }
 
+            foreach (var daoYouData in removerDaoYou)
+            {
+                daoYouDatas.Remove(daoYouData);
+            }
+
+            removerDaoYou.Clear();
+
+
             int count = Random.Range(0, daoYouDatas.Count + 1);
             List<AccountFileInfo.DaoYouGuaiJiData> daoyou = new List<AccountFileInfo.DaoYouGuaiJiData>();
             for (int i = 0; i < count; i++)

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

@@ -60,16 +60,7 @@ namespace Fort23.Mono
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
-            Slider_Count.onValueChanged.AddListener((c) =>
-            {
-                useCount = (int)c;
-                Text_Count.text = $"神识探索：{c}次";
-                Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()} + {c}/{maxCount})";
-                foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
-                {
-                    senceInfoBtnWidget.UpdateItermCount(useCount);
-                }
-            });
+            Slider_Count.onValueChanged.AddListener((c) => { Slider_Count_OnValueChanged(c); });
 
             Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
 
@@ -77,6 +68,17 @@ namespace Fort23.Mono
             Btn_Event.onClick.AddListener(() => { DivineSenceEventPreviewPanel.OpenPanel(); });
         }
 
+        private void Slider_Count_OnValueChanged(float value)
+        {
+            useCount = (int)value;
+            Text_Count.text = $"神识探索：{value}次";
+            Text_shenshishangxian.text = $"({EventSystemManager.Instance.GetShenShiCount()}<color=green>+{value}</color>/{maxCount})";
+            foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
+            {
+                senceInfoBtnWidget.UpdateItermCount(useCount);
+            }
+        }
+
         public async void CustomInit(Action<int, List<ItemInfo>> callback)
         {
             _divineSenceInfoBtnWidgets.Clear();
@@ -92,9 +94,24 @@ namespace Fort23.Mono
             maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
             maxCount = maxCount > 10 ? 10 : maxCount;
             count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount ? maxCount - EventSystemManager.Instance.GetShenShiCount() : count;
-            Slider_Count.maxValue = count;
-            Slider_Count.minValue = 1;
-            Slider_Count.value = count;
+
+
+            if (count == 1)
+            {
+                Slider_Count.minValue = 0;
+                Slider_Count.maxValue = count;
+                Slider_Count.value = count;
+                Slider_Count.interactable = false;
+            }
+            else
+            {
+                Slider_Count.minValue = 1;
+                Slider_Count.maxValue = count;
+                Slider_Count.value = count;
+                Slider_Count.interactable = true;
+            }
+
+            Slider_Count_OnValueChanged(count);
 
             List<float> probabilities = UtilTools.CalculateProbabilities(divineSenseConfig.QualityBonusChance.ToList());
 
@@ -133,7 +150,8 @@ namespace Fort23.Mono
                     selectType.Add(senceInfoBtnWidget.ItemInfo.config.associateID);
                 }
             }
-            DivineSenceItemPanel.OpenPanel(divineSenceInfoBtnWidget.ItemInfo,selectType, (id) =>
+
+            DivineSenceItemPanel.OpenPanel(divineSenceInfoBtnWidget.ItemInfo, selectType, (id) =>
                 {
                     divineSenceInfoBtnWidget.CustomInit(id, divineSenceInfoBtnWidget.type);
                     UpdateBl();

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

@@ -50,7 +50,7 @@ namespace Fort23.Mono
 
         private void RemoveEvent(IEventData e)
         {
-            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
         }
@@ -58,7 +58,7 @@ namespace Fort23.Mono
         private void CompleteEvent(IEventData e)
         {
             ChangeMap(null);
-            Text_EventNum.text = AccountFileInfo.Instance.playerData.eventList.Count.ToString();
+            Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
         }