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

dev_chengFeng
ZhangBiao 2021-04-21 18:06:43 +08:00
commit 146929c099
5 changed files with 35 additions and 15 deletions

View File

@ -731,14 +731,15 @@ RedPointType = {
---=== 商店小页签 ---=== 商店小页签
--Shop_Tab_Recharge = 25300, --Shop_Tab_Recharge = 25300,
Shop_Tab_General = 25310, Shop_Tab_General = 25310,
--Shop_Tab_Soul = 25320, Shop_Tab_Soul = 25320,
Shop_Tab_Secret = 25321, Shop_Tab_Secret = 25321,
Shop_Tab_Arena = 25330, Shop_Tab_Arena = 25330,
Shop_Tab_Guild = 25331, Shop_Tab_Guild = 25331,
Shop_Tab_Roam = 25350, Shop_Tab_Roam = 25350,
---========= 商店红点 ---========= 商店红点
Shop_General_Check = 253100, Shop_General_Check = 253100,
-- Shop_General_Refresh = 253101, Shop_General_Refresh = 253101,
Shop_Soul_Refresh = 253102,
Shop_Secret_Check = 253200, Shop_Secret_Check = 253200,
Shop_Arena_Check = 253300, Shop_Arena_Check = 253300,
Shop_Guild_Check = 253310, Shop_Guild_Check = 253310,

View File

@ -125,12 +125,15 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Shop_Page_Roam, RedPointType.Shop) RPData:SetParent(RedPointType.Shop_Page_Roam, RedPointType.Shop)
-- === 商店小页签 -- === 商店小页签
RPData:SetParent(RedPointType.Shop_Tab_General, RedPointType.Shop_Page_General) 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_Secret, 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_Arena, RedPointType.Shop_Page_Play)
RPData:SetParent(RedPointType.Shop_Tab_Guild, 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_Roam, RedPointType.Shop_Page_Roam)
-- ====== 商店功能 -- ====== 商店功能
RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General) RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General)
RPData:SetParent(RedPointType.Shop_General_Refresh, RedPointType.Shop_Tab_General)
RPData:SetParent(RedPointType.Shop_Soul_Refresh, RedPointType.Shop_Tab_Soul)
RPData:SetParent(RedPointType.Shop_Secret_Check, RedPointType.Shop_Tab_Secret) RPData:SetParent(RedPointType.Shop_Secret_Check, RedPointType.Shop_Tab_Secret)
RPData:SetParent(RedPointType.Shop_Arena_Check, RedPointType.Shop_Tab_Arena) RPData:SetParent(RedPointType.Shop_Arena_Check, RedPointType.Shop_Tab_Arena)
RPData:SetParent(RedPointType.Shop_Guild_Check, RedPointType.Shop_Tab_Guild) RPData:SetParent(RedPointType.Shop_Guild_Check, RedPointType.Shop_Tab_Guild)
@ -330,6 +333,8 @@ function this.RegisterRedCheckFunc()
---=== 商店相关红点 ---=== 商店相关红点
-- RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck) -- RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_General_Refresh, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_Soul_Refresh, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck)

View File

@ -345,6 +345,8 @@ function this.GetTabRPType(shopType)
local rpType = nil local rpType = nil
if shopType == SHOP_TYPE.GENERAL_SHOP then if shopType == SHOP_TYPE.GENERAL_SHOP then
rpType = RedPointType.Shop_Tab_General rpType = RedPointType.Shop_Tab_General
elseif shopType == SHOP_TYPE.SOUL_PRINT_SHOP then
rpType = RedPointType.Shop_Tab_Soul
elseif shopType == SHOP_TYPE.SECRET_BOX_SHOP then elseif shopType == SHOP_TYPE.SECRET_BOX_SHOP then
rpType = RedPointType.Shop_Tab_Secret rpType = RedPointType.Shop_Tab_Secret
elseif shopType == SHOP_TYPE.ARENA_SHOP then elseif shopType == SHOP_TYPE.ARENA_SHOP then

View File

@ -1041,9 +1041,10 @@ function this.ShopRedCheck(redType)
elseif redType == RedPointType.Shop_General_Check then elseif redType == RedPointType.Shop_General_Check then
return this.ShopCheckRPIsShow(SHOP_TYPE.GENERAL_SHOP) return this.ShopCheckRPIsShow(SHOP_TYPE.GENERAL_SHOP)
-- elseif redType == RedPointType.Shop_General_Refresh then elseif redType == RedPointType.Shop_General_Refresh then
-- return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP) return this.ShopRefreshRPIsShow(SHOP_TYPE.GENERAL_SHOP)
elseif redType == RedPointType.Shop_Soul_Refresh then
return this.ShopRefreshRPIsShow(SHOP_TYPE.SOUL_PRINT_SHOP)
end end
end end
@ -1061,7 +1062,9 @@ function this.CheckShopRedpot(shopType)
CheckRedPointStatus(RedPointType.Shop_Secret_Check) CheckRedPointStatus(RedPointType.Shop_Secret_Check)
elseif shopType == SHOP_TYPE.GENERAL_SHOP then elseif shopType == SHOP_TYPE.GENERAL_SHOP then
CheckRedPointStatus(RedPointType.Shop_General_Check) CheckRedPointStatus(RedPointType.Shop_General_Check)
-- CheckRedPointStatus(RedPointType.Shop_General_Refresh) CheckRedPointStatus(RedPointType.Shop_General_Refresh)
elseif shopType == SHOP_TYPE.SOUL_PRINT_SHOP then
CheckRedPointStatus(RedPointType.Shop_Soul_Refresh)
elseif shopType == SHOP_TYPE.BUYCOIN_SHOP then elseif shopType == SHOP_TYPE.BUYCOIN_SHOP then
CheckRedPointStatus(RedPointType.UpView_Gold) CheckRedPointStatus(RedPointType.UpView_Gold)
end end

View File

@ -146,9 +146,12 @@ function this:OnClose()
end end
-- 红点销毁 -- 红点销毁
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
-- ClearRedPointObject(RedPointType.Shop_General_Refresh) ClearRedPointObject(RedPointType.Shop_General_Refresh)
-- end end
if self.ShopType == SHOP_TYPE.SOUL_PRINT_SHOP then
ClearRedPointObject(RedPointType.Shop_Soul_Refresh)
end
if self.ScrollView then if self.ScrollView then
GameObject.DestroyImmediate(self.ScrollView.gameObject) GameObject.DestroyImmediate(self.ScrollView.gameObject)
@ -572,13 +575,19 @@ function this:ShowShop(shopType,_sortingOrder)
this.sortingOrder = _sortingOrder this.sortingOrder = _sortingOrder
-- 红点销毁 -- 红点销毁
self.refreshRedpot:SetActive(false) self.refreshRedpot:SetActive(false)
-- if self.ShopType == SHOP_TYPE.GENERAL_SHOP then if self.ShopType == SHOP_TYPE.GENERAL_SHOP then
-- ClearRedPointObject(RedPointType.Shop_General_Refresh) ClearRedPointObject(RedPointType.Shop_General_Refresh)
-- end end
if self.ShopType == SHOP_TYPE.SOUL_PRINT_SHOP then
ClearRedPointObject(RedPointType.Shop_Soul_Refresh)
end
-- 绑定新红点 -- 绑定新红点
-- if shopType == SHOP_TYPE.GENERAL_SHOP then if shopType == SHOP_TYPE.GENERAL_SHOP then
-- BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot) BindRedPointObject(RedPointType.Shop_General_Refresh, self.refreshRedpot)
-- end end
if shopType == SHOP_TYPE.SOUL_PRINT_SHOP then
BindRedPointObject(RedPointType.Shop_Soul_Refresh, self.refreshRedpot)
end
-- 刷新显示 -- 刷新显示
self.ShopType = shopType self.ShopType = shopType