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

dev_chengFeng
wangzhenxing 2022-01-13 17:45:54 +08:00
commit 931e2e304d
5 changed files with 21 additions and 17 deletions

View File

@ -17048,10 +17048,10 @@ RectTransform:
m_Father: {fileID: 8202835805184689050}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -570.755}
m_SizeDelta: {x: 100, y: 1141.51}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6789327400057080525
MonoBehaviour:
@ -17111,9 +17111,9 @@ RectTransform:
m_Father: {fileID: 8202835805184689050}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5308692693333480346
@ -17407,7 +17407,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3}
m_Sprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -17592,7 +17592,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -62.4}
m_SizeDelta: {x: 1080, y: 1141.51}
m_SizeDelta: {x: 1080, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7098667520991281316
CanvasRenderer:
@ -23148,9 +23148,9 @@ RectTransform:
m_Father: {fileID: 8202835805184689050}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 540, y: -1141.51}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8222462628204784580

View File

@ -173,6 +173,8 @@ function this.RefreshItemNum()
this.crystalNum.text = string.format("<color=%s>%s</color>", "#FFFFFFFF", 0)
end
Util.SetGray(this.btnFastExplore, fastBuyNum == 0 and freeTimes == 0)
local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(33)
Util.SetGray(this.privilegeIcon, not isActive)
this.privilegeTimeBg:SetActive(isActive)

View File

@ -137,6 +137,8 @@ function FightAreaRewardFullPopup:OnOpen(...)
end
this.time.text = TimeToHMS(curTime)
this.map.text = GetLanguageStrById(config.Name)
--
Util.SetGray(this.getBtn, false)
local index = 0
for _, reward in ipairs(AdventureManager.HangOnReward) do --(config.RewardShowMin) do

View File

@ -198,7 +198,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
elseif actType == ActivityTypeDef.LimitUpHero then
for n,m in ipairs(upItemList) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(rateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.Weight,color = "AD4152"})
table.insert(rateList,{id = m.Reward[1],tag = "心愿UP神将/道具", name=itemConfig.Name,value = m.Weight,color = "AD4152"})
table.insert(_upRateList,{id = m.Reward[1],tag = "5星神将UP!", name=itemConfig.Name,value = m.Weight})
end
for n,m in ipairs(UpItem) do

View File

@ -14,10 +14,10 @@ local tabs = {
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "红色",
rpType = RedPointType.tailsmanSoul_red,quality = 6
},
-- [3] = { --白金
-- default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "白金",
-- rpType = RedPointType.tailsmanSoul_whiteGold,bg = "t_tianshumijuan_lingshouditu",quality = 7
-- },
[3] = { --白金
default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002", select = "r_hero_xuanze_001",tabName = "白金",
rpType = RedPointType.tailsmanSoul_whiteGold,bg = "t_tianshumijuan_lingshouditu",quality = 7
},
}
local curData = {}
local curPage = 1