日志按钮

GameClient/Assets/Game/HotUpdate/Controller/LogController.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UI.Common;
 using System;
+using static GFGGame.LauncherConfig;
 
 namespace GFGGame
 {
@@ -20,10 +21,15 @@ namespace GFGGame
 
         public void Init()
         {
+
             msgDic.Add(_all, new List<string>());
             msgDic.Add(_error, new List<string>());
             msgDic.Add(_log, new List<string>());
-            this.CreatBtnLog();
+            if (LauncherConfig.netType == EnumNetType.LOCAL)
+            {
+                this.CreatBtnLog();
+            }
+
             this.AddMsgListener();
         }
         public void AddMsgListener()
@@ -63,7 +69,10 @@ namespace GFGGame
 
                     _btnLog.m_c1.selectedIndex = 1;
                     _btnLog.target.alpha = 1;
-                    this.SetBtnLogVisable(true);
+                    if (LauncherConfig.netType == EnumNetType.LOCAL)
+                    {
+                        this.SetBtnLogVisable(true);
+                    }
                     break;
                 case LogType.Log:
                     if (msgDic[_all].Count == _maxCount)

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

@@ -10,6 +10,7 @@ namespace UI.CommonGame
         public GLoader m_loaIcon;
         public GTextField m_txtName;
         public GImage m_imgGot;
+        public GImage m_imgNotGot;
         public GTextField m_txtHasCount;
         public GLoader m_loaRarity;
         public GLoader m_loaShouTongReward;
@@ -65,6 +66,7 @@ namespace UI.CommonGame
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_imgGot = (GImage)comp.GetChild("imgGot");
+            m_imgNotGot = (GImage)comp.GetChild("imgNotGot");
             m_txtHasCount = (GTextField)comp.GetChild("txtHasCount");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaShouTongReward = (GLoader)comp.GetChild("loaShouTongReward");
@@ -76,6 +78,7 @@ namespace UI.CommonGame
             m_loaIcon = null;
             m_txtName = null;
             m_imgGot = null;
+            m_imgNotGot = null;
             m_txtHasCount = null;
             m_loaRarity = null;
             m_loaShouTongReward = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListSuitPartsItem.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.FieldGuide
-{
-    public partial class UI_ListSuitPartsItem
-    {
-        public GComponent target;
-        public GLoader m_icon;
-        public GTextField m_txtName;
-        public GImage m_imgLockBg;
-        public GImage m_imgLock;
-        public const string URL = "ui://vqq9h9h4pjip19";
-        public const string PACKAGE_NAME = "FieldGuide";
-        public const string RES_NAME = "ListSuitPartsItem";
-        private static UI_ListSuitPartsItem _proxy;
-
-        public static UI_ListSuitPartsItem Create(GObject gObject = null)
-        {
-            var ui = new UI_ListSuitPartsItem();
-            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_ListSuitPartsItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListSuitPartsItem();
-            }
-            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_icon = (GLoader)comp.GetChild("icon");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_icon = null;
-            m_txtName = null;
-            m_imgLockBg = null;
-            m_imgLock = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ListSuitPartsItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/MainUI/RoleInfoView.cs

@@ -10,7 +10,7 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            if(_ui != null)
+            if (_ui != null)
             {
                 _ui.Dispose();
             }
@@ -33,10 +33,7 @@ namespace GFGGame
             _ui.m_btnSound.onClick.Add(OnClickBtnSound);
             _ui.m_btnMusic.onClick.Add(OnClickBtnMusic);
             _ui.m_btnHelp.onClick.Add(OnClickBtnHelp);
-            if(LauncherConfig.netType != EnumNetType.LOCAL)
-            {
-                _ui.m_btnHelp.visible = false;
-            }
+
         }
 
         protected override void OnShown()
@@ -45,7 +42,7 @@ namespace GFGGame
             _ui.m_txtRoleName.text = RoleDataManager.roleName;
             _ui.m_txtLvl.text = "" + GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
             RoleLevelCfg roleLevelCfg = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
-            if(roleLevelCfg.exp > 0)
+            if (roleLevelCfg.exp > 0)
             {
                 _ui.m_proBarExp.value = GameGlobal.myNumericComponent.GetAsInt(NumericType.Exp);
                 _ui.m_proBarExp.max = roleLevelCfg.exp;
@@ -68,7 +65,8 @@ namespace GFGGame
         {
             Alert.Show("确认返回登录页吗？")
                 .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) => {
+                .SetRightButton(true, "确认", (object data) =>
+                {
                     GameController.QuitToLoginView(false);
                 });
         }
@@ -77,7 +75,8 @@ namespace GFGGame
         {
             Alert.Show("确认注销当前账号吗？")
                 .SetLeftButton(true)
-                .SetRightButton(true, "确认", (object data) => {
+                .SetRightButton(true, "确认", (object data) =>
+                {
                     GameController.QuitToLoginView(true);
                 });
         }
@@ -96,7 +95,14 @@ namespace GFGGame
 
         private void OnClickBtnHelp()
         {
-            ViewManager.Show(ViewName.GM_PANEL_VIEW);
+            if (LauncherConfig.netType == EnumNetType.LOCAL)
+            {
+                ViewManager.Show(ViewName.GM_PANEL_VIEW);
+            }
+            else
+            {
+                ViewManager.Show(ViewName.LOG_VIEW);
+            }
         }
 
     }