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

Assets/Res/Config/SkillPowerupConfig.json

@@ -12,7 +12,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 5
+      "PlayerLevelLimit": 6
     },
     {
       "ID": 2,
@@ -26,7 +26,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 10
+      "PlayerLevelLimit": 11
     },
     {
       "ID": 3,
@@ -40,7 +40,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 15
+      "PlayerLevelLimit": 16
     },
     {
       "ID": 4,
@@ -54,7 +54,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 20
+      "PlayerLevelLimit": 21
     },
     {
       "ID": 5,
@@ -68,7 +68,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 25
+      "PlayerLevelLimit": 26
     },
     {
       "ID": 6,
@@ -82,7 +82,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 30
+      "PlayerLevelLimit": 31
     },
     {
       "ID": 7,
@@ -96,7 +96,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 35
+      "PlayerLevelLimit": 36
     },
     {
       "ID": 8,
@@ -110,7 +110,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 40
+      "PlayerLevelLimit": 41
     },
     {
       "ID": 9,
@@ -124,7 +124,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 45
+      "PlayerLevelLimit": 46
     },
     {
       "ID": 10,
@@ -138,7 +138,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 50
+      "PlayerLevelLimit": 51
     },
     {
       "ID": 11,
@@ -152,7 +152,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 55
+      "PlayerLevelLimit": 56
     },
     {
       "ID": 12,
@@ -166,7 +166,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 60
+      "PlayerLevelLimit": 61
     },
     {
       "ID": 13,
@@ -180,7 +180,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 65
+      "PlayerLevelLimit": 66
     },
     {
       "ID": 14,
@@ -194,7 +194,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 70
+      "PlayerLevelLimit": 71
     },
     {
       "ID": 15,
@@ -208,7 +208,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 75
+      "PlayerLevelLimit": 76
     },
     {
       "ID": 16,
@@ -222,7 +222,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 80
+      "PlayerLevelLimit": 81
     },
     {
       "ID": 17,
@@ -236,7 +236,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 85
+      "PlayerLevelLimit": 86
     },
     {
       "ID": 18,
@@ -250,7 +250,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 90
+      "PlayerLevelLimit": 91
     },
     {
       "ID": 19,
@@ -264,7 +264,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 95
+      "PlayerLevelLimit": 96
     },
     {
       "ID": 20,
@@ -278,7 +278,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 100
+      "PlayerLevelLimit": 101
     },
     {
       "ID": 21,
@@ -292,7 +292,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 105
+      "PlayerLevelLimit": 106
     },
     {
       "ID": 22,
@@ -306,7 +306,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 110
+      "PlayerLevelLimit": 111
     },
     {
       "ID": 23,
@@ -320,7 +320,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 115
+      "PlayerLevelLimit": 116
     },
     {
       "ID": 24,
@@ -334,7 +334,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 120
+      "PlayerLevelLimit": 121
     },
     {
       "ID": 25,
@@ -348,7 +348,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 125
+      "PlayerLevelLimit": 126
     },
     {
       "ID": 26,
@@ -362,7 +362,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 130
+      "PlayerLevelLimit": 131
     },
     {
       "ID": 27,
@@ -376,7 +376,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 135
+      "PlayerLevelLimit": 136
     },
     {
       "ID": 28,
@@ -390,7 +390,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 140
+      "PlayerLevelLimit": 141
     },
     {
       "ID": 29,
@@ -404,7 +404,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 145
+      "PlayerLevelLimit": 146
     },
     {
       "ID": 30,
@@ -418,7 +418,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 150
+      "PlayerLevelLimit": 151
     },
     {
       "ID": 31,
@@ -432,7 +432,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 155
+      "PlayerLevelLimit": 156
     },
     {
       "ID": 32,
@@ -446,7 +446,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 160
+      "PlayerLevelLimit": 161
     },
     {
       "ID": 33,
@@ -460,7 +460,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 165
+      "PlayerLevelLimit": 166
     },
     {
       "ID": 34,
@@ -474,7 +474,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 170
+      "PlayerLevelLimit": 171
     },
     {
       "ID": 35,
@@ -488,7 +488,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 175
+      "PlayerLevelLimit": 176
     },
     {
       "ID": 36,
@@ -502,7 +502,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 180
+      "PlayerLevelLimit": 181
     },
     {
       "ID": 37,
@@ -516,7 +516,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 185
+      "PlayerLevelLimit": 186
     },
     {
       "ID": 38,
@@ -530,7 +530,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 190
+      "PlayerLevelLimit": 191
     },
     {
       "ID": 39,
@@ -544,7 +544,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 195
+      "PlayerLevelLimit": 196
     },
     {
       "ID": 40,
@@ -558,7 +558,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 200
+      "PlayerLevelLimit": 201
     },
     {
       "ID": 41,
@@ -572,7 +572,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 205
+      "PlayerLevelLimit": 206
     },
     {
       "ID": 42,
@@ -586,7 +586,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 210
+      "PlayerLevelLimit": 211
     },
     {
       "ID": 43,
@@ -600,7 +600,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 215
+      "PlayerLevelLimit": 216
     },
     {
       "ID": 44,
@@ -614,7 +614,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 220
+      "PlayerLevelLimit": 221
     },
     {
       "ID": 45,
@@ -628,7 +628,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 225
+      "PlayerLevelLimit": 226
     },
     {
       "ID": 46,
@@ -642,7 +642,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 230
+      "PlayerLevelLimit": 231
     },
     {
       "ID": 47,
@@ -656,7 +656,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 235
+      "PlayerLevelLimit": 236
     },
     {
       "ID": 48,
@@ -670,7 +670,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 240
+      "PlayerLevelLimit": 241
     },
     {
       "ID": 49,
@@ -684,7 +684,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 245
+      "PlayerLevelLimit": 246
     },
     {
       "ID": 50,
@@ -698,7 +698,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 250
+      "PlayerLevelLimit": 251
     },
     {
       "ID": 51,
@@ -712,7 +712,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 255
+      "PlayerLevelLimit": 256
     },
     {
       "ID": 52,
@@ -726,7 +726,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 260
+      "PlayerLevelLimit": 261
     },
     {
       "ID": 53,
@@ -740,7 +740,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 265
+      "PlayerLevelLimit": 266
     },
     {
       "ID": 54,
@@ -754,7 +754,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 270
+      "PlayerLevelLimit": 271
     },
     {
       "ID": 55,
@@ -768,7 +768,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 275
+      "PlayerLevelLimit": 276
     },
     {
       "ID": 56,
@@ -782,7 +782,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 280
+      "PlayerLevelLimit": 281
     },
     {
       "ID": 57,
@@ -796,7 +796,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 285
+      "PlayerLevelLimit": 286
     },
     {
       "ID": 58,
@@ -810,7 +810,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 290
+      "PlayerLevelLimit": 291
     },
     {
       "ID": 59,
@@ -824,7 +824,7 @@
         100,
         100
       ],
-      "PlayerLevelLimit": 295
+      "PlayerLevelLimit": 296
     },
     {
       "ID": 60,

Assets/Scripts/Core/AssetLoadTool/ReferenceCollector.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 //Object并非C#基础中的Object，而是 UnityEngine.Object
 using Object = UnityEngine.Object;
@@ -153,6 +154,23 @@ namespace Fort23.Mono
             {
                 return null;
             }
+            
+        
+            if (typeof(T).IsGenericType && typeof(T).GetGenericTypeDefinition() == typeof(List<>))
+            {
+          
+                if (dictGo is IEnumerable<object> enumerable)
+                {
+                 
+                    Type elementType = typeof(T).GetGenericArguments()[0];
+              
+                    var method = typeof(Enumerable).GetMethod(nameof(Enumerable.OfType)).MakeGenericMethod(elementType);
+                    var result = method.Invoke(null, new[] { enumerable });
+                
+                    var toListMethod = typeof(Enumerable).GetMethod(nameof(Enumerable.ToList)).MakeGenericMethod(elementType);
+                    return toListMethod.Invoke(null, new[] { result }) as T;
+                }
+            }
 
             return dictGo as T;
         }

Assets/Scripts/Core/Editor/FortRectTransformInspector.cs

@@ -318,7 +318,12 @@ public class FortRectTransformInspector : UnityEditor.Editor
                     }
                     else
                     {
-                        AllTypeDictionary.Add(keyValuePair.key, "List<object>");
+                        Object o = keyValuePair.gameObject;
+                        if (keyValuePair.ListCollectorDatas.Count > 0)
+                        {
+                            o = keyValuePair.ListCollectorDatas[0].gameObject;
+                        }
+                        AllTypeDictionary.Add(keyValuePair.key, $"List<{o.GetType().Name}>");
                     }
                 }
                 catch (Exception e)

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -64,7 +64,7 @@ namespace GameLogic.Hero
             //计算加得属性
             for (var i = 0; i < FabaoConfig.ShuxingIDs?.Length; i++)
             {
-                long attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
+                float attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
                 long value = (long)(attribute * FabaoConfig.ShuxingPara[0] * 0.01f);
                 attriButedIC.Add(FabaoConfig.ShuxingIDs[i], value);
             }
@@ -96,7 +96,7 @@ namespace GameLogic.Hero
             //计算加得属性
             for (var i = 0; i < FabaoConfig.ShuxingIDs.Length; i++)
             {
-                long attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
+                float attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
                 long value = (long)(attribute * FabaoConfig.ShuxingPara[0] * 0.01f);
                 attriButedIC.Add(FabaoConfig.ShuxingIDs[i], value);
             }
@@ -104,16 +104,16 @@ namespace GameLogic.Hero
             qiangDu = (long)(FabaoPowerupConfig.Power * SkillConfig.power * 0.01f);
         }
 
-        private long GetAttriBute(int type)
+        private float GetAttriBute(int type)
         {
             switch (type)
             {
                 case 1:
                     return FabaoPowerupConfig.HP;
                 case 2:
-                    return FabaoPowerupConfig.HP;
+                    return FabaoPowerupConfig.DEF;
                 case 3:
-                    return FabaoPowerupConfig.HP;
+                    return FabaoPowerupConfig.ATK;
             }
 
             return 0;

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

@@ -63,13 +63,13 @@ namespace Fort23.Mono
 	      return _Text_SkillType;
 	     }
 	   }
-	  private List<object> _StarRoot;
-	  public List<object> StarRoot
+	  private List<MyImage> _StarRoot;
+	  public List<MyImage> StarRoot
 	   {
 	   get{
 	      if (_StarRoot == null)
 	       {
-	         _StarRoot  = GetUIUnit<List<object>>("StarRoot"); 
+	         _StarRoot  = GetUIUnit<List<MyImage>>("StarRoot"); 
 	       }
 	      return _StarRoot;
 	     }

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

@@ -8,13 +8,13 @@ namespace Fort23.Mono
 	public partial class GongFaUpgradeInfoWidget 
 	{
 	  #region 自定义数据 
-	  private List<object> _StarRoot;
-	  public List<object> StarRoot
+	  private List<MyImage> _StarRoot;
+	  public List<MyImage> StarRoot
 	   {
 	   get{
 	      if (_StarRoot == null)
 	       {
-	         _StarRoot  = GetUIUnit<List<object>>("StarRoot"); 
+	         _StarRoot  = GetUIUnit<List<MyImage>>("StarRoot"); 
 	       }
 	      return _StarRoot;
 	     }