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

dev_chengFeng
gaoxin 2021-04-27 16:46:13 +08:00
commit b9f742fcf2
3 changed files with 28 additions and 25 deletions

View File

@ -10046,10 +10046,10 @@ RectTransform:
m_Father: {fileID: 2446092371378317743}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
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: 0, y: 0}
m_SizeDelta: {x: 1024, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2320830795291865921
CanvasRenderer:
@ -15507,10 +15507,10 @@ RectTransform:
m_Father: {fileID: 7912888359326409945}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
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: 0, y: 0}
m_SizeDelta: {x: 1024, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6451737078576014230
CanvasRenderer:
@ -20665,10 +20665,10 @@ RectTransform:
m_Father: {fileID: 7709482234995581048}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
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: 0, y: 0}
m_SizeDelta: {x: 1024, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7933083477942549309
CanvasRenderer:
@ -25738,10 +25738,10 @@ RectTransform:
m_Father: {fileID: 4256510347403179104}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
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: 0, y: 0}
m_SizeDelta: {x: 1024, y: 356}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4987689455791440949
CanvasRenderer:
@ -26204,7 +26204,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -14.5, y: 27.9}
m_AnchoredPosition: {x: -14.5, y: 27.899994}
m_SizeDelta: {x: 26, y: 26}
m_Pivot: {x: 1, y: 1}
--- !u!222 &8344043800134731827

View File

@ -17,8 +17,8 @@ local type = {
bg = "r_Dungeon_rendi_01",
name = "r_Dungeon_richangfuben",
live = "lingjijuyuan",
livePos = Vector2(149, 13),
liveSize = Vector2(1024, 1145),
livePos = Vector2(0,0),
liveSize = Vector2(1023,356),
tipBg = "r_Dungeon_richangdian",
resetTime = string.format("<color=#7884B9>%s</color>",GetLanguageStrById(specialConfig[58].Value)),
tip = string.format("<color=#7884B9>%s</color>",GetLanguageStrById(specialConfig[59].Value)),
@ -29,8 +29,8 @@ local type = {
bg = "r_Dungeon_rendi_02",
name = "r_Dungeon_xinmoshilian",
live = "shixueguimo",
livePos = Vector2(77, -218),
liveSize = Vector2(1024, 1145),
livePos = Vector2(0,0),
liveSize = Vector2(1023,356),
tipBg = "r_Dungeon_shijiandian",
resetTime = string.format("<color=#7EB2B6>%s</color>",GetLanguageStrById(specialConfig[60].Value)),
tip = string.format("<color=#7EB2B6>%s</color>",GetLanguageStrById(specialConfig[61].Value)),
@ -41,8 +41,8 @@ local type = {
bg = "r_Dungeon_rendi_03",
name = "r_Dungeon_danaotiangong",
live = "w_wd_boss",
livePos = Vector2(192, 0),
liveSize = Vector2(1024, 1145),
livePos = Vector2(0,0),
liveSize = Vector2(1023,356),
tipBg = "r_Dungeon_juqingdian",
resetTime = string.format("<color=#BA9AC2>%s</color>",GetLanguageStrById(specialConfig[62].Value)),
tip = string.format("<color=#BA9AC2>%s</color>",GetLanguageStrById(specialConfig[63].Value)),
@ -53,8 +53,8 @@ local type = {
bg = "r_Dungeon_rendi_04",
name = "r_Dungeon_chechidoufa",
live = "m_syjm_0026_png",
livePos = Vector2(334, 32),
liveSize = Vector2(1024, 1145),
livePos = Vector2(0,0),
liveSize = Vector2(1023,356),
tipBg = "r_Dungeon_wujingdian",
resetTime = string.format("<color=#DB9A9A>%s</color>",GetLanguageStrById(specialConfig[64].Value)),
tip = string.format("<color=#DB9A9A>%s</color>",GetLanguageStrById(specialConfig[65].Value)),
@ -286,8 +286,8 @@ function this.UpdateCarbonContent()
local di = Util.GetGameObject(v, "bg/InfoBg/InfoBg/Image")
local dropContent = Util.GetGameObject(v, "bg/InfoBg/InfoBg/dropContent")
live:GetComponent("Image").sprite = Util.LoadSprite(data.live)
--live:GetComponent("RectTransform").localPosition = data.livePos
--live:GetComponent("RectTransform").sizeDelta = data.liveSize
live:GetComponent("RectTransform").localPosition = data.livePos
live:GetComponent("RectTransform").sizeDelta = data.liveSize
name:GetComponent("Image").sprite = Util.LoadSprite(data.name.."_zh")
name:GetComponent("RectTransform").localPosition = type[carbonType].namePos
name:GetComponent("RectTransform").sizeDelta = type[carbonType].nameSize

View File

@ -448,10 +448,13 @@ function RewardItemPopup:OnClose()
end
--检测是否需要弹每日任务飘窗
TaskManager.RefreshShowDailyMissionTipPanel()
if #itemListPrefab > 0 then
for i = 1, #itemListPrefab do
destroy(itemListPrefab[i].gameObject)
end
end
itemListPrefab = {}
itemDataList = {}
end
--界面销毁时调用(用于子类重写)
function RewardItemPopup:OnDestroy()