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

dev_chengFeng
jiaoyangna 2022-02-11 11:26:51 +08:00
commit 072edac018
3 changed files with 4 additions and 4 deletions

View File

@ -40307,8 +40307,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 136.15} m_AnchoredPosition: {x: 0, y: 100.7}
m_SizeDelta: {x: 1080, y: 272.3} m_SizeDelta: {x: 1080, y: 201.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7343478569695879895 --- !u!222 &7343478569695879895
CanvasRenderer: CanvasRenderer:

View File

@ -447,7 +447,7 @@ local TypeUpdateFunc = {
--超凡入圣 --超凡入圣
function this.InitMissionDdataUpStar(curData) function this.InitMissionDdataUpStar(curData)
local actRewardConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.LuxuryFundConfig,"ActivityId", curData.activityId) local actRewardConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", curData.activityId)
for i = 1, #curData.rewards do for i = 1, #curData.rewards do
for j = 1, #actRewardConfigs do for j = 1, #actRewardConfigs do
if curData.rewards[i].missionId == actRewardConfigs[j].Id then if curData.rewards[i].missionId == actRewardConfigs[j].Id then

View File

@ -150,7 +150,7 @@ function EveryDayGiftNew:RefreshData(none,isTop,isAni)
self:RefreshFreeData() self:RefreshFreeData()
-- 刷新一键购买显示 -- 刷新一键购买显示
self:RefreshOneKeyShow() self:RefreshOneKeyShow()
self.Reward:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,752) self.Reward:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,820)
end end
if not self.scrollView then if not self.scrollView then