diff --git a/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab index 8480b32b9c..a2650139de 100644 --- a/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FifteenDayGift/FifteenDayGiftPanel.prefab @@ -1477,7 +1477,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: -98, y: 80} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4490908021678874521 @@ -1711,7 +1711,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: -98, y: 260} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1035846578040740308 @@ -3265,7 +3265,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: -266, y: 800} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1819004861231431470 @@ -4304,7 +4304,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: -266, y: 80} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2655064281868639555 @@ -5549,7 +5549,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: 70, y: 440} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8939826248925788638 @@ -5826,7 +5826,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: 70, y: 620} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2412099556551690288 @@ -6967,7 +6967,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: -266, y: 620} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8812889239161679187 @@ -7195,7 +7195,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: -266, y: 260} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4125954951839847314 @@ -7386,7 +7386,7 @@ RectTransform: - {fileID: 8747385901818210183} - {fileID: 180175418589611944} - {fileID: 7166992382915912444} - - {fileID: 8194522406137972511} + - {fileID: 3884626380292770971} m_Father: {fileID: 7665699681310612303} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7705,7 +7705,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: -98, y: 800} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6727396322748050762 @@ -8539,7 +8539,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: -98, y: 620} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8598812617554604566 @@ -9082,7 +9082,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: -98, y: 440} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5771120664444458212 @@ -9295,7 +9295,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: 70, y: 800} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8801267369038041919 @@ -9486,7 +9486,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: 70, y: 260} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4159132292521501260 @@ -10218,7 +10218,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: -266, y: 440} + m_AnchoredPosition: {x: 70, y: 80} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8625742810532429341 @@ -10653,6 +10653,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6698752202692033210} m_Modifications: + - target: {fileID: 7511687373914710167, guid: d33b549a44c43724496fea4faaa91bd1, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} - target: {fileID: 3020818763621735072, guid: d33b549a44c43724496fea4faaa91bd1, type: 3} propertyPath: m_Name @@ -10715,9 +10720,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d33b549a44c43724496fea4faaa91bd1, type: 3} ---- !u!4 &8194522406137972511 stripped +--- !u!4 &3884626380292770971 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3201745373124766483, guid: d33b549a44c43724496fea4faaa91bd1, + m_CorrespondingSourceObject: {fileID: 7511687373914710167, guid: d33b549a44c43724496fea4faaa91bd1, type: 3} m_PrefabInstance: {fileID: 6761636705499835404} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua index 8a0d1ec4d2..accad01dff 100644 --- a/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FifteenDayGift/FifteenDayGiftPanel.lua @@ -67,7 +67,7 @@ function FifteenDayGift:BindEvent() if drop.pokemon and #drop.pokemon >= 1 then local thread=coroutine.start(function() self.effect2:SetActive(true) - coroutine.wait(4) + coroutine.wait(3) UIManager.OpenPanel(UIName.PokemonSingleResultPanel,nil,drop,nil,nil,function () self.effect2:SetActive(false) func(drop) @@ -149,7 +149,9 @@ function FifteenDayGift:SetSingleReward(sData,go,index) front:GetComponent("RectTransform").rotation = sData.State == 0 and angle[1] or angle[2] back:GetComponent("RectTransform").rotation = sData.State == 1 and angle[1] or angle[2] --判断哪些可领取,插入表 + LogPurple("sData.Progress:"..tostring(sData.Progress).." sData.State:"..tostring(sData.State)) if sData.Progress <= curTime and sData.State == 0 then + LogPink("index:"..tostring(index)) table.insert(frontList,front) table.insert(backList,back) red:SetActive(true)