Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

FGUIProject/assets/Launcher/HealthAdviceUI.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <image id="n0_l55o" name="bg" src="bp8xu" fileName="images/jkgg.png" xy="0,-240" size="1080,2400">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+  </displayList>
+</component>

FGUIProject/assets/Launcher/LauncherUI.xml

@@ -10,9 +10,6 @@
     <image id="n6_lqt1" name="imgLogo" src="lqt1a" fileName="imagesExport/LOGO.png" xy="31,45" visible="false">
       <relation target="" sidePair="left-left,top-top"/>
     </image>
-    <text id="n8_lqt1" name="txtBottom" xy="41,1787" size="1000,71" visible="false" fontSize="26" color="#eaeaea" align="center" autoSize="none" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
-      <relation target="" sidePair="bottom-bottom"/>
-    </text>
     <text id="n9_v0op" name="txtDescRight" xy="90,1840" size="900,44" visible="false" fontSize="32" color="#ffffff" align="center" autoSize="none" strokeColor="#333333" autoClearText="true" text="1/1">
       <relation target="" sidePair=""/>
     </text>

FGUIProject/assets/Launcher/package.xml

@@ -26,6 +26,8 @@
     <image id="slyzr" name="dljm_jdq_1.png" path="/images/"/>
     <component id="slyzs" name="Component1.xml" path="/components/"/>
     <component id="slyzt" name="ProgressBar2.xml" path="/components/"/>
+    <image id="bp8xu" name="jkgg.png" path="/images/" atlas="alone_npot"/>
+    <component id="bp8xv" name="HealthAdviceUI.xml" path="/" exported="true"/>
   </resources>
   <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/LoginUI.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <text id="n2_ul4p" name="txtBottom" xy="40,1751" size="1000,71" fontSize="24" color="#fff9f1" align="center" autoSize="none" text="抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。&#xA;适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。">
+    <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">

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/ConstValue.cs

@@ -1,10 +0,0 @@
-using GFGGame;
-namespace ET
-{
-    public static class ConstValue
-    {
-        //public static string LoginAddress = "10.108.64.190:10005";
-        public static string LoginAddress = LauncherConfig.loginApiUrl;
-        //public static string LoginAddress = "127.0.0.1:10005";
-    }
-}

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -16,6 +16,7 @@ namespace GFGGame
             ET.Log.Debug($"gamecfg \n{json}");
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
+            //LoginAddress = "10.108.64.127:10005";
             PlatformName = result.platformName;
         }
 

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Launcher
+{
+    public partial class UI_HealthAdviceUI
+    {
+        public GComponent target;
+        public GImage m_bg;
+        public const string URL = "ui://mgs5yrnjbp8xv";
+        public const string PACKAGE_NAME = "Launcher";
+        public const string RES_NAME = "HealthAdviceUI";
+        private static UI_HealthAdviceUI _proxy;
+
+        public static UI_HealthAdviceUI Create(GObject gObject = null)
+        {
+            var ui = new UI_HealthAdviceUI();
+            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_HealthAdviceUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_HealthAdviceUI();
+            }
+            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 = (GImage)comp.GetChild("bg");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/ConstValue.cs.meta → GameClient/Assets/Game/Launcher/FairyGUI/GenCode/Launcher/UI_HealthAdviceUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eaec1cdcafdd7a247af11d0e26ff2033
+guid: 8e8728f923c260548a33cac00c9468d9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -10,7 +10,6 @@ namespace UI.Launcher
         public GImage m_bg;
         public GTextField m_txtVersion;
         public GImage m_imgLogo;
-        public GTextField m_txtBottom;
         public GTextField m_txtDescRight;
         public GProgressBar m_progressBar1;
         public GGraph m_holder;
@@ -66,7 +65,6 @@ namespace UI.Launcher
             m_bg = (GImage)comp.GetChild("bg");
             m_txtVersion = (GTextField)comp.GetChild("txtVersion");
             m_imgLogo = (GImage)comp.GetChild("imgLogo");
-            m_txtBottom = (GTextField)comp.GetChild("txtBottom");
             m_txtDescRight = (GTextField)comp.GetChild("txtDescRight");
             m_progressBar1 = (GProgressBar)comp.GetChild("progressBar1");
             m_holder = (GGraph)comp.GetChild("holder");
@@ -78,7 +76,6 @@ namespace UI.Launcher
             m_bg = null;
             m_txtVersion = null;
             m_imgLogo = null;
-            m_txtBottom = null;
             m_txtDescRight = null;
             m_progressBar1 = null;
             m_holder = null;

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -4,7 +4,7 @@ namespace GFGGame
 {
     public class LauncherConfig
     {
-        public enum EnumNetType { DEV, LOCAL, TEMP }
+        public enum EnumNetType { DEV, LOCAL, TEMP, TISHEN }
         public static EnumNetType netType = EnumNetType.LOCAL;
         public static string cfgName;
 
@@ -65,7 +65,6 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
             //CDN_ROOT = "http://10.108.64.127/";
-            LauncherConfig.loginApiUrl = result.loginApiUrl;
             LauncherConfig.logApiUrl = result.logApiUrl;
             LauncherConfig.logKey = result.logKey;
             LauncherConfig.apkVersion = result.apkVersion;
@@ -79,7 +78,6 @@ namespace GFGGame
         private struct Result
         {
             public string cdnRoot;
-            public string loginApiUrl;
             public string logApiUrl;
             public string logKey;
             public string apkVersion;

GameClient/Assets/ResIn/Txt/serviceProtocal.txt

@@ -242,7 +242,7 @@
 
 （10）暂停或终止您使用游戏及相关服务，或单方通知您终止本协议；及/或
 
-（11）就您的违法违规行为提起相应民事诉讼，追究您的侵权、违约或其他民事责任，并要求您赔偿公司因您违法违规行为所受到的损失（包括公司所受到的直接经济损失、名誉或商誉损失以及公司对外支付的赔偿金、和解费用、律师费用、诉讼费用及其他间接损失），或移交有关行政管理机关给予行政处罚，或者移交司法机关追究您的刑事责任；及/或
+（11）就您的违法违规行为提起相应民事诉讼，追究您的侵权、违约或其他民事责任，并要求您赔偿公司因您违法违规行为所受到的损失（包括公司所受到的直接经济损失、名誉或商誉损失以及公司对外支付的赔偿金、和解费用、律师费用、诉讼费用及其他间接损失），或移交有关行政管理机关给予行政处罚，或者移交司法机关追究您的刑事责任；
 
 （12）通过游戏规则（包括但不限于用户守则、玩家条例、游戏公告、提示及通知）公布的其他处理措施。
 
@@ -282,4 +282,4 @@
 
 10.1 有权在必要时变更本协议条款，您可以在游戏的相关页面查阅最新版本的协议条款。本协议条款变更后，如果您继续使用游戏服务，即视为您已接受变更后的协议。
 
-10.2根据国家新闻出版总署关于健康游戏的忠告，提醒您：抵制不良游戏，拒绝盗版游戏；注意自我保护，谨防受骗上当；适度游戏益脑，沉迷游戏伤身。
+10.2根据国家新闻出版总署关于健康游戏的忠告，提醒您：抵制不良游戏，拒绝盗版游戏；注意自我保护，谨防受骗上当；适度游戏益脑，沉迷游戏伤身；合理安排时间，享受健康生活。

GameClient/Assets/Resources/UI/Launcher/Launcher_atlas_bp8xu!a.png.meta

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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 07eddc8ce7afa0d4d977f2cf621f4715
+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: