diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_01_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_01_zh.png index 6d0848b0ee..d8c4810c84 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_01_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_02_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_02_zh.png index cf58569b50..404ef6bee1 100644 Binary files a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_02_zh.png and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/s_shenyitianjiang_anniu_02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu01_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu01_zh.png index 050270884d..27cb4af03b 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu01_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu02_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu02_zh.png index 64b7025567..5f7b1a7a55 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu02_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/l_lingshou_lingshoubaogeanniu02_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_01_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_01_zh.png index 3d6dd5e09e..601c0dae36 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_01_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_zh.png index 1c9d38f318..edaf93fd89 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_daren_xunbaoanniu_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png index 4576088877..ee11a5d890 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_03_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png index f7e2e80e5f..b183056bee 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_04_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_01_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_01_zh.png index 0098fdc958..360ba875e8 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_01_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_01_zh.png differ diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_zh.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_zh.png index d3647b8e74..6449e57520 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_zh.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_xianshiduihuan_anniu_zh.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab index f0c1298268..36340fe42b 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/ActivityMainPanel.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.0000000046529207, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &455843809901100221 @@ -173,7 +173,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 45, y: 66} + m_AnchoredPosition: {x: 62.5, y: 51.7} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2326290885151624836 @@ -248,7 +248,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 184, y: 188} + m_SizeDelta: {x: 184, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8402084921783220767 CanvasRenderer: @@ -278,7 +278,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: e381323cc63109c4bb78020d5a80a59d, type: 3} + m_Sprite: {fileID: 21300000, guid: f2393ce2d23f490409ca62cfa0b8f917, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -659,7 +659,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -1286, y: 180.00002} - m_SizeDelta: {x: 184, y: 188} + m_SizeDelta: {x: 184, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6961595280145760067 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 823d1b31d6..8778d15861 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1619,9 +1619,9 @@ function this.RefreshBattleUpLvTip() end local roleRefreshNum = 0 function this.OnMainPlayerNPCRefresh() - if roleRefreshNum < 60 then + if roleRefreshNum < 20 then roleRefreshNum = roleRefreshNum + 1 - elseif roleRefreshNum >= 60 and PlayerManager.MainPanelRoleMonveState then + elseif roleRefreshNum >= 20 and PlayerManager.MainPanelRoleMonveState then roleRefreshNum = 0 -- LogRed("PlayerManager.MainPanelRoleMonveState "..tostring(PlayerManager.MainPanelRoleMonveState)) if curNPCList and #curNPCList > 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index e1cb8873b5..21db5d30ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -32,7 +32,7 @@ this.now_index = 0 --头像框数据 this.headFrameList = {} -this.MainPanelRoleMonveState = false +this.MainPanelRoleMonveState = true --是否为从六星玉帝入口跳转进入 this.isSixStarJump=false