Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

Assets/Res/UI/DivineSence/EventTipsPanel.prefab

@@ -759,7 +759,6 @@ GameObject:
   - component: {fileID: 2618842243334602427}
   - component: {fileID: 6140569329782375919}
   - component: {fileID: 8062343385206969078}
-  - component: {fileID: 2524634468106264735}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -829,19 +828,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u25C6"
---- !u!114 &2524634468106264735
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5014351108332961964}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  id: 10258
 --- !u!1 &6433875597589258302
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -5828,7 +5828,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 775948486671169824, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_Enabled
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 775948486671169824, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_SortingLayer
@@ -5840,7 +5840,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2849248009424179347, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_Enabled
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2849248009424179347, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_SortingLayer
@@ -5880,15 +5880,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5944,7 +5944,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5480339610297055522, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -123,7 +123,7 @@ MonoBehaviour:
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_tiaozheng
-  isNotLoadDeftIcon: 1
+  isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
     packName: gongfa

Assets/Scripts/GameLogic/RedDot/RedDotManager.cs

@@ -335,7 +335,7 @@ public class RedDotManager : Singleton<RedDotManager>
         List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
         var configs = allSkillConfigs.Where(s => s.IDGroup == _skillInfo.skillConfig.IDGroup).ToList();
 
-        if (_skillInfo.SkillData.level > configs.Count)
+        if (_skillInfo.SkillData.star >= configs.Count)
         {
             return false;
         }

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

@@ -50,7 +50,8 @@ namespace Fort23.Mono
             Text_TiaoJian.text = desc;
             foreach (var eventConditionData in eventLinkData.eventConditions)
             {
-                EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+                EventConditionConfig eventConditionConfig =
+                    ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
                 foreach (var skiptoId in eventConditionConfig.SkiptoIds)
                 {
                     SkipToWidget skipToWidget = await UIManager.Instance.CreateGComponent<SkipToWidget>(null, Content);
@@ -64,18 +65,19 @@ namespace Fort23.Mono
             return await base.AsyncInit(uiData);
         }
 
-        private void OnClick(ItemWidgetBasic obj)
+        private async void OnClick(ItemWidgetBasic obj)
         {
             SkipToWidget skipToWidget = obj as SkipToWidget;
             isSkipto = true;
-            UIManager.Instance.HideUIUIPanel(this);
+            await UIManager.Instance.HideUIUIPanel(this);
             SkiptoHelper.Skipto(skipToWidget.SkiptoConfig.ID);
         }
 
         public static async CTask<bool> OpenPanel(AccountFileInfo.EventLinkData eventLinkData)
         {
             CTask<bool> callBack = CTask<bool>.Create();
-            await UIManager.Instance.LoadAndOpenPanel<EventTipsPanel>(null, UILayer.Top, uiData: new object[] { eventLinkData, callBack },isShowBG:true);
+            await UIManager.Instance.LoadAndOpenPanel<EventTipsPanel>(null, UILayer.Top,
+                uiData: new object[] { eventLinkData, callBack }, isShowBG: true);
             return await callBack;
         }