EGFramework.csproj

@@ -16,7 +16,5 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
     <PackageReference Include="LiteDB" Version="5.0.21" />
     <PackageReference Include="BACnet" Version="2.0.4" />
-    <PackageReference Include="MySql.Data" Version="9.1.0" />
-    <PackageReference Include="Dapper" Version="2.1.35" />
   </ItemGroup>
 </Project>

Example/SystemExamples/PlayerStorage/Script/DataStorageItem.cs

@@ -28,7 +28,7 @@ namespace EGFramework.Example.SystemExamples.PlayerStorage
             throw new NotImplementedException();
         }
 
-        public string GetItemName()
+        public string GetName()
         {
             throw new NotImplementedException();
         }

Example/SystemExamples/PlayerStorage/Script/InterfaceStorage.cs

@@ -9,7 +9,7 @@ namespace EGFramework.Example.SystemExamples.PlayerStorage
     public interface IItem
     {
         public int GetItemId();
-        public string GetItemName();
+        public string GetName();
         public Texture GetIcon();
         public string GetInfo();   
     }

Example/UsingTest/Script/EGSaveTest.cs

@@ -1,33 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Godot;
 using LiteDB;
 
 namespace EGFramework.Examples.Test{
     public partial class EGSaveTest : Node,IEGFramework
     {
-        public Label Label { set; get; }
+    public override void _Ready()
-        public override void _Ready()
+    {
-        {
+        base._Ready();
-            this.Label = this.GetNode<Label>("Label");
+        TestCode();
-            this.EGEnabledThread();
+    }
-            this.ExecuteAfterSecond(TestMainThreadFunc,2.0f);
-            //base._Ready();
-            //TestCode();
-        }
-
-        public async void TestThread(){
-            await Task.Run(()=>{
-                //this.ExecuteInMainThread(TestMainThreadFunc);
-                this.ExecuteAfterSecond(TestMainThreadFunc,2.0f);
-            });
-        }
-
-        public void TestMainThreadFunc(){
-            this.Label.Text = "Thread Test";
-            GD.Print("Invoked!");
-        }
 
         public void TestSqlite(){
             // string result = this.EGSqlite().CreateTable<SqliteBackpackItem>();

Font/SourceHanSansCN-Regular.otf.import

@@ -15,7 +15,6 @@ dest_files=["res://.godot/imported/SourceHanSansCN-Regular.otf-a74baadd242fcbfb4
 Rendering=null
 antialiasing=1
 generate_mipmaps=false
-disable_embedded_bitmaps=true
 multichannel_signed_distance_field=false
 msdf_pixel_range=8
 msdf_size=48

addons/EGFramework/EGFramework.cs

@@ -165,16 +165,19 @@ namespace EGFramework
 	public struct CustomUnRegister : IUnRegister
 	{
 		/// <summary>
-		/// delegate object 
+		/// 委托对象
 		/// </summary>
 		private Action OnUnRegister { get; set; }
-
+		/// <summary>
+		/// 带参构造函数
+		/// </summary>
+		/// <param name="onDispose"></param>
 		public CustomUnRegister(Action onUnRegister)
 		{
 			OnUnRegister = onUnRegister;
 		}
 		/// <summary>
-		/// release by parent;
+		/// 资源释放
 		/// </summary>
 		public void UnRegister()
 		{

addons/EGFramework/License_Third_Part/QFramework/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 凉鞋
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

addons/EGFramework/Module/EGEvent.cs

@@ -42,7 +42,7 @@ namespace EGFramework
 		}
     }
 	
-	public class EasyEvents
+    public class EasyEvents
 	{
 		private static EasyEvents GlobalEvents = new EasyEvents();
 		public static T Get<T>() where T : IEasyEvent
@@ -79,67 +79,7 @@ namespace EGFramework
 			return t;
 		}
 	}
-
+    
-	/// <summary>
-	/// This EasyEvent will release all registered function while invoked.
-	/// </summary>
-	/// <typeparam name="T"></typeparam>
-	public class EasyEventOnce<T> : IEasyEvent
-	{
-		private Action<T> OnEvent = e => { };
-		private List<CustomUnRegister> AutoUnRegister = new List<CustomUnRegister>();
-		public IUnRegister Register(Action<T> onEvent)
-		{
-			OnEvent += onEvent;
-			CustomUnRegister unRegister = new CustomUnRegister(() => { UnRegister(onEvent); });
-			AutoUnRegister.Add(unRegister);
-			return unRegister;
-		}
-		public void UnRegister(Action<T> onEvent)
-		{
-			OnEvent -= onEvent;
-		}
-		public void Invoke(T t)
-		{
-			if(AutoUnRegister.Count>0){
-				OnEvent?.Invoke(t);
-				foreach(CustomUnRegister unRegister in AutoUnRegister){
-					unRegister.UnRegister();
-				}
-				AutoUnRegister.Clear();
-			}
-		}
-	}
-
-	/// <summary>
-	/// This EasyEvent will release all registered function while invoked.
-	/// </summary>
-	public class EasyEventOnce : IEasyEvent{
-		private Action OnEvent = () => { };
-		private List<CustomUnRegister> AutoUnRegister = new List<CustomUnRegister>();
-		public IUnRegister Register(Action onEvent)
-		{
-			OnEvent += onEvent;
-			CustomUnRegister unRegister = new CustomUnRegister(() => { UnRegister(onEvent); });
-			AutoUnRegister.Add(unRegister);
-			return unRegister;
-		}
-		public void UnRegister(Action onEvent)
-		{
-			OnEvent -= onEvent;
-		}
-		public void Invoke()
-		{
-			if(AutoUnRegister.Count>0){
-				OnEvent?.Invoke();
-				foreach(CustomUnRegister unRegister in AutoUnRegister){
-					unRegister.UnRegister();
-				}
-				AutoUnRegister.Clear();
-			}
-		}
-	}
-
 
 	public static class CanRegisterEventExtension
 	{

addons/EGFramework/Module/Extension/EGDateTimeExtension.cs

@@ -10,22 +10,11 @@ namespace EGFramework{
         {
             return DateTime.Now.ToString("HH:mm:ss");
         }
-        public static long GetDateTime(this object self)
+        public static long GetTimeStamp(this IEGFramework self)
         {
-            DateTime dt = DateTime.Now;
+            TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 8, 0, 0, 0);
-            return dt.Ticks;
+            return System.Convert.ToInt64(ts.TotalSeconds);
-        }
-        public static string GetFullDateMsg(this long ticks){
-            DateTime dateTime = new DateTime(ticks);
-            return dateTime.ToString("yyyy-MM-dd") + " " + dateTime.ToString("HH:mm:ss");
-        }
-        public static string GetDayDateMsg(this long ticks){
-            DateTime dateTime = new DateTime(ticks);
-            return dateTime.ToString("HH:mm:ss");
-        }
-        public static string GetDateMsg(this long ticks){
-            DateTime dateTime = new DateTime(ticks);
-            return dateTime.ToString("yyyy-MM-dd");
         }
     }
-}
+}
+    

addons/EGFramework/Module/NodeExtension/EGNode.cs

@@ -25,25 +25,5 @@ namespace EGFramework{
             }
         }
 
-        public static void ClearChildren<T>(this Node itemContainer) where T : Node
-        {
-            foreach (Node child in itemContainer.GetChildren())
-            {
-                if(child.GetType()==typeof(T)){
-                    child.QueueFree();
-                }
-            }
-        }
-
-        public static void ClearChildrenLabel(this Node itemContainer)
-        {
-            foreach (Node child in itemContainer.GetChildren())
-            {
-                if(child.GetType()==typeof(Label)){
-                    child.QueueFree();
-                }
-            }
-        }
-
     }
 }

addons/EGFramework/Module/NodeExtension/EGThread.cs

@@ -1,60 +0,0 @@
-using Godot;
-using static Godot.GD;
-using System;
-using System.Collections.Generic;
-
-namespace EGFramework{
-    public partial class EGThread : Node,IModule,IEGFramework{
-
-        public EasyEventOnce EventPool = new EasyEventOnce();
-        public Dictionary<Action,SceneTreeTimer> EventDelayPool = new Dictionary<Action, SceneTreeTimer>();
-
-        public void Init()
-        {
-            
-        }
-
-        public override void _Ready()
-        {
-
-        }
-
-        public override void _Process(double delta)
-        {
-            //base._Process(delta);
-            EventPool.Invoke();
-        }
-
-        public void ExecuteInMainThread(Action action){
-            //ActionQueue.Enqueue(action);
-            EventPool.Register(action);
-        }
-
-        public void ExecuteAfterSecond(Action action,double delay){
-            SceneTreeTimer timer = this.GetTree().CreateTimer(delay);
-            timer.Timeout += action;
-            timer.Timeout += () => EventDelayPool.Remove(action);
-            EventDelayPool.Add(action,timer);
-        }
-
-        public IArchitecture GetArchitecture()
-        {
-            return EGArchitectureImplement.Interface;
-        }
-    }
-    public static class EGThreadExtension
-    {
-        public static void ExecuteInMainThread(this Node self, Action action){
-            //action.Invoke();
-            self.NodeModule<EGThread>().ExecuteInMainThread(action);
-        }
-
-        public static void ExecuteAfterSecond(this Node self, Action action,double delay){
-            self.NodeModule<EGThread>().ExecuteAfterSecond(action,delay);
-        }
-
-        public static void EGEnabledThread(this Node self){
-            self.NodeModule<EGThread>();
-        }
-    }
-}

addons/EGFramework/Module/NodeExtension/EGTweenExtension.cs

@@ -5,10 +5,10 @@ namespace EGFramework.EGTween{
     public static class EGTweenExtension
     {
 		#region Function
-		public static Tween KillOnEnd(this Tween self){
+			public static Tween KillOnEnd(this Tween self){
-			self.TweenCallback(Callable.From(self.Kill));
+				self.TweenCallback(Callable.From(self.Kill));
-			return self;
+				return self;
-		}
+			}
 		#endregion
 		#region Position
 		public static Tween TweenPosition(this Control self,Vector2 position,float delay){

addons/EGFramework/Module/ProtocolTools/EGHttpServer.cs

@@ -64,7 +64,7 @@ namespace EGFramework{
                                     Dictionary<string,string> getDic = data.AllKeys.ToDictionary(k=>k,k=>data[k]);
                                     string getData = JsonConvert.SerializeObject(getDic);
                                     byte[] getBuffer = StringEncoding.GetBytes(getData);
-                                    responseKey = "GET:"+this.GetDateTime().ToString();
+                                    responseKey = "GET:"+this.GetTimeStamp().ToString();
                                     receivedMsgs = new ResponseMsg(getData,getBuffer,responseKey, ProtocolType.HttpServer);
                                     //GD.Print("Received from "+receivedMsgs.sender+": "+receivedMsgs.stringData);
                                 }

addons/EGFramework/Module/ProtocolTools/EGUDP.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Net;
 using System.Net.Sockets;
 using System.Text;
-using Godot;
+using System.Threading.Tasks;
+
 namespace EGFramework{
     public class EGUDP : IEGFramework, IModule, IProtocolSend, IProtocolReceived
     {
@@ -33,7 +34,6 @@ namespace EGFramework{
                 {
                     UdpClient udpDevice = new UdpClient(localPort);
                     UDPDevices.Add(localPort,udpDevice);
-                    //udpDevice.EnableBroadcast = true;
                     HandleUDPListenAsync(udpDevice);
                     //StartListening(localPort);
                 }
@@ -54,7 +54,6 @@ namespace EGFramework{
         {
             try
             {
-                //GD.Print("UDP listened in "+((IPEndPoint)client.Client.LocalEndPoint).Port);
                 while (true)
                 {
                     UdpReceiveResult data = await client.ReceiveAsync();
@@ -64,30 +63,21 @@ namespace EGFramework{
                     ResponseMsgs.Enqueue(receivedMsgs);
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                GD.Print("Listen false by:"+e);
             }
         }
 
         public void SendByteData(string host,int port,byte[] data){
-            UdpClient udpClient;
+            UdpClient udpClient = new UdpClient();
-            if(UDPDevices.Count>0){
-                udpClient = UDPDevices.First().Value;
-            }else{
-                udpClient = new UdpClient();
-            }
             try{
-                GD.Print(udpClient.EnableBroadcast);
                 udpClient.Send(data, data.Length, host, port);
             }
             catch ( Exception e ){
                 Godot.GD.Print(e.ToString());	
             }
-            if(UDPDevices.Count<=0){
+            udpClient.Close();
-                udpClient.Close();
+            udpClient.Dispose();
-                udpClient.Dispose();
-            }
         }
         public void SendByteData(string destination,byte[] data){
             SendByteData(destination.GetHostByIp(),destination.GetPortByIp(),data);
@@ -128,9 +118,6 @@ namespace EGFramework{
         public static void EGUDPListen(this IEGFramework self ,int port){
             self.GetModule<EGUDP>().ListenUDP(port);
         }
-        public static void EGUDPEndListen(this IEGFramework self ,int port){
-            self.GetModule<EGUDP>().EndListenUDP(port);
-        }
     }
 }
 

addons/EGFramework/Module/SaveTools/EGDapper.cs

@@ -1,39 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data.Common;
-using System.Linq.Expressions;
-
-//ORM Save tools. First support SQLite and MySQL,In future we will support other Database who implement DBConnection.
-namespace EGFramework{
-    public class EGDapper : IEGSave, IEGSaveData
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="conn">files conn Str or address ip port,username and passwd</param>
-        public void InitSaveFile(string conn)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public IEnumerable<TData> FindData<TData>(string dataKey, Expression<Func<TData, bool>> expression) where TData : new()
-        {
-            throw new NotImplementedException();
-        }
-
-        public IEnumerable<TData> GetAll<TData>(string dataKey) where TData : new()
-        {
-            throw new NotImplementedException();
-        }
-
-        public TData GetData<TData>(string dataKey, object id) where TData : new()
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetData<TData>(string dataKey, TData data, object id)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

addons/EGFramework/Module/SaveTools/EGSqlite.cs

@@ -6,6 +6,11 @@ using Microsoft.Data.Sqlite;
 using Newtonsoft.Json;
 
 namespace EGFramework{
+    public interface IEGSqlite{
+        void SaveData<TData>(TData data) where TData : new();
+        List<TData> GetDataSet<TData>() where TData : new();
+        void InitDatabase(string dataBaseName);
+    }
     public class EGSqlite : EGModule
     {
         public string DBName = "Default";

project.godot

@@ -88,5 +88,4 @@ jump={
 
 [rendering]
 
-renderer/rendering_method="gl_compatibility"
 renderer/rendering_method.mobile="gl_compatibility"