表格重构

Assets/Scripts/Generate/Config/FishConfig.cs

@@ -5,93 +5,15 @@ using System.Linq;
 using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
-#if FANTASY_NET
-using Fantasy.ConfigTable;
-using Fantasy.Serialize;
-#else 
 using NBC;
 using NBC.Serialize;
-#endif
-// ReSharper disable CollectionNeverUpdated.Global
-// ReSharper disable UnusedAutoPropertyAccessor.Global
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-#pragma warning disable CS0169
-#pragma warning disable CS8618
-#pragma warning disable CS8625
-#pragma warning disable CS8603
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class FishConfigData : ASerialize, IConfigTable, IProto
+    public sealed partial class FishConfig : ASerialize, IProto, IConfigTable
     {
-        [ProtoMember(1)]
-        public List<FishConfig> List { get; set; } = new List<FishConfig>();
-#if FANTASY_NET
-        [ProtoIgnore]
-        private readonly ConcurrentDictionary<uint, FishConfig> _configs = new ConcurrentDictionary<uint, FishConfig>();
-#else 
-        [ProtoIgnore]
-        private readonly Dictionary<uint, FishConfig> _configs = new Dictionary<uint, FishConfig>();
-#endif
-        private static FishConfigData _instance = null;
-
-        public static FishConfigData Instance
-        {
-            get { return _instance ??= ConfigTableHelper.Load<FishConfigData>(); } 
-            private set => _instance = value;
-        }
-
-        public FishConfig Get(uint id, bool check = true)
-        {
-            if (_configs.ContainsKey(id))
-            {
-                return _configs[id];
-            }
     
-            if (check)
-            {
-                throw new Exception($"FishConfig not find {id} Id");
-            }
-            
-            return null;
-        }
-        public bool TryGet(uint id, out FishConfig config)
-        {
-            config = null;
-            
-            if (!_configs.ContainsKey(id))
-            {
-                return false;
-            }
-                
-            config = _configs[id];
-            return true;
-        }
-        public override void AfterDeserialization()
-        {
-            foreach (var config in List)
-            {
-#if FANTASY_NET
-                _configs.TryAdd(config.Id, config);
-#else
-                _configs.Add(config.Id, config);
-#endif
-                config.AfterDeserialization();
-            }
-    
-            EndInit();
-        }
-        
-        public override void Dispose()
-        {
-            Instance = null;
-        }
-    }
-    
-    [ProtoContract]
-    public sealed partial class FishConfig : ASerialize, IProto
-    {
 		[ProtoMember(1)]
 		public uint Id { get; set; } // Id
 		[ProtoMember(2)]
@@ -106,5 +28,66 @@ namespace NBF
 		public uint MaxWeight { get; set; } // 最大重量(克)
 		[ProtoMember(7)]
 		public uint Accept { get; set; } // 接受饵  
-    } 
-}  
+        [ProtoIgnore]
+        public uint Key => Id;
+        
+        #region Static
+        
+        private static ConfigContext<FishConfig> Context => ConfigTableHelper.Table<FishConfig>();
+
+        public static FishConfig Get(uint key)
+        {
+            return Context.Get(key);
+        }
+
+        public static FishConfig Get(Predicate<FishConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static FishConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static FishConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static FishConfig Fist(Predicate<FishConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static FishConfig Last(Predicate<FishConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<FishConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+        public static List<FishConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<FishConfig> GetList(Predicate<FishConfig> match)
+        {
+            return Context.GetList(match);
+        }
+        public static void ParseJson(Newtonsoft.Json.Linq.JArray arr)
+        {
+            ConfigTableHelper.ParseLine<FishConfig>(arr);
+        }
+        #endregion
+    }
+}