Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Launcher/FullScreenTextUI.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <graph id="n1_u67n" name="n1" xy="0,0" size="1080,1920" type="rect">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <component id="n0_u67n" name="txtComp" src="u67n4o" fileName="components/Component2.xml" xy="20,120">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
+    <text id="n3_dgkd" name="n3" xy="12,68" size="110,44" group="n6_dgkd" fontSize="32" color="#d69f1a" ubb="true" text="&lt;&lt;返回"/>
+    <text id="n4_dgkd" name="n4" xy="12,71" size="260,44" group="n6_dgkd" fontSize="32" color="#d69f1a" autoSize="none" underline="true" text="             "/>
+    <loader id="n5_dgkd" name="btnBack" xy="12,76" size="192,32" group="n6_dgkd"/>
+    <group id="n6_dgkd" name="n6" xy="12,68" size="260,47"/>
+  </displayList>
+</component>

FGUIProject/assets/Launcher/LauncherAgreeUI.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="962,531">
+  <displayList>
+    <component id="n0_l55o" name="bg" src="si5ztih" fileName="components/ComBg.xml" xy="0,0" size="962,531">
+      <relation target="n5_l55o" sidePair="height-height"/>
+    </component>
+    <text id="n5_l55o" name="txtContent" xy="114,141" size="734,202" fontSize="30" color="#876e54" vAlign="middle" autoSize="none" text="        为了更好地保障您的个人权益，在使用本游戏前，请您务必阅读以下内容，并点击“同意”开始游戏。如果您拒绝，将无法进入游戏。&#xA;&#xA;">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <component id="n3_l55o" name="btnLeft" src="dhoaw" fileName="components/Button18.xml" xy="88,381">
+      <relation target="n0_l55o" sidePair="bottom-bottom"/>
+      <Button title="拒绝"/>
+    </component>
+    <component id="n4_l55o" name="btnRight" src="dhoax" fileName="components/Button19.xml" xy="530,381">
+      <relation target="n3_l55o" sidePair="top-top"/>
+      <Button title="同意"/>
+    </component>
+    <text id="n6_dgkd" name="txtContent" xy="124,54" size="714,49" fontSize="36" color="#876e54" align="center" vAlign="middle" autoSize="height" text="用户协议和隐私政策保护指引"/>
+    <text id="n11_dgkd" name="n11" xy="169,275" size="228,44" group="n14_dgkd" fontSize="32" color="#d69f1a" ubb="true" text="游戏用户协议、"/>
+    <text id="n12_dgkd" name="n12" xy="169,278" size="260,44" group="n14_dgkd" fontSize="32" color="#d69f1a" autoSize="none" underline="true" text="                      "/>
+    <loader id="n13_dgkd" name="loaEventa" xy="169,283" size="192,32" group="n14_dgkd"/>
+    <group id="n14_dgkd" name="n14" xy="169,275" size="260,47" group="n24_dgkd"/>
+    <text id="n15_dgkd" name="n15" xy="393,276" size="228,44" group="n18_dgkd" fontSize="32" color="#d69f1a" text="隐私保护指引、"/>
+    <text id="n16_dgkd" name="n16" xy="393,278" size="190,44" group="n18_dgkd" fontSize="32" color="#d69f1a" underline="true" text="                     "/>
+    <loader id="n17_dgkd" name="loaEventb" xy="397,286" size="182,29" group="n18_dgkd"/>
+    <group id="n18_dgkd" name="n18" xy="393,276" size="228,46" group="n24_dgkd"/>
+    <text id="n19_dgkd" name="n19" xy="612,275" size="196,44" group="n22_dgkd" fontSize="32" color="#d69f1a" ubb="true" text="儿童隐私政策"/>
+    <text id="n20_dgkd" name="n20" xy="614,277" size="199,44" group="n22_dgkd" fontSize="32" color="#d69f1a" underline="true" text="                      "/>
+    <loader id="n21_dgkd" name="loaEventc" xy="616,285" size="192,29" group="n22_dgkd"/>
+    <group id="n22_dgkd" name="n22" xy="612,275" size="201,46" group="n24_dgkd"/>
+    <group id="n24_dgkd" name="n24" xy="169,275" size="644,47"/>
+  </displayList>
+  <relation target="n0_l55o" sidePair="height-height"/>
+</component>

FGUIProject/assets/Launcher/package.xml

@@ -35,6 +35,9 @@
     <image id="pac9tjn" name="dljm_jdq_3.png" path="/images/"/>
     <image id="pac9tjo" name="dljm_jdq_4.png" path="/images/"/>
     <image id="pac9tjp" name="dljm_jdq_5.png" path="/images/"/>
+    <component id="dgkdtjq" name="LauncherAgreeUI.xml" path="/" exported="true"/>
+    <component id="u67n4n" name="FullScreenTextUI.xml" path="/" exported="true"/>
+    <component id="u67n4o" name="Component2.xml" path="/components/"/>
   </resources>
-  <publish name="" path="../GameClient/Assets/ResIn/UI/Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
+  <publish name="" path="..\GameClient\Assets\Resources\UI\Launcher" packageCount="2" genCode="true" codePath="..\GameClient\Assets\Game\Launcher\FairyGUI\GenCode\" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Login/FullScreenTextUI.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1920">
-  <displayList>
-    <graph id="n1_u67n" name="n1" xy="0,0" size="1080,1920" type="rect">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <component id="n2_nasr" name="btnBack" src="nasr5m" fileName="components/Button13.xml" xy="99,10" scale="-0.8,0.8"/>
-    <component id="n0_u67n" name="txtComp" src="u67n4o" fileName="components/Component2.xml" xy="20,120">
-      <relation target="" sidePair="width-width,height-height"/>
-    </component>
-  </displayList>
-</component>

FGUIProject/assets/Login/LoginUI.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://myoktu7pnasr5l" designImageOffsetY="-240" designImageAlpha="100">
   <displayList>
-    <text id="n2_ul4p" name="txtBottom" xy="40,1751" size="1000,104" fontSize="24" color="#fff9f1" align="center" autoSize="none" text="健康游戏忠告&#xA;抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
-      <relation target="" sidePair="bottom-bottom"/>
-    </text>
     <image id="n5_m1tb" name="imgLogo" src="lqt1a" fileName="imagesExport/LOGO.png" pkg="mgs5yrnj" xy="31,45">
       <relation target="" sidePair="left-left,top-top"/>
     </image>
@@ -19,33 +16,35 @@
     <group id="n7_pcul" name="n7" xy="960,156" size="92,273" advanced="true" layout="vt" lineGap="47" excludeInvisibles="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <component id="n1_ul4p" name="btnStart" src="ul4p6" fileName="components/ButtonKS.xml" xy="0,1473" size="1080,219">
+    <component id="n1_ul4p" name="btnStart" src="ul4p6" fileName="components/ButtonKS.xml" xy="0,1433" size="1080,219">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <component id="n12_pcul" name="btnChange" src="pcul5f" fileName="components/Button4.xml" xy="211,1336">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n13_es2q" name="btnAge" src="es2q5i" fileName="components/Button5.xml" xy="924,1740">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-    </component>
-    <component id="n15_pwpm" name="btnTapLogin" src="pwpm5k" fileName="components/ButtonTapLogin.xml" xy="240,1534" size="600,97" aspect="true">
+    <component id="n15_pwpm" name="btnTapLogin" src="pwpm5k" fileName="components/ButtonTapLogin.xml" xy="240,1494" size="600,97" aspect="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n44_nasr" name="btnAgree" src="q08x11" fileName="components/ButtonAgree.xml" xy="50,1701" size="50,44" group="n58_nasr"/>
-    <richtext id="n45_nasr" name="richTextAgree" xy="114,1702" size="293,44" group="n58_nasr" fontSize="32" color="#ffffff" ubb="true" autoSize="none" text="我已详细阅读并同意"/>
-    <text id="n46_nasr" name="n46" xy="402,1702" size="224,44" group="n49_nasr" fontSize="32" color="#ffdf87" ubb="true" text="游戏用户协议、"/>
-    <text id="n47_nasr" name="n47" xy="402,1705" size="260,44" group="n49_nasr" fontSize="32" color="#ffdf87" autoSize="none" underline="true" text="                       "/>
-    <loader id="n48_nasr" name="loaEventa" xy="402,1710" size="192,32" group="n49_nasr"/>
-    <group id="n49_nasr" name="n49" xy="402,1702" size="260,47" group="n58_nasr"/>
-    <text id="n50_nasr" name="n50" xy="611,1703" size="193,44" group="n53_nasr" fontSize="32" color="#ffdf87" text="隐私保护指引"/>
-    <text id="n51_nasr" name="n51" xy="611,1705" size="193,44" group="n53_nasr" fontSize="32" color="#ffdf87" underline="true" text="                       "/>
-    <loader id="n52_nasr" name="loaEventb" xy="615,1713" size="182,29" group="n53_nasr"/>
-    <group id="n53_nasr" name="n53" xy="611,1703" size="193,46" group="n58_nasr"/>
-    <text id="n54_nasr" name="n54" xy="804,1702" size="224,44" group="n57_nasr" fontSize="32" color="#fff9f1" ubb="true" text="和[color=#FFDF87]儿童隐私政策[/color]"/>
-    <text id="n55_nasr" name="n55" xy="836,1704" size="193,44" group="n57_nasr" fontSize="32" color="#ffdf87" underline="true" text="                       "/>
-    <loader id="n56_nasr" name="loaEventc" xy="838,1712" size="192,29" group="n57_nasr"/>
-    <group id="n57_nasr" name="n57" xy="804,1702" size="226,46" group="n58_nasr"/>
-    <group id="n58_nasr" name="n58" xy="50,1701" size="980,48" advanced="true">
+    <component id="n44_nasr" name="btnAgree" src="q08x11" fileName="components/ButtonAgree.xml" xy="-401,1651" size="50,44"/>
+    <richtext id="n45_nasr" name="richTextAgree" xy="-337,1652" size="293,44" fontSize="32" color="#ffffff" ubb="true" autoSize="none" text="我已详细阅读并同意"/>
+    <text id="n46_nasr" name="n46" xy="122,1665" size="228,44" group="n49_nasr" fontSize="32" color="#ffdf87" ubb="true" text="游戏用户协议、"/>
+    <text id="n47_nasr" name="n47" xy="122,1668" size="260,44" group="n49_nasr" fontSize="32" color="#ffdf87" autoSize="none" underline="true" text="                       "/>
+    <loader id="n48_nasr" name="loaEventa" xy="122,1673" size="192,32" group="n49_nasr"/>
+    <group id="n49_nasr" name="n49" xy="122,1665" size="260,47" group="n61_dgkd"/>
+    <text id="n50_nasr" name="n50" xy="341,1666" size="228,44" group="n53_nasr" fontSize="32" color="#ffdf87" text="隐私保护指引、"/>
+    <text id="n51_nasr" name="n51" xy="341,1668" size="208,44" group="n53_nasr" fontSize="32" color="#ffdf87" underline="true" text="                       "/>
+    <loader id="n52_nasr" name="loaEventb" xy="345,1676" size="182,29" group="n53_nasr"/>
+    <group id="n53_nasr" name="n53" xy="341,1666" size="228,46" group="n61_dgkd"/>
+    <text id="n54_nasr" name="n54" xy="559,1665" size="196,44" group="n57_nasr" fontSize="32" color="#ffdf87" ubb="true" text="儿童隐私政策"/>
+    <text id="n55_nasr" name="n55" xy="564,1667" size="173,44" group="n57_nasr" fontSize="32" color="#ffdf87" underline="true" text="                   "/>
+    <loader id="n56_nasr" name="loaEventc" xy="566,1675" size="192,29" group="n57_nasr"/>
+    <group id="n57_nasr" name="n57" xy="559,1665" size="199,46" group="n61_dgkd"/>
+    <group id="n61_dgkd" name="n61" xy="122,1665" size="636,47" group="n58_nasr"/>
+    <component id="n13_es2q" name="btnAge" src="es2q5i" fileName="components/Button5.xml" xy="848,1649" group="n58_nasr"/>
+    <text id="n2_ul4p" name="txtBottom" xy="122,1726" size="676,66" group="n58_nasr" fontSize="24" color="#fff9f1" align="center" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。"/>
+    <text id="n59_dgkd" name="txtBottom2" xy="118,1806" size="424,104" group="n58_nasr" fontSize="24" color="#fff9f1" autoSize="none" text="ISBN：978-7-498-10127-3&#xA;审批文号：国新出审[2023]151号&#xD;&#xA;软著登记号：2021SR1161597"/>
+    <text id="n60_dgkd" name="txtBottom3" xy="547,1806" size="449,104" group="n58_nasr" fontSize="24" color="#fff9f1" autoSize="none" text="著作权人：深圳市畅玩网络科技有限公司&#xD;&#xA;出版单位：山东科学技术出版社有限公司&#xD;&#xA;运营单位：深圳市畅玩网络科技有限公司"/>
+    <group id="n58_nasr" name="groupBottom" xy="118,1649" size="878,261" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
   </displayList>

FGUIProject/assets/Login/package.xml

@@ -13,8 +13,6 @@
     <component id="q08x10" name="ButtonSendCode.xml" path="/components/"/>
     <component id="q08x11" name="ButtonAgree.xml" path="/components/"/>
     <component id="u67n12" name="RegisterUIBackup.xml" path="/" exported="true"/>
-    <component id="u67n4n" name="FullScreenTextUI.xml" path="/" exported="true"/>
-    <component id="u67n4o" name="Component2.xml" path="/components/"/>
     <image id="ozsv4p" name="dl_anniu_1.png" path="/images/" scale="9grid" scale9grid="53,17,106,34"/>
     <image id="ozsv4q" name="dl_anniu_2.png" path="/images/" scale="9grid" scale9grid="53,17,106,34"/>
     <image id="ozsv4r" name="dl_ditu_1.png" path="/images/"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_LoginUI.cs

@@ -7,20 +7,23 @@ namespace UI.Login
     public partial class UI_LoginUI
     {
         public GComponent target;
-        public GTextField m_txtBottom;
         public GImage m_imgLogo;
         public GTextField m_txtVersion;
         public GButton m_btnNotice;
         public GButton m_btnLogout;
         public GButton m_btnStart;
         public GButton m_btnChange;
-        public GButton m_btnAge;
         public GButton m_btnTapLogin;
         public GButton m_btnAgree;
         public GRichTextField m_richTextAgree;
         public GLoader m_loaEventa;
         public GLoader m_loaEventb;
         public GLoader m_loaEventc;
+        public GButton m_btnAge;
+        public GTextField m_txtBottom;
+        public GTextField m_txtBottom2;
+        public GTextField m_txtBottom3;
+        public GGroup m_groupBottom;
         public const string URL = "ui://myoktu7pl55o0";
         public const string PACKAGE_NAME = "Login";
         public const string RES_NAME = "LoginUI";
@@ -68,37 +71,43 @@ namespace UI.Login
 
         private void Init(GComponent comp)
         {
-            m_txtBottom = (GTextField)comp.GetChild("txtBottom");
             m_imgLogo = (GImage)comp.GetChild("imgLogo");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_btnNotice = (GButton)comp.GetChild("btnNotice");
             m_btnLogout = (GButton)comp.GetChild("btnLogout");
             m_btnStart = (GButton)comp.GetChild("btnStart");
             m_btnChange = (GButton)comp.GetChild("btnChange");
-            m_btnAge = (GButton)comp.GetChild("btnAge");
             m_btnTapLogin = (GButton)comp.GetChild("btnTapLogin");
             m_btnAgree = (GButton)comp.GetChild("btnAgree");
             m_richTextAgree = (GRichTextField)comp.GetChild("richTextAgree");
             m_loaEventa = (GLoader)comp.GetChild("loaEventa");
             m_loaEventb = (GLoader)comp.GetChild("loaEventb");
             m_loaEventc = (GLoader)comp.GetChild("loaEventc");
+            m_btnAge = (GButton)comp.GetChild("btnAge");
+            m_txtBottom = (GTextField)comp.GetChild("txtBottom");
+            m_txtBottom2 = (GTextField)comp.GetChild("txtBottom2");
+            m_txtBottom3 = (GTextField)comp.GetChild("txtBottom3");
+            m_groupBottom = (GGroup)comp.GetChild("groupBottom");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtBottom = null;
             m_imgLogo = null;
             m_txtVersion = null;
             m_btnNotice = null;
             m_btnLogout = null;
             m_btnStart = null;
             m_btnChange = null;
-            m_btnAge = null;
             m_btnTapLogin = null;
             m_btnAgree = null;
             m_richTextAgree = null;
             m_loaEventa = null;
             m_loaEventb = null;
             m_loaEventc = null;
+            m_btnAge = null;
+            m_txtBottom = null;
+            m_txtBottom2 = null;
+            m_txtBottom3 = null;
+            m_groupBottom = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -18,6 +18,7 @@ namespace GFGGame
             ET.Log.Debug($"gamecfg \n{json}");
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
+            // LoginAddress = "http://login.gfg.com:10005";
             //LoginAddress = "127.0.0.1:10005";//测试地址
             PlatformName = result.platformName;
             showGM = int.Parse(result.showGM);

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -2,7 +2,6 @@ namespace GFGGame
 {
     public class ResPathUtil
     {
-        public const string RESIN_TXT_DIR_PATH = "Assets/ResIn/Txt";
 
         public const string FONT_DIR_PATH = "Assets/ResIn/Font";
         public static readonly string UI_DIR_PATH = "Assets/ResIn/UI";
@@ -94,10 +93,6 @@ namespace GFGGame
         {
             return $"{MUSIC_DIR_PATH}/{res}.{extName}";
         }
-        public static string GetTxtPath(string res, string extName = "txt")
-        {
-            return $"{RESIN_TXT_DIR_PATH}/{res}.{extName}";
-        }
         public static string GetFontPath(string res, string extName = "TTF")
         {
             return $"{FONT_DIR_PATH}/{res}.{extName}";

GameClient/Assets/Game/HotUpdate/Views/Login/FullScreenTextView.cs

@@ -1,57 +0,0 @@
-using UnityEngine;
-using FairyGUI;
-using UI.Login;
-
-namespace GFGGame
-{
-    public class FullScreenTextView : BaseWindow
-    {
-        private UI_FullScreenTextUI _ui;
-
-        public override void Dispose()
-        {
-            if (_ui != null)
-            {
-                _ui.Dispose();
-                _ui = null;
-            }
-            base.Dispose();
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-            packageName = UI_FullScreenTextUI.PACKAGE_NAME;
-            _ui = UI_FullScreenTextUI.Create();
-            this.viewCom = _ui.target;
-            this.modal = true;
-            isfullScreen = true;
-
-            _ui.m_btnBack.onClick.Add(this.Hide);
-        }
-
-        protected override void OnShown()
-        {
-            base.OnShown();
-            string content = (string)viewData;
-            _ui.m_txtComp.m_txtContent.text = content;
-            _ui.m_txtComp.target.scrollPane.ScrollTop();
-            Timers.inst.AddUpdate(Update);
-        }
-
-        protected override void OnHide()
-        {
-            base.OnHide();
-            Timers.inst.Remove(Update);
-        }
-
-        private void Update(object param)
-        {
-            if (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.Home))
-            {
-                this.Hide();
-            }
-        }
-
-    }
-}

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -49,14 +49,12 @@ namespace GFGGame
             _ui.m_btnAge.onClick.Add(OnClickBtnAge);
             _ui.m_btnTapLogin.onClick.Add(OnClickBtnStart);
 
-            _ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
-
             _ui.m_btnChange.onClick.Add(OnBtnChangeClick);
 
-            _ui.m_loaEventa.onClick.Add(() => { OnClickRichTextAgreeLink("event:a"); });
-            _ui.m_loaEventb.onClick.Add(() => { OnClickRichTextAgreeLink("event:b"); });
-            _ui.m_loaEventc.onClick.Add(() => { OnClickRichTextAgreeLink("event:c"); });
-            _ui.m_btnAgree.onClick.Add(OnBtnAgreeCklick);
+            _ui.m_loaEventa.onClick.Add(() => { FullScreenTextController.Show("event:a"); });
+            _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
+            _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
+            //_ui.m_btnAgree.onClick.Add(OnBtnAgreeCklick);
 
         }
         protected override void AddEventListener()
@@ -82,7 +80,8 @@ namespace GFGGame
             _ui.m_btnStart.visible = false;
             _ui.m_btnTapLogin.visible = false;
             _ui.m_btnLogout.visible = false;
-            _ui.m_btnAgree.selected = LocalCache.GetBool(GameConst.LAST_LOGIN_IS_AGREE_KEY, false);
+            //_ui.m_btnAgree.selected = LocalCache.GetBool(GameConst.LAST_LOGIN_IS_AGREE_KEY, false);
+            _ui.m_btnAgree.selected = true;
 
             if (QDManager.isInited)
             {
@@ -218,30 +217,9 @@ namespace GFGGame
             ViewManager.Show<SystemNoticeView>(new object[] { LoginController.ageTipsTitle, LoginController.ageTips });
         }
 
-        private void OnClickRichTextAgreeLink(string eventname)
-        {
-            Debug.Log("link target " + eventname);
-            string content = null;
-            switch (eventname)
-            {
-                case "event:a":
-                    content = GFGAsset.Load<TextAsset>(ResPathUtil.GetTxtPath("serviceProtocal")).text;
-                    break;
-                case "event:b":
-                    content = GFGAsset.Load<TextAsset>(ResPathUtil.GetTxtPath("privacyPolicy")).text;
-                    break;
-                case "event:c":
-                    content = GFGAsset.Load<TextAsset>(ResPathUtil.GetTxtPath("privacyPolicyChildren")).text;
-                    break;
-            }
-            if (!string.IsNullOrEmpty(content))
-            {
-                ViewManager.Show<FullScreenTextView>(content);
-            }
-        }
-        private void OnBtnAgreeCklick()
-        {
-            LocalCache.SetBool(GameConst.LAST_LOGIN_IS_AGREE_KEY, _ui.m_btnAgree.selected);
-        }
+        //private void OnBtnAgreeCklick()
+        //{
+        //    LocalCache.SetBool(LauncherConfig.LAST_LOGIN_IS_AGREE_KEY, _ui.m_btnAgree.selected);
+        //}
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Login/RegisterView.cs

@@ -13,9 +13,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            GFGAsset.Release(ResPathUtil.GetTxtPath("serviceProtocal"));
-            GFGAsset.Release(ResPathUtil.GetTxtPath("privacyPolicy"));
-            GFGAsset.Release(ResPathUtil.GetTxtPath("privacyPolicyChildren"));
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -35,9 +32,9 @@ namespace GFGGame
 
             _ui.m_btnSubmit.onClick.Add(OnClickBtnSubmit);
             // _ui.m_richTextAgree.onClickLink.Add(OnClickRichTextAgreeLink);
-            _ui.m_loaEventa.onClick.Add(() => { OnClickRichTextAgreeLink("event:a"); });
-            _ui.m_loaEventb.onClick.Add(() => { OnClickRichTextAgreeLink("event:b"); });
-            _ui.m_loaEventc.onClick.Add(() => { OnClickRichTextAgreeLink("event:c"); });
+            _ui.m_loaEventa.onClick.Add(() => { FullScreenTextController.Show("event:a"); });
+            _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
+            _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
             // _ui.m_btnSendCode.onClick.Add(() => {
             //     
             //     _ui.m_btnSendCode.enabled = false;
@@ -125,26 +122,5 @@ namespace GFGGame
             LoginController.Register(account, password, realName, idNumberStr, CODE).Coroutine();
         }
 
-        private void OnClickRichTextAgreeLink(string eventname)
-        {
-            Debug.Log("link target " + eventname);
-            string content = null;
-            switch (eventname)
-            {
-                case "event:a":
-                    content = GFGAsset.Load<TextAsset>(ResPathUtil.GetTxtPath("serviceProtocal")).text;
-                    break;
-                case "event:b":
-                    content = GFGAsset.Load<TextAsset>(ResPathUtil.GetTxtPath("privacyPolicy")).text;
-                    break;
-                case "event:c":
-                    content = GFGAsset.Load<TextAsset>(ResPathUtil.GetTxtPath("privacyPolicyChildren")).text;
-                    break;
-            }
-            if (!string.IsNullOrEmpty(content))
-            {
-                ViewManager.Show<FullScreenTextView>(content);
-            }
-        }
     }
 }

GameClient/Assets/ResIn/UI/Launcher.meta → GameClient/Assets/Game/Launcher/Controller.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2a3960c316ac3c3409602f7314046c2f
+guid: f19f50f72ed6e4043923fffcb9b5a04e
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/Launcher/Controller/FullScreenTextController.cs

@@ -0,0 +1,34 @@
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class FullScreenTextController
+    {
+        public const string RESIN_TXT_DIR_PATH = "Assets/ResIn/Txt";
+        public static string GetTxtPath(string res, string extName = "txt")
+        {
+            return $"{RESIN_TXT_DIR_PATH}/{res}.{extName}";
+        }
+
+        public static void Show(string eventName)
+        {
+            string content = null;
+            switch (eventName)
+            {
+                case "event:a":
+                    content = GFGAsset.Load<TextAsset>(GetTxtPath("serviceProtocal")).text;
+                    break;
+                case "event:b":
+                    content = GFGAsset.Load<TextAsset>(GetTxtPath("privacyPolicy")).text;
+                    break;
+                case "event:c":
+                    content = GFGAsset.Load<TextAsset>(GetTxtPath("privacyPolicyChildren")).text;
+                    break;
+            }
+            if (!string.IsNullOrEmpty(content))
+            {
+                FullScreenTextView.Instance.Show(content);
+            }
+        }
+    }
+}

GameClient/Assets/Game/Launcher/Controller/FullScreenTextController.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_Component2.cs → GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_Component2.cs

@@ -2,14 +2,14 @@
 
 using FairyGUI;
 
-namespace UI.Login
+namespace UI.Launcher
 {
     public partial class UI_Component2
     {
         public GComponent target;
         public GRichTextField m_txtContent;
-        public const string URL = "ui://myoktu7pu67n4o";
-        public const string PACKAGE_NAME = "Login";
+        public const string URL = "ui://mgs5yrnju67n4o";
+        public const string PACKAGE_NAME = "Launcher";
         public const string RES_NAME = "Component2";
         private static UI_Component2 _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_Component2.cs.meta → GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_Component2.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dbf74c8567d420a459a8899a2d636530
+guid: 7c5ee561b13a85e48b10f397736cd15c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_FullScreenTextUI.cs → GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_FullScreenTextUI.cs

@@ -2,15 +2,15 @@
 
 using FairyGUI;
 
-namespace UI.Login
+namespace UI.Launcher
 {
     public partial class UI_FullScreenTextUI
     {
         public GComponent target;
-        public GButton m_btnBack;
         public UI_Component2 m_txtComp;
-        public const string URL = "ui://myoktu7pu67n4n";
-        public const string PACKAGE_NAME = "Login";
+        public GLoader m_btnBack;
+        public const string URL = "ui://mgs5yrnju67n4n";
+        public const string PACKAGE_NAME = "Launcher";
         public const string RES_NAME = "FullScreenTextUI";
         private static UI_FullScreenTextUI _proxy;
 
@@ -56,14 +56,14 @@ namespace UI.Login
 
         private void Init(GComponent comp)
         {
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtComp = (UI_Component2)UI_Component2.Create(comp.GetChild("txtComp"));
+            m_btnBack = (GLoader)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnBack = null;
             m_txtComp.Dispose();
             m_txtComp = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_FullScreenTextUI.cs.meta → GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_FullScreenTextUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 60adcd7cc59949a4592667fa0d1a77b9
+guid: 09a94da193200594db411ec0622b7ed7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_LauncherAgreeUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Launcher
+{
+    public partial class UI_LauncherAgreeUI
+    {
+        public GComponent target;
+        public GComponent m_bg;
+        public GTextField m_txtContent;
+        public GButton m_btnLeft;
+        public GButton m_btnRight;
+        public GTextField m_txtContent_2;
+        public GLoader m_loaEventa;
+        public GLoader m_loaEventb;
+        public GLoader m_loaEventc;
+        public const string URL = "ui://mgs5yrnjdgkdtjq";
+        public const string PACKAGE_NAME = "Launcher";
+        public const string RES_NAME = "LauncherAgreeUI";
+        private static UI_LauncherAgreeUI _proxy;
+
+        public static UI_LauncherAgreeUI Create(GObject gObject = null)
+        {
+            var ui = new UI_LauncherAgreeUI();
+            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_LauncherAgreeUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_LauncherAgreeUI();
+            }
+            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_bg = (GComponent)comp.GetChild("bg");
+            m_txtContent = (GTextField)comp.GetChild("txtContent");
+            m_btnLeft = (GButton)comp.GetChild("btnLeft");
+            m_btnRight = (GButton)comp.GetChild("btnRight");
+            m_txtContent_2 = (GTextField)comp.GetChild("txtContent");
+            m_loaEventa = (GLoader)comp.GetChild("loaEventa");
+            m_loaEventb = (GLoader)comp.GetChild("loaEventb");
+            m_loaEventc = (GLoader)comp.GetChild("loaEventc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtContent = null;
+            m_btnLeft = null;
+            m_btnRight = null;
+            m_txtContent_2 = null;
+            m_loaEventa = null;
+            m_loaEventb = null;
+            m_loaEventc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_LauncherAgreeUI.cs.meta

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

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -17,6 +17,8 @@ namespace GFGGame
         public static string MUSIC_KEY = "music";
         public const string SQL_FILE_NAME = "excelConfig.sqlite.bytes";
 
+        public const string LAST_LOGIN_IS_AGREE_KEY = "LAST_LOGIN_IS_AGREE_KEY_4";//上次登录是否同意隐私政策
+
         public static string CDN_ROOT;
         public static string loginApiUrl;
         public static string gameApiUrl;

GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GFGGame
+{
+    public class LauncherController
+    {
+
+        public static void AfterVersion()
+        {
+            if (LocalCache.GetBool(LauncherConfig.LAST_LOGIN_IS_AGREE_KEY, false))
+            {
+                StartGame();
+            }
+            else
+            {
+                LauncherView.Instance.SetDesc("");
+                LauncherAgreeView.Instance.Open(() => {
+                    StartGame();
+                });
+            }
+        }
+
+        public static void StartGame()
+        {
+            LauncherView.Instance.SetDesc($"正在启动游戏...");
+            LauncherView.Instance.SetProgress(100, () =>
+            {
+                HotUpdateCodeLoader.Instance.StartLoad();
+            });
+        }
+    }
+}

GameClient/Assets/Game/Launcher/LauncherController.cs.meta

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

GameClient/Assets/Game/Launcher/Version/VersionController.cs

@@ -136,11 +136,7 @@ namespace GFGGame
             {
                 updateVersions.Override();
             }
-            LauncherView.Instance.SetDesc($"正在启动游戏...");
-            LauncherView.Instance.SetProgress(100, () =>
-            {
-                HotUpdateCodeLoader.Instance.StartLoad();
-            });
+            LauncherController.AfterVersion();
         }
 
     }

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

@@ -28,7 +28,7 @@ namespace GFGGame.Launcher
             return _alertWindow;
         }
 
-        public static void hide()
+        public static void Hide()
         {
             if (_alertWindow != null)
             {

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

@@ -0,0 +1,75 @@
+using UnityEngine;
+using FairyGUI;
+using UI.Launcher;
+
+namespace GFGGame
+{
+    public class FullScreenTextView
+    {
+        private static FullScreenTextView m_Instance = null;
+        /// <summary>
+        /// µ¥Àý
+        /// </summary>
+        public static FullScreenTextView Instance
+        {
+            get
+            {
+                if (m_Instance == null)
+                {
+                    m_Instance = new FullScreenTextView();
+                }
+                return m_Instance;
+            }
+        }
+        private UI_FullScreenTextUI _ui;
+        /// <summary>
+        /// FairyGUI°üÃû
+        /// </summary>
+        private string _packageName;
+
+
+        public void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+        }
+
+        public FullScreenTextView()
+        {
+            _packageName = UI_FullScreenTextUI.PACKAGE_NAME;
+            _ui = UI_FullScreenTextUI.Create();
+            UIPackage.AddPackage("UI/" + _packageName + "/" + _packageName);
+            _ui = UI_FullScreenTextUI.Create();
+            _ui.target.MakeFullScreen();
+            _ui.target.AddRelation(GRoot.inst, RelationType.Size);
+
+            _ui.m_btnBack.onClick.Add(this.Hide);
+        }
+
+        public void Show(string content)
+        {
+            GRoot.inst.AddChild(_ui.target);
+            _ui.m_txtComp.m_txtContent.text = content;
+            _ui.m_txtComp.target.scrollPane.ScrollTop();
+            Timers.inst.AddUpdate(Update);
+        }
+
+        public void Hide()
+        {
+            Timers.inst.Remove(Update);
+            _ui.target.RemoveFromParent();
+        }
+
+        private void Update(object param)
+        {
+            if (Input.GetKeyDown(KeyCode.Escape) || Input.GetKeyDown(KeyCode.Home))
+            {
+                this.Hide();
+            }
+        }
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Login/FullScreenTextView.cs.meta → GameClient/Assets/Game/Launcher/Views/FullScreenTextView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 992f0e802eff86342b3871b9b566f141
+guid: 70f0b9ff70055444b865731912aa559c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -0,0 +1,71 @@
+using System;
+using FairyGUI;
+using UI.Launcher;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class LauncherAgreeView : Window
+    {
+
+        private static LauncherAgreeView m_Instance = null;
+        /// <summary>
+        /// 单例
+        /// </summary>
+        public static LauncherAgreeView Instance
+        {
+            get
+            {
+                if (m_Instance == null)
+                {
+                    m_Instance = new LauncherAgreeView();
+                }
+                return m_Instance;
+            }
+        }
+
+        private Action _onHideCallback;
+        public void Open(Action onHide)
+        {
+            _onHideCallback = onHide;
+            Show();
+        }
+
+        private UI_LauncherAgreeUI _ui;
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_LauncherAgreeUI.Create();
+            this.contentPane = _ui.target;
+            this.Center();
+            //this.modal = true;
+
+            _ui.m_btnLeft.onClick.Add(() =>
+            {
+                this.Hide();
+                Application.Quit();
+            });
+            _ui.m_btnRight.onClick.Add(() =>
+            {
+                this.Hide();
+                LocalCache.SetBool(LauncherConfig.LAST_LOGIN_IS_AGREE_KEY, true);
+                _onHideCallback?.Invoke();
+            });
+            _ui.m_loaEventa.onClick.Add(() => { FullScreenTextController.Show("event:a"); });
+            _ui.m_loaEventb.onClick.Add(() => { FullScreenTextController.Show("event:b"); });
+            _ui.m_loaEventc.onClick.Add(() => { FullScreenTextController.Show("event:c"); });
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+    }
+}

GameClient/Assets/Game/Launcher/Views/LauncherAgreeView.cs.meta

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

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

@@ -170,7 +170,6 @@ namespace GFGGame
             _ui.m_txtDescRight.text = "";
             GRoot.inst.AddChild(_ui.target);
             isOpen = true;
-            _ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
         }
 
         /// <summary>

GameClient/Assets/ResIn/UI/Launcher/Launcher_atlas0!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 4b176f0aea39ffc4fbfe989b846fa60a
-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/ResIn/UI/Launcher/Launcher_atlas0.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: c9cb89e10f367ab48a484993ec4efb10
-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/ResIn/UI/Launcher/Launcher_atlas_bp8xu!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 1d0bb1247af0a0b4a80f87be131739ff
-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/ResIn/UI/Launcher/Launcher_atlas_bp8xu.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 45cda5f3c6b629541b2e20882c105134
-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/ResIn/UI/Launcher/Launcher_atlas_ul4p6.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 2e453330ab00a074aaa759740d3a7583
-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/ResIn/UI/Launcher/Launcher_fui.bytes.meta

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