Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
luyao 2022-04-28 18:03:43 +08:00
commit 716556d9a2
3 changed files with 7 additions and 7 deletions

View File

@ -604,7 +604,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: 399, y: 163}
m_AnchoredPosition: {x: 264.4, y: 320.8999}
m_SizeDelta: {x: 300, y: 76}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1586863083

View File

@ -778,16 +778,16 @@ RedPointType = {
--- 主界面商店大页签红点
Shop_Page_Recharge = 2530,
Shop_Page_General = 2531,
Shop_Page_Coin = 2532,
Shop_Page_Play = 2533,
Shop_Page_Coin = 2532,--代币大页签
Shop_Page_Play = 2533,--玩法大页签
--Shop_Page_Exchange = 2534,
Shop_Page_Roam = 2535,
---=== 商店小页签
--Shop_Tab_Recharge = 25300,
Shop_Tab_General = 25310,
Shop_Tab_Soul = 25320,
Shop_Tab_Soul = 25320,--魂印小页签
Shop_Tab_Secret = 25321,
Shop_Tab_God = 25322,--神印页签
Shop_Tab_God = 25322,--神印页签
Shop_Tab_Arena = 25330,
Shop_Tab_Guild = 25331,
Shop_Tab_Roam = 25350,

View File

@ -132,12 +132,12 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Shop_Page_Roam, RedPointType.Shop)
-- === 商店小页签
RPData:SetParent(RedPointType.Shop_Tab_General, RedPointType.Shop_Page_General)
RPData:SetParent(RedPointType.Shop_Tab_Soul, RedPointType.Shop_Page_General)
RPData:SetParent(RedPointType.Shop_Tab_Soul, RedPointType.Shop_Page_Coin)
RPData:SetParent(RedPointType.Shop_Tab_Secret, RedPointType.Shop_Page_Coin)
RPData:SetParent(RedPointType.Shop_Tab_Arena, RedPointType.Shop_Page_Play)
RPData:SetParent(RedPointType.Shop_Tab_Guild, RedPointType.Shop_Page_Play)
RPData:SetParent(RedPointType.Shop_Tab_Roam, RedPointType.Shop_Page_Roam)
RPData:SetParent(RedPointType.Shop_Tab_God, RedPointType.Shop_Page_Play)
RPData:SetParent(RedPointType.Shop_Tab_God, RedPointType.Shop_Page_Coin)
RPData:SetParent(RedPointType.Shop_God_Refresh, RedPointType.Shop_Tab_God)
-- ====== 商店功能
RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General)