zhaoyang 3 gadi atpakaļ
vecāks
revīzija
4bfdf1872a

+ 3 - 0
FGUIProject/assets/Login/LoginUI.xml

@@ -25,5 +25,8 @@
     <component id="n12_pcul" name="btnChange" src="pcul5f" fileName="components/Button4.xml" xy="211,1336">
     <component id="n12_pcul" name="btnChange" src="pcul5f" fileName="components/Button4.xml" xy="211,1336">
       <relation target="" sidePair="center-center,bottom-bottom"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
     </component>
+    <component id="n13_es2q" name="btnAge" src="es2q5i" fileName="components/Button5.xml" xy="940,1756">
+      <relation target="" sidePair="right-right,bottom-bottom"/>
+    </component>
   </displayList>
   </displayList>
 </component>
 </component>

+ 10 - 0
FGUIProject/assets/Login/components/Button5.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="140,164" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_es2q" name="n0" src="es2q5h" fileName="images/shilingts.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button/>
+</component>

BIN
FGUIProject/assets/Login/images/shilingts.png


+ 2 - 0
FGUIProject/assets/Login/package.xml

@@ -42,6 +42,8 @@
     <component id="pcul5e" name="Button3.xml" path="/components/"/>
     <component id="pcul5e" name="Button3.xml" path="/components/"/>
     <component id="pcul5f" name="Button4.xml" path="/components/"/>
     <component id="pcul5f" name="Button4.xml" path="/components/"/>
     <component id="hmrw5g" name="ComContent.xml" path="/components/"/>
     <component id="hmrw5g" name="ComContent.xml" path="/components/"/>
+    <image id="es2q5h" name="shilingts.png" path="/images/"/>
+    <component id="es2q5i" name="Button5.xml" path="/components/"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Login" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Login" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 4 - 2
GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -5,6 +5,8 @@ namespace GFGGame
 {
 {
     public class LoginController
     public class LoginController
     {
     {
+        public static string ageTipsTitle = "适龄提示说明";
+        public static string ageTips = "1)本游戏是一款角色扮演类游戏,适用于年满16周岁及以上的用户,建议未成年人在家长监护下使用游戏产品。\n2)本游戏基于架空的故事背景和幻想世界观,剧情简单且积极向上,没有基于真实历史和现实事件的改编内容游戏玩法以收集不同服装进行搭配展开,有较为简单的竞技和对抗玩法,游戏中有基于文字的陌生人社交系统。\n3)本游戏中有用户实名认证系统,认证为未成年人的用户将接受以下管理:游戏中部分玩法和道具需要付费。未满8周岁的用户不能付费; 8周岁以上未满16周岁的未成年人用户,单次充值金额不得超过50元人民币,每月充值金额累计不得超过200元人民币; 16周岁以上的未成年人用户,单次充值金额不得超过100元人民币,每月充值金额累计不得超过400元人民币。\n4)本游戏以服装收集及搭配为主要玩法,有助于玩家开阔眼界、进一步提升审美能力。游戏中很多服装融入了中华传统元素,可以有助于中华传统文化的传播,体验中国的古典美。";
         public static void ShowLogin()
         public static void ShowLogin()
         {
         {
             LauncherView.Instance.Close();
             LauncherView.Instance.Close();
@@ -107,7 +109,7 @@ namespace GFGGame
                 Debug.Log("noticeTime:" + noticeTime + "  currentTime:" + currentTime);
                 Debug.Log("noticeTime:" + noticeTime + "  currentTime:" + currentTime);
                 if ((currentTime - noticeTime) / TimeUtil.SECOND_PER_DAY < 3)
                 if ((currentTime - noticeTime) / TimeUtil.SECOND_PER_DAY < 3)
                 {
                 {
-                    ViewManager.Show<SystemNoticeView>();
+                    ViewManager.Show<SystemNoticeView>(new object[] { NoticeDataManager.Instance.LastNoticeInfo.title, NoticeDataManager.Instance.LastNoticeInfo.content });
                 }
                 }
             }
             }
             return;
             return;
@@ -217,7 +219,7 @@ namespace GFGGame
             ViewManager.Show<LoadingView>();
             ViewManager.Show<LoadingView>();
             // LoadingView.Instance.Open();
             // LoadingView.Instance.Open();
             LoadingView.Instance.SetProgress(99);
             LoadingView.Instance.SetProgress(99);
-             LoadingView.Instance.SetDesc("正在进入游戏");
+            LoadingView.Instance.SetDesc("正在进入游戏");
             LogServerHelperHttp.SendNodeLog((int)LogNode.StartEnterGame);
             LogServerHelperHttp.SendNodeLog((int)LogNode.StartEnterGame);
             int errorCode = await LoginHelper.GetRealmKey(GameGlobal.zoneScene);
             int errorCode = await LoginHelper.GetRealmKey(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)
             if (errorCode != ErrorCode.ERR_Success)

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Login/UI_LoginUI.cs

@@ -14,6 +14,7 @@ namespace UI.Login
         public GButton m_btnLogout;
         public GButton m_btnLogout;
         public GButton m_btnStart;
         public GButton m_btnStart;
         public GButton m_btnChange;
         public GButton m_btnChange;
+        public GButton m_btnAge;
         public const string URL = "ui://myoktu7pl55o0";
         public const string URL = "ui://myoktu7pl55o0";
         public const string PACKAGE_NAME = "Login";
         public const string PACKAGE_NAME = "Login";
         public const string RES_NAME = "LoginUI";
         public const string RES_NAME = "LoginUI";
@@ -68,6 +69,7 @@ namespace UI.Login
             m_btnLogout = (GButton)comp.GetChild("btnLogout");
             m_btnLogout = (GButton)comp.GetChild("btnLogout");
             m_btnStart = (GButton)comp.GetChild("btnStart");
             m_btnStart = (GButton)comp.GetChild("btnStart");
             m_btnChange = (GButton)comp.GetChild("btnChange");
             m_btnChange = (GButton)comp.GetChild("btnChange");
+            m_btnAge = (GButton)comp.GetChild("btnAge");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -78,6 +80,7 @@ namespace UI.Login
             m_btnLogout = null;
             m_btnLogout = null;
             m_btnStart = null;
             m_btnStart = null;
             m_btnChange = null;
             m_btnChange = null;
+            m_btnAge = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 6 - 1
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -39,6 +39,7 @@ namespace GFGGame
             _ui.m_btnNotice.onClick.Add(OnClickBtnNotice);
             _ui.m_btnNotice.onClick.Add(OnClickBtnNotice);
             _ui.m_btnStart.onClick.Add(OnClickBtnStart);
             _ui.m_btnStart.onClick.Add(OnClickBtnStart);
             _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
             _ui.m_btnLogout.onClick.Add(OnClickBtnLogout);
+            _ui.m_btnAge.onClick.Add(OnClickBtnAge);
 
 
             _ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
             _ui.m_imgLogo.visible = LauncherConfig.netType != LauncherConfig.EnumNetType.TEMP;
 
 
@@ -114,7 +115,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("暂无公告发布");
                 PromptController.Instance.ShowFloatTextPrompt("暂无公告发布");
                 return;
                 return;
             }
             }
-            ViewManager.Show<SystemNoticeView>();
+            ViewManager.Show<SystemNoticeView>(new object[] { NoticeDataManager.Instance.LastNoticeInfo.title, NoticeDataManager.Instance.LastNoticeInfo.content });
         }
         }
 
 
         private async void OnClickBtnStart()
         private async void OnClickBtnStart()
@@ -137,5 +138,9 @@ namespace GFGGame
         {
         {
             GameController.QuitToLoginView(true);
             GameController.QuitToLoginView(true);
         }
         }
+        private void OnClickBtnAge()
+        {
+            ViewManager.Show<SystemNoticeView>(new object[] { LoginController.ageTipsTitle, LoginController.ageTips });
+        }
     }
     }
 }
 }

+ 5 - 2
GameClient/Assets/Game/HotUpdate/Views/Login/SystemNoticeView.cs

@@ -20,13 +20,16 @@ namespace GFGGame
             this.viewCom.Center();
             this.viewCom.Center();
             this.modal = true;
             this.modal = true;
 
 
-            _ui.m_txtTitle.text = NoticeDataManager.Instance.LastNoticeInfo.title;
-            _ui.m_comContent.m_txtContent.text = NoticeDataManager.Instance.LastNoticeInfo.content;
+
         }
         }
 
 
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
+            string title = (this.viewData as object[])[0].ToString();
+            string content = (this.viewData as object[])[1].ToString();
+            _ui.m_txtTitle.text = title;
+            _ui.m_comContent.m_txtContent.text = content;
         }
         }
 
 
         protected override void OnHide()
         protected override void OnHide()

BIN
GameClient/Assets/ResIn/UI/Login/Login_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Login/Login_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Login/Login_fui.bytes