Merge remote-tracking branch 'remotes/origin/master' into GFG

GameClient/.idea/.idea.GameClient/.idea/copilot.data.migration.agent.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AgentMigrationStateService">
+    <option name="migrationStatus" value="COMPLETED" />
+  </component>
+</project>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItem.cs

@@ -11,6 +11,7 @@ namespace UI.League
         public GTextField m_txtName;
         public GLoader m_loaTitle;
         public GTextField m_txtChatContent;
+        public GTextField m_txtTime;
         public const string URL = "ui://tw70qm9dofwu8e";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListChatItem";
@@ -62,6 +63,7 @@ namespace UI.League
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
             m_txtChatContent = (GTextField)comp.GetChild("txtChatContent");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.League
             m_txtName = null;
             m_loaTitle = null;
             m_txtChatContent = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_ListChatItemMine.cs

@@ -11,6 +11,7 @@ namespace UI.League
         public GLoader m_loaTitle;
         public GTextField m_txtName;
         public GTextField m_txtChatContent;
+        public GTextField m_txtTime;
         public const string URL = "ui://tw70qm9dofwu8f";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "ListChatItemMine";
@@ -62,6 +63,7 @@ namespace UI.League
             m_loaTitle = (GLoader)comp.GetChild("loaTitle");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtChatContent = (GTextField)comp.GetChild("txtChatContent");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +71,7 @@ namespace UI.League
             m_loaTitle = null;
             m_txtName = null;
             m_txtChatContent = null;
+            m_txtTime = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ActivityGetYuanXiao/ActivityGetYuanXiaoEntryView.cs

@@ -232,7 +232,7 @@ namespace GFGGame
             _effectUIDic.Add("YXJ_bg_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "CLFG_BG_TX/CLFG_BG_TX "));
             _effectUIDic.Add("YXJ_Button", EffectUIPool.CreateEffectUI(_ui.m_startBtnEffect, "ui_Activity", "CLFG_Start_Button/CLFG_Start_Button"));
             //_effectUIDic.Add("YXJ_Middle", EffectUIPool.CreateEffectUI(_ui.m_yuanXiaoEffect, "ui_Activity", "YXJ_Middle"));
-            _effectUIDic.Add("YXJ_Text", EffectUIPool.CreateEffectUI(_ui.m_titleTextEffect, "ui_Activity", "CLFG_Text/CLFG_Text"));
+            //_effectUIDic.Add("YXJ_Text", EffectUIPool.CreateEffectUI(_ui.m_titleTextEffect, "ui_Activity", "CLFG_Text/CLFG_Text"));
             _effectUIDic.Add("YXJ_Open_Down", EffectUIPool.CreateEffectUI(_ui.m_cloudEffect, "ui_Activity", "YXJ_Open_Down"));
             //_effectUIDic.Add("YXJ_Open_Up", EffectUIPool.CreateEffectUI(_ui.m_leafEffect, "ui_Activity", "YXJ_Open_Up"));
             _effectUIDic.Add("RedPack_doubao_Loop_R", EffectUIPool.CreateEffectUI(_ui.m_doubaoEffect, "ui_Activity", "CLFG_Mid_Anma/CLFG_Mid_Anma"));

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs

@@ -79,6 +79,7 @@ namespace GFGGame
             UI_ListChatItem item = UI_ListChatItem.Proxy(obj);
             RoleInfoManager.Instance.UpdateHeadWithLv(item.m_comHead, roleInfo.headId, roleInfo.headBorderId, roleInfo.roleLv);
             item.m_txtName.text = roleInfo.roleName;
+            item.m_txtTime.text = TimeUtil.FormattingTimeMinute(chatData.Time);
             item.m_txtChatContent.text = chatData.Content;
             UI_ListChatItem.ProxyEnd();
         }
@@ -104,7 +105,7 @@ namespace GFGGame
                 int num = GlobalCfgArray.globalCfg.chatTime;
                 _ui.m_btnSend.m_timeStr.text = num.ToString();
                 _ui.m_btnSend.m_c1.selectedIndex = 1;
-                Timers.inst.Add(1, 10, (param) =>
+                Timers.inst.Add(1, GlobalCfgArray.globalCfg.chatTime, (param) =>
                 {
                     num--;
                     _ui.m_btnSend.m_timeStr.text = num.ToString();

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

@@ -1287,7 +1287,7 @@ namespace GFGGame
             if (redPointUpdateFrame < 0) return;
             if (!GameGlobal.AfterDataInited) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            LogUtil.LogEditor($"MainUIView UpdateRedDot redPointUpdateFrame {redPointUpdateFrame}");
+           // LogUtil.LogEditor($"MainUIView UpdateRedDot redPointUpdateFrame {redPointUpdateFrame}");
             if (redPointUpdateFrame == 0)
                 _valueBarController.UpdateRedPoint();
             if (redPointUpdateFrame == 1)

GameClient/ProjectSettings/ProjectSettings.asset

@@ -379,6 +379,98 @@ PlayerSettings:
       m_Height: 81
       m_Kind: 2
       m_SubKind: 
+  - m_BuildTarget: 
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetSecurityBuild: []
   m_BuildTargetGraphicsJobs: []