소스 검색

主界面UI更改

leiyasi 1 년 전
부모
커밋
bf7aa5f2bc
26개의 변경된 파일92개의 추가작업 그리고 141개의 파일을 삭제
  1. 6 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle.cs
  2. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle2.cs
  3. 15 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle1.cs
  4. 1 1
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeStar.cs
  5. 0 80
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs
  6. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs.meta
  7. 29 20
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  8. 38 26
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  9. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  10. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  11. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  12. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  14. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  16. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  18. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  20. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  22. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  24. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  25. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 6 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle.cs

@@ -8,6 +8,8 @@ namespace UI.Main
     {
         public GButton target;
         public Controller m_c1;
+        public Controller m_c2;
+        public GImage m_min;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
         public const string URL = "ui://mfvz4q8kvolso9";
@@ -58,12 +60,16 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_min = (GImage)comp.GetChild("min");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
+            m_min = null;
             m_txtTime = null;
             m_grpTime = null;
             if(disposeTarget && target != null)

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_BtnModle2.cs

@@ -7,8 +7,8 @@ namespace UI.Main
     public partial class UI_BtnModle2
     {
         public GButton target;
+        public Controller m_c1;
         public GTextField m_txtTime;
-        public GGroup m_grpTime;
         public const string URL = "ui://mfvz4q8kt6j1ow";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "BtnModle2";
@@ -56,13 +56,13 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_txtTime = null;
-            m_grpTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 15 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle1.cs

@@ -7,9 +7,14 @@ namespace UI.Main
     public partial class UI_ButtonModle1
     {
         public GButton target;
+        public Controller m_c1;
+        public GLoader m_icon0;
         public GGraph m_holder;
         public GGraph m_holder1;
+        public GLoader m_icon1;
         public GLoader m_loaLockIcon;
+        public GLoader m_loaLockIcon2;
+        public GGroup m_loaLockIcons;
         public const string URL = "ui://mfvz4q8kq08xu";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ButtonModle1";
@@ -57,15 +62,25 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
+            m_icon0 = (GLoader)comp.GetChild("icon0");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
+            m_loaLockIcon2 = (GLoader)comp.GetChild("loaLockIcon2");
+            m_loaLockIcons = (GGroup)comp.GetChild("loaLockIcons");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
+            m_icon0 = null;
             m_holder = null;
             m_holder1 = null;
+            m_icon1 = null;
             m_loaLockIcon = null;
+            m_loaLockIcon2 = null;
+            m_loaLockIcons = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComDodgeStar.cs

@@ -8,7 +8,7 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_lightType;
-        public const string URL = "ui://mfvz4q8ks5lgfsv";
+        public const string URL = "ui://mfvz4q8km3wmftp";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComDodgeStar";
         private static UI_ComDodgeStar _proxy;

+ 0 - 80
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_Component7
-    {
-        public GComponent target;
-        public Controller m_c1;
-        public GLoader m_loaRight;
-        public GGraph m_holder;
-        public Transition m_t0;
-        public const string URL = "ui://mfvz4q8kweokii";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "Component7";
-        private static UI_Component7 _proxy;
-
-        public static UI_Component7 Create(GObject gObject = null)
-        {
-            var ui = new UI_Component7();
-            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_Component7 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_Component7();
-            }
-            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_c1 = comp.GetController("c1");
-            m_loaRight = (GLoader)comp.GetChild("loaRight");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_t0 = comp.GetTransition("t0");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_c1 = null;
-            m_loaRight = null;
-            m_holder = null;
-            m_t0 = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component7.cs.meta

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

+ 29 - 20
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -8,14 +8,9 @@ namespace UI.Main
     {
         public GComponent target;
         public GComponent m_valueBar;
-        public UI_ComponentHeadBar m_headBar;
-        public UI_BtnModle m_btnFirstRecharge;
-        public UI_BtnModle m_btnGiftBag1;
-        public UI_BtnModle m_btnGiftBag2;
         public GGroup m_grpLeagueAnswer;
         public GList m_list;
         public UI_ButtonChange m_btnChange;
-        public UI_Component7 m_loaRight;
         public GGroup m_grpList;
         public UI_ComAd m_comListAd;
         public UI_BtnModle1 m_btnDailyWelfare;
@@ -26,6 +21,14 @@ namespace UI.Main
         public UI_ButtonModle1 m_btnXiuFang;
         public UI_ButtonModle1 m_btnCiPai;
         public UI_ButtonModle1 m_btnZhaiXing;
+        public UI_ButtonModle1 m_btnHaiZhiShi;
+        public GGraph m_BottomEffectHolder;
+        public UI_BtnModle m_btnFirstRecharge;
+        public UI_BtnModle m_btnGiftBag1;
+        public UI_BtnModle m_btnGiftBag2;
+        public UI_ComponentHeadBar m_headBar;
+        public GButton m_btnYouJian;
+        public GButton m_btnGongGao;
         public GGroup m_grpLeft;
         public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
@@ -90,14 +93,9 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
-            m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
-            m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
-            m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
             m_list = (GList)comp.GetChild("list");
             m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_loaRight = (UI_Component7)UI_Component7.Create(comp.GetChild("loaRight"));
             m_grpList = (GGroup)comp.GetChild("grpList");
             m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
             m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
@@ -108,6 +106,14 @@ namespace UI.Main
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
             m_btnCiPai = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnCiPai"));
             m_btnZhaiXing = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnZhaiXing"));
+            m_btnHaiZhiShi = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHaiZhiShi"));
+            m_BottomEffectHolder = (GGraph)comp.GetChild("BottomEffectHolder");
+            m_btnFirstRecharge = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnFirstRecharge"));
+            m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
+            m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
+            m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
+            m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
+            m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -128,20 +134,10 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_valueBar = null;
-            m_headBar.Dispose();
-            m_headBar = null;
-            m_btnFirstRecharge.Dispose();
-            m_btnFirstRecharge = null;
-            m_btnGiftBag1.Dispose();
-            m_btnGiftBag1 = null;
-            m_btnGiftBag2.Dispose();
-            m_btnGiftBag2 = null;
             m_grpLeagueAnswer = null;
             m_list = null;
             m_btnChange.Dispose();
             m_btnChange = null;
-            m_loaRight.Dispose();
-            m_loaRight = null;
             m_grpList = null;
             m_comListAd.Dispose();
             m_comListAd = null;
@@ -161,6 +157,19 @@ namespace UI.Main
             m_btnCiPai = null;
             m_btnZhaiXing.Dispose();
             m_btnZhaiXing = null;
+            m_btnHaiZhiShi.Dispose();
+            m_btnHaiZhiShi = null;
+            m_BottomEffectHolder = null;
+            m_btnFirstRecharge.Dispose();
+            m_btnFirstRecharge = null;
+            m_btnGiftBag1.Dispose();
+            m_btnGiftBag1 = null;
+            m_btnGiftBag2.Dispose();
+            m_btnGiftBag2 = null;
+            m_headBar.Dispose();
+            m_headBar = null;
+            m_btnYouJian = null;
+            m_btnGongGao = null;
             m_grpLeft = null;
             m_loaLeft = null;
             m_btn1.Dispose();

+ 38 - 26
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -43,6 +43,9 @@ namespace GFGGame
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
+        private EffectUI _effectUI5;
+
 
         private UI_ButtonModle1[] _btns;
 
@@ -60,6 +63,11 @@ namespace GFGGame
             _effectUI2 = null;
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = null;
+            
 
             if (_sceneObject != null)
             {
@@ -91,9 +99,9 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 
-            _btnGongGao = _ui.m_list.GetChild("btnGongGao").asButton;
+            _btnYouJian = _ui.m_btnYouJian;
+            _btnGongGao = _ui.m_btnGongGao;
             _btnHaoYou = _ui.m_list.GetChild("btnHaoYou").asButton;
-            _btnYouJian = _ui.m_list.GetChild("btnYouJian").asButton;
             _btnRenWu = _ui.m_list.GetChild("btnRenWu").asButton;
             _btnPengYouQuan = _ui.m_list.GetChild("btnPengYouQuan").asButton;
             _btnLeague = _ui.m_list.GetChild("btnLeague").asButton;
@@ -144,7 +152,7 @@ namespace GFGGame
             _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
             _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
-            _ui.m_loaRight.target.onClick.Add(MoveLeft);
+            _ui.m_btnHaiZhiShi.target.onClick.Add(MoveLeft);
             _ui.m_loaLeft.onClick.Add(MoveRight);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
@@ -260,9 +268,11 @@ namespace GFGGame
 
         private void AddEffect()
         {
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ui_zjm_zzl_d");
-            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ui_zjm_zzl");
-            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_loaRight.m_holder, "ui_zjm", "ui_zjm_jt");
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder1, "ui_zjm", "ZJM_hzs_top_1");
+            _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan");
         }
 
         private void SetPos()
@@ -931,11 +941,11 @@ namespace GFGGame
         }
         private void CheckFunOpen()
         {
-            _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
-            _ui.m_btnHuanZhuang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
-            _ui.m_btnCiPai.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
-            _ui.m_btnZhaiXing.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
-            _ui.m_btnMain.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
+            _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
+            _ui.m_btnHuanZhuang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
+            _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
+            _ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
+            _ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
             _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
             _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
             _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
@@ -976,22 +986,24 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             _valueBarController.UpRead();
-            RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed());
-            RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed());
+            RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed(), "", -9, 12);
+
+            RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed(), "", -8);
             // RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
             // RedDotDataManager.Instance.GetDailyLoginRed());
-            RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
-            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
-            RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
-            RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed());
+            RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed(), "", -9, 12);
+            RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed(), "", -8);
+            RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed(), "", -8);
+            RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
             RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
+            RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -26, 42);
+
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
             RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
-            RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
+            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, -1);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", 9, -1);
+            RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
 
             RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
@@ -1055,16 +1067,16 @@ namespace GFGGame
 
                 GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
                     "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。", -1, false);
-                GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
+                GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
 
 
-                bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
+                bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
                     false, _ui.target.height - 700);
-                bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
+                bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
                     false, _ui.target.height - 700);
-                bool isFieldGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
+                bool isFieldGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
 
-                bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
+                bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
 
                 _ui.m_loaGuidestudio.visible = false;
                 // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes