红点系统开发完了

Assets/Res/Config/ReddotConfig.json

@@ -5,16 +5,14 @@
       "GroupID": 1,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 2,
       "GroupID": 2,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 3,
@@ -24,8 +22,7 @@
       ],
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 4,
@@ -35,16 +32,14 @@
       ],
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 5,
       "GroupID": 5,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 6,
@@ -54,40 +49,42 @@
       ],
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 7,
       "GroupID": 7,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 8,
       "GroupID": 8,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 9,
       "GroupID": 9,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
     },
     {
       "ID": 10,
       "GroupID": 10,
       "EnableForTarget": 0,
       "Layer": 1,
-      "Enable": 1,
-      "Visible": 1
+      "Enable": 1
+    },
+    {
+      "ID": 11,
+      "GroupID": 11,
+      "EnableForTarget": 0,
+      "Layer": 1,
+      "Enable": 1
     }
   ]
 }

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -5023,6 +5023,7 @@ RectTransform:
   - {fileID: 7010060999649652918}
   - {fileID: 2746599210475832131}
   - {fileID: 834936776012228567}
+  - {fileID: 8829624925637676148}
   m_Father: {fileID: 8996942401071482941}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -5540,3 +5541,117 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
   m_PrefabInstance: {fileID: 3047479565199459817}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6627376154938399120
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2649770366393766819}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 118.29999
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -10.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5697877519372400105, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -117.4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &8829624925637676148 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 6627376154938399120}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -5494,10 +5494,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
       propertyPath: m_Name
       value: RedDotCom
       objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -2551,6 +2551,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2600768613877549426}
+  - {fileID: 7516399728549801853}
   - {fileID: 7521488877864715437}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4441,3 +4442,113 @@ MonoBehaviour:
     isList: 0
     ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!1001 &5278104223100402329
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 780639185781582059}
+    m_Modifications:
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Pivot.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.9634461
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -7.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -7.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2789586574518551789, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3073202858500431554, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: m_Name
+      value: RedDotCom
+      objectReference: {fileID: 0}
+    - target: {fileID: 4409762847385456447, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+      propertyPath: RedDotConfigId
+      value: 11
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+--- !u!224 &7516399728549801853 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
+  m_PrefabInstance: {fileID: 5278104223100402329}
+  m_PrefabAsset: {fileID: 0}

Assets/Scripts/GameData/ExcelConfig/ReddotConfig.cs

@@ -74,16 +74,6 @@ namespace Excel2Json
 #endif
 		
 
-		/// <summary>
-		///是否点了暂时消失
-		/// </summary>
-#if !COMBAT_SERVER
-		public int Visible;
-#else
-		public int Visible{ set; get; }
-#endif
-		
-
 	}
 
 }

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -141,6 +141,11 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 领取挂机每日掉落时间
         /// </summary>
         public long QiankundaiLingQuDailyDropTime;
+        
+        /// <summary>
+        /// 乾坤袋领取时间
+        /// </summary>
+        public long QiankundaiLingQuAwardTime;
 
         public long ExitTime;
         public bool boxFree;

Assets/Scripts/GameLogic/RedDot/RedDotData.cs

@@ -45,6 +45,7 @@ namespace Fort23.Mono
             switch (GroupId)
             {
                 case 1:
+                    isEnable = false;
                     switch (EnableId) //具体出现条件
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
@@ -54,38 +55,19 @@ namespace Fort23.Mono
                             var _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>();
                             foreach (var _skillInfo in PlayerManager.Instance.GongFaControl.allSkill)
                             {
-                                if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Length)
+                                if (RedDotManager.Instance.isSkillUpgrade(_skillInfo))
                                 {
-                                    isEnable = false;
-                                    return;
-                                }
-
-                                if (PlayerManager.Instance.myHero.level.Value <
-                                    _skillInfo.SkillPowerupConfig.PlayerLevelLimit)
-                                {
-                                    isEnable = false;
+                                    isEnable = true;
                                     return;
                                 }
-
-                                for (var i = 0; i < _skillInfo.SkillPowerupConfig.LevelupItem.Length; i++)
-                                {
-                                    if (!PlayerManager.Instance.BagController.IsEnough(
-                                            _skillInfo.SkillPowerupConfig.LevelupItem[i],
-                                            _skillInfo.SkillPowerupConfig.LevelupItemNum[i]))
-                                    {
-                                        isEnable = false;
-                                        return;
-                                    }
-                                }
                             }
 
-                            isEnable = true;
                             break;
                     }
 
                     break;
                 case 5: //具体组
-
+                    isEnable = false;
                     switch (EnableId) //具体出现条件
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
@@ -110,7 +92,7 @@ namespace Fort23.Mono
 
                     break;
                 case 7: //具体组
-
+                    isEnable = false;
                     switch (EnableId) //具体出现条件
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
@@ -135,6 +117,7 @@ namespace Fort23.Mono
                     break;
 
                 case 8: //具体组
+                    isEnable = false;
                     switch (EnableId) //具体出现条件
                     {
                         case 0: //没有自己的红点逻辑根据下层红点来决定
@@ -154,6 +137,32 @@ namespace Fort23.Mono
                             break;
                     }
 
+                    break;
+
+                case 11: //具体组
+                    isEnable = false;
+                    switch (EnableId) //具体出现条件
+                    {
+                        case 0: //没有自己的红点逻辑根据下层红点来决定
+                            isEnable = RedDotManager.Instance.AllRedDotGroupData[GroupId].TargetLayerIsEnable(Layer);
+                            break;
+                        case 1:
+                            if (AccountFileInfo.Instance.playerData.QiankundaiLingQuAwardTime == 0)
+                            {
+                                isEnable = true;
+                                return;
+                            }
+
+                            int miao = (int)((PlayerManager.Instance.serverTime -
+                                              AccountFileInfo.Instance.playerData.QiankundaiLingQuAwardTime) / 1000);
+                            if (miao >= 300)
+                            {
+                                isEnable = true;
+                            }
+
+                            break;
+                    }
+
                     break;
             }
         }

Assets/Scripts/GameUI/UI/QiankundaiPanel/QiankundaiPanel.cs

@@ -65,6 +65,7 @@ namespace Fort23.Mono
                 }
 
                 AccountFileInfo.Instance.playerData.QiankundaiDropTimer = 0;
+                AccountFileInfo.Instance.playerData.QiankundaiLingQuAwardTime = TimeHelper.ClientNow();
                 AccountFileInfo.Instance.playerData.QiankundaiItemDatas.Clear();
                 AccountFileInfo.Instance.playerData.QiankundaiLingQuDailyDropTime =
                     TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());

Assets/Scripts/GameUI/UI/RedDot/RedDotWidget.cs

@@ -61,7 +61,7 @@ public class RedDotWidget : MonoBehaviour
         {
             if (eventData[1] == 0)
             {
-                if (reddotConfig.Visible == 1)
+                // if (reddotConfig.Visible == 1)
                 {
                     RedDotRoot.SetActive(false);
                 }