Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Unity/Assets/Scripts/Codes/Model/Client/Login/ServerInfo.cs

Unity/Assets/Scripts/Codes/Editor/EntityTreeWindow/ContextMenu/MenuExample.cs

@@ -1,13 +1,13 @@
-namespace ET
+namespace ET
 {
-    [EntityMenu(typeof (Unit), "打开属性菜单")]
+    //[EntityMenu(typeof (Unit), "打开属性菜单")]
     public class UnitNumericWindowMenu: AEntityMenuHandler
     {
         public override void OnClick(Entity entity)
         {
-            var unit = entity as Unit;
+            //var unit = entity as Unit;
 
-            Log.Debug(unit.Config.Name);
+            //Log.Debug(unit.Config.Name);
         }
     }
-}
+}

Unity/Assets/Scripts/Codes/Hotfix/Unity.Hotfix.Codes.asmdef

@@ -8,7 +8,9 @@
         "Unity.Mathematics",
         "Unity.Loader",
         "UniTask",
-        "UniTask.YooAsset"
+        "UniTask.YooAsset",
+        "Unity.Mono",
+        "YooAsset"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -20,5 +22,5 @@
         "ENABLE_CODES"
     ],
     "versionDefines": [],
-    "noEngineReferences": true
+    "noEngineReferences": false
 }

Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/ShowLoginUIEventHandle.cs

@@ -138,7 +138,7 @@ namespace ET.Client
             }
             if(select < 0)
             {
-                select = 0;
+                select = 1;
             }
             var cur = ServerInfo.ServerList[select];
             mIP = cur.Ip;

Unity/Assets/Scripts/Codes/Model/Client/Login/ServerInfo.cs

@@ -14,13 +14,13 @@ namespace ET.Client
         static ServerInfo()
         {
             ServerList = new(){
-                // new ServerInfo{
-                //     ShowName = "ommcn.com",
-                //     Ip = "ommcn.com",
-                //     Port = 30300
-                // },
                 new ServerInfo{
-                    ShowName = "外网[47.98.144.16:30300]",
+                    ShowName = "ommcn.com",
+                    Ip = "ommcn.com",
+                    Port = 30300
+                },
+                new ServerInfo{
+                    ShowName = "git 1",
                     Ip = "47.98.144.16",
                     Port = 30300
                 },
@@ -29,19 +29,19 @@ namespace ET.Client
                     Ip = "127.0.0.1",
                     Port = 30300
                 },
-                // new ServerInfo{
-                //     ShowName = "lv[192.168.0.233:30300]",
-                //     Ip = "192.168.0.233",
-                //     Port = 30300
-                // },
-                // new ServerInfo{
-                //     ShowName = "dong[192.168.0.102:30300]",
-                //     Ip = "192.168.0.102",
-                //     Port = 30300
-                // },
+                new ServerInfo{
+                    ShowName = "lv[192.168.0.233:30300]",
+                    Ip = "192.168.0.233",
+                    Port = 30300
+                },
+                new ServerInfo{
+                    ShowName = "dong[192.168.0.102:30300]",
+                    Ip = "192.168.0.102",
+                    Port = 30300
+                },
             };
         }
     }
 
-
+     
 }

Unity/Packages/com.focus-creative-games.hybridclr_unity/Editor/Installer/InstallerController.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -54,6 +54,7 @@ namespace HybridCLR.Editor.Installer
         public const int min2019_4_CompatibleMinorVersion = 40;
         public const int min2020_3_CompatibleMinorVersion = 21;
         public const int min2021_3_CompatibleMinorVersion = 0;
+        public const int min2022_3_CompatibleMinorVersion = 0;
 
         private UnityVersion ParseUnityVersion(string versionStr)
         {
@@ -116,6 +117,14 @@ namespace HybridCLR.Editor.Installer
                         }
                         return version.minor2 >= min2021_3_CompatibleMinorVersion;
                     }
+                case 2022:
+                    {
+                        if (version.major != 2022 || version.minor1 != 3)
+                        {
+                            return false;
+                        }
+                        return version.minor2 >= min2022_3_CompatibleMinorVersion;
+                    }
                 default: throw new Exception($"not support il2cpp_plus branch:{version.major}");
             }
         }

Unity/ProjectSettings/ProjectSettings.asset

@@ -879,7 +879,7 @@ PlayerSettings:
     QNX: UNITY_POST_PROCESSING_STACK_V2
     Server: NETSTANDARD2_0;UNITY
     Stadia: UNITY_POST_PROCESSING_STACK_V2
-    Standalone: NETSTANDARD2_0;UNITY;ENABLE_VIEW;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;FAIRYGUI_TMPRO;UNITY_POST_PROCESSING_STACK_V2
+    Standalone: NETSTANDARD2_0;UNITY;ENABLE_VIEW;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;FAIRYGUI_TMPRO;UNITY_POST_PROCESSING_STACK_V2;ENABLE_CODES
     VisionOS: UNITY_POST_PROCESSING_STACK_V2
     WebGL: NETSTANDARD2_0;UNITY;UNITY_POST_PROCESSING_STACK_V2
     Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2