增加vs代码风格配置 & 代码整理

.editorconfig

@@ -0,0 +1,19 @@
+root = true  # 所在目录是项目根目录，此目录及子目录下保存的文件都会生效    
+ 
+#对于所有文件
+[*]  
+
+#缩进风格
+indent_style = space  
+indent_size = 4
+translate_tabs_to_spaces = true
+
+#文件编码格式
+charset = utf-8-bom
+
+# 行尾格式，Windows一般为CRLF，Linux一般为LF
+end_of_line = lf  
+
+#文件结尾添加换行符，以防警告
+insert_final_newline = true   
+trim_trailing_whitespace = true

Unity/Assets/Scenes/Init.unity

@@ -846,8 +846,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1984349696}
-  m_LocalRotation: {x: 0.48865515, y: -0, z: -0, w: 0.87247705}
-  m_LocalPosition: {x: 2.1579952, y: 35.460117, z: -32.150215}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UIHelper.cs

@@ -1,22 +1,21 @@
 using FairyGUI;
-using System.Runtime.Remoting.Lifetime;
 using UnityEngine;
 
 namespace ET.Client
 {
     public static class UIHelper
     {
-        public static async ETTask<GObject> Create(string uiName)
+        public static async ETTask<GComponent> Create(string packName, string uiName = null)
         {
-            var ass = await YooAssetProxy.LoadAssetAsync<TextAsset>($"FGUI_{uiName}_fui");
-            UIPackage.AddPackage(ass.GetAssetObject<TextAsset>().bytes, uiName, LoadPackageInternalAsync);
-            var view = UIPackage.CreateObject(uiName, uiName).asCom;
-            view.name = uiName;
+            var ass = await YooAssetProxy.LoadAssetAsync<TextAsset>($"FGUI_{packName}_fui");
+            UIPackage.AddPackage(ass.GetAssetObject<TextAsset>().bytes, packName, LoadPackageInternalAsync);
+            var view = UIPackage.CreateObject(packName, uiName ?? packName).asCom;
+            view.name = uiName ?? packName;
             GRoot.inst.AddChild(view);
             return view;
         }
 
-        private static async void LoadPackageInternalAsync(string name,string extension, System.Type type, PackageItem item)
+        private static async void LoadPackageInternalAsync(string name, string extension, System.Type type, PackageItem item)
         {
             var tex = await YooAssetProxy.LoadAssetAsync<Texture>($"FGUI_{name}");
             item.owner.SetItemAsset(item, tex.GetAsset<Texture>(), DestroyMethod.Unload);

Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs

@@ -4,39 +4,21 @@ using UnityEngine;
 
 namespace ET.Client
 {
-	[Event(SceneType.Client)]
-	public class LoginFinish_CreateLobbyUI: AEvent<EventType.LoginFinish>
-	{
-		protected override async ETTask Run(Scene scene, EventType.LoginFinish args)
-		{
-			if(!args.exeception.IsNullOrWhitespace())
-			{
-				return;
-			}
+    [Event(SceneType.Client)]
+    public class LoginFinish_CreateLobbyUI : AEvent<EventType.LoginFinish>
+    {
+        protected override async ETTask Run(Scene scene, EventType.LoginFinish args)
+        {
+            if (!args.exeception.IsNullOrWhitespace())
+            {
+                return;
+            }
 
-			Log.Debug("enter lobby.");
-            var ass = await YooAssetProxy.LoadAssetAsync<TextAsset>("FGUI_Lobby_fui");
-            UIPackage.AddPackage(ass.GetAssetObject<TextAsset>().bytes, "Lobby", LoadPackageInternalAsync);
-            var view = UIPackage.CreateObject("Lobby", "Lobby").asCom;
-            view.name = "Lobby";
-            GRoot.inst.AddChild(view);
+            Log.Debug("enter lobby.");
+            var view = await UIHelper.Create("Lobby");
             InitView(scene, view);
         }
 
-        /// <summary>
-        /// 加载资源的异步委托
-        /// </summary>
-        /// <param name="name">注意，这个name是FGUI内部组装的纹理全名，例如FUILogin_atlas0</param>
-        /// <param name="extension"></param>
-        /// <param name="type"></param>
-        /// <param name="item"></param>
-        private static async void LoadPackageInternalAsync(string name,
-            string extension, System.Type type, PackageItem item)
-        {
-            var tex = await YooAssetProxy.LoadAssetAsync<Texture>($"FGUI_{name}");
-            item.owner.SetItemAsset(item, tex.GetAsset<Texture>(), DestroyMethod.Unload);
-        }
-
         private void InitView(Scene scene, GComponent view)
         {
             var name = view.GetChild("userName");

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

@@ -1,15 +1,14 @@
-using UnityEngine;
+using Cysharp.Threading.Tasks;
 using FairyGUI;
-using Cysharp.Threading.Tasks;
-using System.ComponentModel;
+using UnityEngine;
 
 namespace ET.Client
 {
-	[Event(SceneType.Client)]
-	public class AppStartInitFinish_CreateLoginUI: AEvent<EventType.AppStartInitFinish>
-	{
-		protected override async ETTask Run(Scene scene, EventType.AppStartInitFinish args)
-		{
+    [Event(SceneType.Client)]
+    public class AppStartInitFinish_CreateLoginUI : AEvent<EventType.AppStartInitFinish>
+    {
+        protected override async ETTask Run(Scene scene, EventType.AppStartInitFinish args)
+        {
             Log.Debug("to load login ui.");
             var ass = await YooAssetProxy.LoadAssetAsync<TextAsset>("FGUI_Login_fui");
             UIPackage.AddPackage(ass.GetAssetObject<TextAsset>().bytes, "Login", LoadPackageInternalAsync);
@@ -43,11 +42,11 @@ namespace ET.Client
             var account = view.GetChild("input_name");
             var password = view.GetChild("input_password");
             var btn = view.GetChild("Btn_Login");
-            btn.onClick.Add(()=> 
+            btn.onClick.Add(() =>
             {
                 view.GetChild("img_tips").visible = false;
                 view.GetChild("txt_tips").visible = false;
-                
+
                 btn.enabled = false;
                 LoginHelper.Login(scene, account.text, password.text).Coroutine();
             });

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

@@ -3,35 +3,35 @@ using Sirenix.Utilities;
 
 namespace ET.Client
 {
-	[Event(SceneType.Client)]
-	public class LoginFinish_RemoveLoginUI: AEvent<EventType.LoginFinish>
-	{
-		protected override async ETTask Run(Scene scene, EventType.LoginFinish args)
-		{
-			if(!args.exeception.IsNullOrWhitespace()) 
-			{
-				var loginview = GRoot.inst.GetChild("Login");
-				if(loginview != null)
-				{
-					var component = loginview.asCom;
-					var tips = component.GetChild("txt_tips");
-					tips.visible = true;
-					tips.text = "连接服务器过程中出现了问题\n" +
-						"如重试后还是不行，请与客服联系" +
-						"\n[color=#FFCCCC][b]QQ: 400888666[/b][/color]  微信：[color=#FFCCCC][b]大老板[/color][/b]";
+    [Event(SceneType.Client)]
+    public class LoginFinish_RemoveLoginUI : AEvent<EventType.LoginFinish>
+    {
+        protected override async ETTask Run(Scene scene, EventType.LoginFinish args)
+        {
+            if (!args.exeception.IsNullOrWhitespace())
+            {
+                var loginview = GRoot.inst.GetChild("Login");
+                if (loginview != null)
+                {
+                    var component = loginview.asCom;
+                    var tips = component.GetChild("txt_tips");
+                    tips.visible = true;
+                    tips.text = "连接服务器过程中出现了问题\n" +
+                        "如重试后还是不行，请与客服联系" +
+                        "\n[color=#FFCCCC][b]QQ: 400888666[/b][/color]  微信：[color=#FFCCCC][b]大老板[/color][/b]";
                     component.GetChild("img_tips").visible = false;
                     component.GetChild("Btn_Login").enabled = true;
-				}
-				else
-				{
-					Log.Error("not found login view @login error");
-				}
-				return;
-			}
+                }
+                else
+                {
+                    Log.Error("not found login view @login error");
+                }
+                return;
+            }
 
             await TimerComponent.Instance.WaitAsync(1000);
             GRoot.inst.RemoveChildAt(0, true);
-			UIPackage.RemovePackage("Login");
-		}
-	}
+            UIPackage.RemovePackage("Login");
+        }
+    }
 }

Unity/Assets/Scripts/Codes/ModelView/Client/Plugins.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b187fa55fc52d534f8634cbd14a85e13
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/ModelView/Client/Plugins/Example.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 15fc04bfffbb11842979476b0640b506
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: