修改副本工作室UI

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle8.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.InstanceZones
-{
-    public partial class UI_ButtonModle8
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GLoader m_icon1;
-        public GGraph m_holder1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://ez8qotvcjx6zpc";
-        public const string PACKAGE_NAME = "InstanceZones";
-        public const string RES_NAME = "ButtonModle8";
-        private static UI_ButtonModle8 _proxy;
-
-        public static UI_ButtonModle8 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle8();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonModle8 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle8();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_icon1 = null;
-            m_holder1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle9.cs

@@ -7,8 +7,8 @@ namespace UI.InstanceZones
     public partial class UI_ButtonModle9
     {
         public GButton target;
+        public Controller m_type;
         public GGraph m_holder;
-        public GLoader m_icon1;
         public GGraph m_holder1;
         public GLoader m_loaLockIcon;
         public const string URL = "ui://ez8qotvcjx6zpd";
@@ -58,15 +58,15 @@ namespace UI.InstanceZones
 
         private void Init(GComponent comp)
         {
+            m_type = comp.GetController("type");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_type = null;
             m_holder = null;
-            m_icon1 = null;
             m_holder1 = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs

@@ -13,12 +13,9 @@ namespace UI.InstanceZones
         public UI_ButtonModle7 m_btn1;
         public UI_ButtonModle9 m_btnStudio;
         public UI_ButtonModle9 m_btnTravel;
-        public UI_ButtonModle8 m_btnPoem;
+        public UI_ButtonModle9 m_btnPoem;
         public UI_ButtonModle9 m_btnField;
-        public UI_ButtonModle8 m_btnArena;
-        public GGroup m_grpRight;
-        public GLoader m_loaGuidestudio;
-        public Transition m_t0;
+        public UI_ButtonModle9 m_btnArena;
         public const string URL = "ui://ez8qotvcyeocfv0";
         public const string PACKAGE_NAME = "InstanceZones";
         public const string RES_NAME = "InstanceZonesUI";
@@ -72,12 +69,9 @@ namespace UI.InstanceZones
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
             m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
             m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
-            m_btnPoem = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnPoem"));
+            m_btnPoem = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnPoem"));
             m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
-            m_btnArena = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnArena"));
-            m_grpRight = (GGroup)comp.GetChild("grpRight");
-            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
-            m_t0 = comp.GetTransition("t0");
+            m_btnArena = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnArena"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,9 +90,6 @@ namespace UI.InstanceZones
             m_btnField = null;
             m_btnArena.Dispose();
             m_btnArena = null;
-            m_grpRight = null;
-            m_loaGuidestudio = null;
-            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -196,7 +196,17 @@ namespace GFGGame
         private void UpdateButton(GObject obj, int itemId)
         {
             UI_ButtonInValueBar button = UI_ButtonInValueBar.Proxy(obj);
-            button.target.text = "" + ItemDataManager.GetItemNum(itemId);
+
+            // 体力特殊处理
+            if(itemId == ConstItemID.POWER)
+            {
+                button.target.text = string.Format("{0}/{1}", RoleDataManager.power, RoleDataManager.powerLimit);
+            }
+            else
+            {
+                button.target.text = "" + ItemDataManager.GetItemNum(itemId);
+            }
+            
             button.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
             switch (itemId)
             {

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs → GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -3,10 +3,11 @@ using System.Collections;
 using UnityEngine;
 using FairyGUI;
 using UI.InstanceZones;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
-    public class InstanceZonesUIView : BaseView
+    public class InstanceZonesView : BaseView
     {
         private UI_InstanceZonesUI _ui;
         private ValueBarController _valueBarController;
@@ -44,13 +45,14 @@ namespace GFGGame
             _ui.m_btnField.target.onClick.Add(OnClickBtnField);
             _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hzs_bg");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() { ConstItemID.POWER });
             CheckFunOpen();
             UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
@@ -91,9 +93,9 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             _valueBarController.UpdateRedPoint();
-            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -126, 22);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -152, 85);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -103, 43);
         }
 
         private void CheckFunOpen()

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle8.cs.meta → GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0b32a0a44e5817040aa1af8372defda8
+guid: 6c1ceb0004f4a10478c35a357faf892c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -278,7 +278,7 @@ namespace GFGGame
         private void OnClickBtnInstanceZones()
         {
             TryCompleteGuide();
-            ViewManager.Show<InstanceZonesUIView>();
+            ViewManager.Show<InstanceZonesView>();
         }
 
         private void OnBtnChangClick()