ソースを参照

雅集聊天换ui,主界面雅集茶会文字提示

huangxiaoyue 1 年間 前
コミット
e15f495725
23 ファイル変更24 行追加6 行削除
  1. 12 0
      GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs
  2. 6 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  3. 6 3
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  4. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0!a.png
  5. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0.png
  6. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png
  7. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_1.png
  8. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png
  9. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_2.png
  10. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png
  11. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_3.png
  12. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png
  13. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_4.png
  14. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png
  15. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_5.png
  16. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png
  17. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_6.png
  18. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png
  19. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_7.png
  20. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png
  21. BIN
      GameClient/Assets/ResIn/UI/League/League_atlas0_8.png
  22. BIN
      GameClient/Assets/ResIn/UI/League/League_fui.bytes
  23. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 12 - 0
GameClient/Assets/Game/HotUpdate/Data/LeagueDataManager.cs

@@ -335,5 +335,17 @@ namespace GFGGame
             }
             return 0;
         }
+
+        //主界面雅集提示语判断
+        public string CheckLeagueMainTips()
+        {
+            if(LeagueDataManager.Instance.Type == LeagueJoinType.Join && LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesOpen && !LeagueDataManager.Instance.RoleTeapartyInfo.Status)
+                return "茶话会挑战中...";
+
+            if (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.Open || LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.WaitNext)
+                return "雅集夜宴进行中...";
+
+            return "";
+        }
     }
 }

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

@@ -8,7 +8,8 @@ namespace UI.Main
     {
         public GComponent target;
         public GComponent m_valueBar;
-        public GGroup m_grpLeagueAnswer;
+        public GTextField m_grpLeaguetext;
+        public GGroup m_grpLeagueTips;
         public UI_ButtonModle1 m_btnMain;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
@@ -92,7 +93,8 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_valueBar = (GComponent)comp.GetChild("valueBar");
-            m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
+            m_grpLeaguetext = (GTextField)comp.GetChild("grpLeaguetext");
+            m_grpLeagueTips = (GGroup)comp.GetChild("grpLeagueTips");
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
@@ -132,7 +134,8 @@ namespace UI.Main
         public void Dispose(bool disposeTarget = false)
         {
             m_valueBar = null;
-            m_grpLeagueAnswer = null;
+            m_grpLeaguetext = null;
+            m_grpLeagueTips = null;
             m_btnMain.Dispose();
             m_btnMain = null;
             m_btnHuanZhuang.Dispose();

+ 6 - 3
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1098,11 +1098,14 @@ namespace GFGGame
 
         private void MainUIAnimFinished()
         {
-            _ui.m_grpLeagueAnswer.visible = _btnLeague.visible && (LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.Open || LeagueDataManager.Instance.GetNumeriValue(LeagueNumericType.LeagueQuestionStatus) == LeagueQuestionStatus.WaitNext);
-            if (_ui.m_grpLeagueAnswer.visible)
+            _ui.m_grpLeagueTips.visible = _btnLeague.visible && LeagueDataManager.Instance.CheckLeagueMainTips() != "";
+
+            if (_ui.m_grpLeagueTips.visible)
             {
+                _ui.m_grpLeaguetext.text = LeagueDataManager.Instance.CheckLeagueMainTips();
+
                 Vector2 pos = _ui.m_list.TransformPoint(_btnLeague.position, _ui.target);
-                _ui.m_grpLeagueAnswer.SetPosition(pos.x - _ui.m_grpLeagueAnswer.width + 20, pos.y + 20, 0);
+                _ui.m_grpLeagueTips.SetPosition(pos.x - _ui.m_grpLeagueTips.width + 20, pos.y + 20, 0);
             }
         }
     }

BIN
GameClient/Assets/ResIn/UI/League/League_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_5.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_6.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_7.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png


BIN
GameClient/Assets/ResIn/UI/League/League_atlas0_8.png


BIN
GameClient/Assets/ResIn/UI/League/League_fui.bytes


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