Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs

@@ -11,6 +11,7 @@ namespace UI.CommonGame
         public Controller m_ScaleType;
         public GLoader m_bg;
         public GLoader m_loaIcon;
+        public GImage m_imgNum;
         public GTextField m_txtCount;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
@@ -69,6 +70,7 @@ namespace UI.CommonGame
             m_ScaleType = comp.GetController("ScaleType");
             m_bg = (GLoader)comp.GetChild("bg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_imgNum = (GImage)comp.GetChild("imgNum");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
@@ -83,6 +85,7 @@ namespace UI.CommonGame
             m_ScaleType = null;
             m_bg = null;
             m_loaIcon = null;
+            m_imgNum = null;
             m_txtCount = null;
             m_txtHasCount = null;
             m_loaRarity = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComIcon002
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtHasCount;
-        public GLoader m_loaRarity;
-        public GImage m_imgHas;
-        public GImage m_imgNotHas;
-        public GImage m_imgShowTong;
-        public GGroup m_grpGot;
-        public const string URL = "ui://eg2y0ldpqik1tlz";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComIcon002";
-        private static UI_ComIcon002 _proxy;
-
-        public static UI_ComIcon002 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComIcon002();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComIcon002 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComIcon002();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_imgHas = (GImage)comp.GetChild("imgHas");
-            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
-            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
-            m_grpGot = (GGroup)comp.GetChild("grpGot");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtHasCount = null;
-            m_loaRarity = null;
-            m_imgHas = null;
-            m_imgNotHas = null;
-            m_imgShowTong = null;
-            m_grpGot = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta

@@ -1,15 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon001.cs.meta
-guid: 4ad5e828cb8d0004488ba34ffb26c6e0
-=======
-guid: 8aa459e7d8832484abfa8f7737db7902
->>>>>>> remotes/origin/master:GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon002.cs.meta
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs

@@ -1,89 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComIcon003
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GTextField m_txtHasCount;
-        public GLoader m_loaRarity;
-        public GImage m_imgHas;
-        public GImage m_imgNotHas;
-        public GImage m_imgShowTong;
-        public GGroup m_grpGot;
-        public const string URL = "ui://eg2y0ldpvolstnd";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComIcon003";
-        private static UI_ComIcon003 _proxy;
-
-        public static UI_ComIcon003 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComIcon003();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComIcon003 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComIcon003();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
-            m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_imgHas = (GImage)comp.GetChild("imgHas");
-            m_imgNotHas = (GImage)comp.GetChild("imgNotHas");
-            m_imgShowTong = (GImage)comp.GetChild("imgShowTong");
-            m_grpGot = (GGroup)comp.GetChild("grpGot");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_txtHasCount = null;
-            m_loaRarity = null;
-            m_imgHas = null;
-            m_imgNotHas = null;
-            m_imgShowTong = null;
-            m_grpGot = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComIcon003.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8e9c5f8ad208b9448aa5016042fa8782
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComItem002
-    {
-        public GComponent target;
-        public UI_ComIcon002 m_comItemIcon;
-        public GTextField m_txtName;
-        public GTextField m_txtCount;
-        public const string URL = "ui://eg2y0ldpqik1tly";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem002";
-        private static UI_ComItem002 _proxy;
-
-        public static UI_ComItem002 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem002();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComItem002 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem002();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_comItemIcon = (UI_ComIcon002)UI_ComIcon002.Create(comp.GetChild("comItemIcon"));
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comItemIcon.Dispose();
-            m_comItemIcon = null;
-            m_txtName = null;
-            m_txtCount = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem002.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 39866ec1b63d9cd46a15d82adaa5f332
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs

@@ -1,78 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.CommonGame
-{
-    public partial class UI_ComItem003
-    {
-        public GComponent target;
-        public UI_ComIcon003 m_comItemIcon;
-        public GTextField m_txtName;
-        public GTextField m_txtCount;
-        public const string URL = "ui://eg2y0ldpvolstnh";
-        public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComItem003";
-        private static UI_ComItem003 _proxy;
-
-        public static UI_ComItem003 Create(GObject gObject = null)
-        {
-            var ui = new UI_ComItem003();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComItem003 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComItem003();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_comItemIcon = (UI_ComIcon003)UI_ComIcon003.Create(comp.GetChild("comItemIcon"));
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_txtCount = (GTextField)comp.GetChild("txtCount");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comItemIcon.Dispose();
-            m_comItemIcon = null;
-            m_txtName = null;
-            m_txtCount = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComItem003.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: dd3f87a14b967fd45b529541ea799c45
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDanRewardView.cs

@@ -129,8 +129,8 @@ namespace GFGGame
                 obj.data = new ItemView(obj as GComponent);
             }
             (obj.data as ItemView).SetData(itemData);
-            (obj.data as ItemView).SetComItemScale = 0.7f;
-            (obj.data as ItemView).SetTxtCountPos(185, 155);
+            //(obj.data as ItemView).SetComItemScale = 0.7f;
+            //(obj.data as ItemView).SetTxtCountPos(185, 155);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Card/CardStarRewardView.cs

@@ -85,8 +85,8 @@ namespace GFGGame
                 item.m_comItem.data = new ItemView(item.m_comItem);
             }
             (item.m_comItem.data as ItemView).SetData(reward);
-            (item.m_comItem.data as ItemView).SetComItemScale = 0.65f;
-            (item.m_comItem.data as ItemView).SetTxtCountPos(185, 140);
+            //(item.m_comItem.data as ItemView).SetComItemScale = 0.65f;
+            //(item.m_comItem.data as ItemView).SetTxtCountPos(185, 140);
 
 
 

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -368,7 +368,7 @@ namespace GFGGame
                 if (result)
                 {
                     OnClickBtnRarity(_curRarity);
-                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 2);
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SKILL_BOOK_FEN_JIE, 2);
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ItemView.cs

@@ -18,6 +18,7 @@ namespace GFGGame
         private GImage _imgNotHas;
         private GImage _imgHas;
         private GImage _imgShouTong;
+        private GImage _imgNum;
         private Controller _qualityType;
         private Controller _scaleType;
         // private GGroup _grpCount;
@@ -40,6 +41,7 @@ namespace GFGGame
             _imgNotHas = _item.GetChild("imgNotHas") as GImage;
             _imgHas = _item.GetChild("imgHas") as GImage;
             _imgShouTong = _item.GetChild("imgShowTong") as GImage;
+            _imgNum = _item.GetChild("imgNum") as GImage;
             _qualityType = _item.GetController("QualityType") as Controller;
             _scaleType = _item.GetController("ScaleType") as Controller;
             // _grpCount = obj.GetChild("grpCount") as GGroup;
@@ -83,6 +85,7 @@ namespace GFGGame
             // _grpCount.visible = true;
             _showTips = true;
             _txtCount.visible = true;
+            _imgNum.visible = true;
 
             _txtName.text = itemCfg.name;
             _txtCount.text = string.Format("{0}", _itemData.num);
@@ -91,7 +94,7 @@ namespace GFGGame
             if(itemCfg.rarity > 0)
                 _qualityType.selectedIndex = itemCfg.rarity - 1;
 
-           _scaleType.selectedIndex = _textScale ? 1 : 0;
+            _scaleType.selectedIndex = _textScale ? 1 : 0;
         }
 
 
@@ -243,6 +246,13 @@ namespace GFGGame
                 _txtCount.SetScale(value, value);
             }
         }
+        public float SetTxtNameScale
+        {
+            set
+            {
+                _txtName.SetScale(value, value);
+            }
+        }
         public void SetTxtCountPos(int x, int y)
         {
             _txtCount.SetPosition(x, y, 0);
@@ -252,6 +262,7 @@ namespace GFGGame
             set
             {
                 _txtCount.visible = value;
+                _imgNum.visible = value;
             }
         }
         public void ChangeTxtCountStyle()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightQuicklyView.cs

@@ -213,9 +213,7 @@ namespace GFGGame
             }
             (item.data as ItemView).SetData(itemData);
             (item.data as ItemView).ShowName = true;
-            (item.data as ItemView).SetComItemScale = 0.8f;
-            (item.data as ItemView).SetTxtCountPos(210, 160);
-            (item.data as ItemView).SetTxtNamePos(110, 200);
+            (item.data as ItemView).SetTxtNameScale = 1.2f;
             // (item.data as ItemView).ShowHasCount = false;
         }
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingRewardView.cs

@@ -86,8 +86,8 @@ namespace GFGGame
             }
             (obj.data as ItemView).SetData(reward);
             (obj.data as ItemView).GrpGotVisible = StudioDataManager.Instance.GetFilingRewardStateByIndex(StudioDataManager.Instance.filingChapterId, rewardIndex) == ConstBonusStatus.GOT ? true : false;
-            (obj.data as ItemView).SetComItemScale = 0.6f;
-            (obj.data as ItemView).SetTxtCountPos(175, 135);
+            //(obj.data as ItemView).SetComItemScale = 0.6f;
+            //(obj.data as ItemView).SetTxtCountPos(175, 135);
         }
 
         private void OnBtnGetClcik()

GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -20,11 +20,11 @@ public class GameLauncher : MonoBehaviour
         LauncherConfig.InitScriptCompilation();
         FGUILauncher.Init();
 
-        HealthAdviceView.Instance.Open();
+        HealthAdviceView.Open();
         int time = LauncherConfig.netType == LauncherConfig.EnumNetType.TISHEN ? 10 : 1;
         Timers.inst.Add(time, 1, (object param) =>
         {
-            HealthAdviceView.Instance.Close();
+            HealthAdviceView.Close();
             LauncherView.Instance.Open();
             LauncherController.InitLauncherCfg();
         });

GameClient/Assets/Game/Launcher/Views/HealthAdviceView.cs

@@ -4,70 +4,17 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class HealthAdviceView
+    public class HealthAdviceView : MonoBehaviour
     {
-        private static HealthAdviceView m_Instance = null;
-        /// <summary>
-        /// 单例
-        /// </summary>
-        public static HealthAdviceView Instance
-        {
-            get
-            {
-                if (m_Instance == null)
-                {
-                    m_Instance = new HealthAdviceView();
-                }
-                return m_Instance;
-            }
-        }
-
-        private UI_HealthAdviceUI _ui;
-
-        /// <summary>
-        /// 每1%耗时，单位秒
-        /// </summary>
-        private const float SPEED = 0.01f;
-        /// <summary>
-        /// 界面是否打开状态
-        /// </summary>
-        private bool isOpen = false;
-        /// <summary>
-        /// FairyGUI包名
-        /// </summary>
-        private string _packageName;
-
-        #region private
-        private void Dispose()
-        {
-            UIPackage.RemovePackage("UI/" + _packageName);
-            _ui.Dispose(true);
-            _ui = null;
-        }
-        #endregion
-
-        public HealthAdviceView()
-        {
-            _packageName = UI_HealthAdviceUI.PACKAGE_NAME;
-            UIPackage.AddPackage("UI/" + _packageName + "/" + _packageName);
-            _ui = UI_HealthAdviceUI.Create();
-            _ui.target.MakeFullScreen();
-            _ui.target.AddRelation(GRoot.inst, RelationType.Size);
-
-        }
+        private static GameObject _ui;
 
         /// <summary>
         /// 打开界面
         /// </summary>
-        public void Open()
+        public static void Open()
         {
-            if (isOpen)
-            {
-                return;
-            }
-
-            GRoot.inst.AddChild(_ui.target);
-            isOpen = true;
+            var go = Resources.Load<GameObject>("UUI/Launcher/UIHealthAdvice");
+            _ui = GameObject.Instantiate(go);
 
         }
 
@@ -75,18 +22,10 @@ namespace GFGGame
         /// 关闭界面
         /// </summary>
         /// <param name="toDestroy"></param>
-        public void Close(bool toDestroy = false)
+        public static void Close()
         {
-            if (!isOpen)
-            {
-                return;
-            }
-            isOpen = false;
-            _ui.target.RemoveFromParent();
-            if (toDestroy)
-            {
-                Dispose();
-            }
+            GameObject.DestroyImmediate(_ui);
+            _ui = null;
         }
     }
 }

GameClient/Assets/Resources/UUI.meta

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

GameClient/Assets/Resources/UUI/Launcher.meta

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

GameClient/Assets/Resources/UUI/Launcher/UIHealthAdvice.prefab

@@ -0,0 +1,190 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6083534107071946558
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1690489416784103112}
+  - component: {fileID: 4888660113921995730}
+  - component: {fileID: 7068196267919365885}
+  - component: {fileID: 8511891373420189377}
+  - component: {fileID: -8398122933620504958}
+  m_Layer: 5
+  m_Name: UIHealthAdvice
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1690489416784103112
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6083534107071946558}
+  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_Children:
+  - {fileID: 3740168456626086746}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &4888660113921995730
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6083534107071946558}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &7068196267919365885
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6083534107071946558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &8511891373420189377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6083534107071946558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 217b1a047bfade34289c7efe2de48c6b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &-8398122933620504958
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6083534107071946558}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1080, y: 2400}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!1 &8124710964731882030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3740168456626086746}
+  - component: {fileID: 6326175109990320051}
+  - component: {fileID: 4032581477984220586}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3740168456626086746
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8124710964731882030}
+  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_Children: []
+  m_Father: {fileID: 1690489416784103112}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 1080.4688, y: 2400}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6326175109990320051
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8124710964731882030}
+  m_CullTransparentMesh: 1
+--- !u!114 &4032581477984220586
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8124710964731882030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 7c139f105f0d88645adeb905a0730803, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

GameClient/Assets/Resources/UUI/Launcher/UIHealthAdvice.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ebb3937339b98ad449c7b1a4efc3f42a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Resources/UUI/Launcher/UISprites.meta

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

GameClient/Assets/Resources/UUI/Launcher/UISprites/jkgg.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7c139f105f0d88645adeb905a0730803
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Scenes/GameLauncher.unity

@@ -283,6 +283,105 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &513168741
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 513168745}
+  - component: {fileID: 513168744}
+  - component: {fileID: 513168743}
+  - component: {fileID: 513168742}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &513168742
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 513168741}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &513168743
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 513168741}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &513168744
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 513168741}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 170410351}
+  m_PlaneDistance: 30
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &513168745
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 513168741}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &519420028
 GameObject:
   m_ObjectHideFlags: 0
@@ -388,6 +487,72 @@ Behaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 519420028}
   m_Enabled: 1
+--- !u!1 &754180398
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 754180401}
+  - component: {fileID: 754180400}
+  - component: {fileID: 754180399}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &754180399
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 754180398}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &754180400
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 754180398}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &754180401
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 754180398}
+  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_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &860656084
 GameObject:
   m_ObjectHideFlags: 0