diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab index 9b090106e0..e7cc7fe848 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanelNew.prefab @@ -83550,7 +83550,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\xD71" + m_Text: "\xD710" --- !u!1 &5083513720415851474 GameObject: m_ObjectHideFlags: 0 @@ -88328,7 +88328,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 156.29999} + m_AnchoredPosition: {x: 0, y: 156.2998} m_SizeDelta: {x: 0, y: -312.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7331428508582231755 @@ -88625,7 +88625,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4804377421086369664 RectTransform: m_ObjectHideFlags: 0 @@ -88694,7 +88694,7 @@ MonoBehaviour: - initV3: {x: 0, y: -82.5, z: 0} initFloat: 0 isInit: 1 - changeV3: {x: 0, y: 0, z: 0} + changeV3: {x: -300, y: 0, z: 0} changeFloat: 0 duration: 0.2 delay: 0 @@ -88717,6 +88717,32 @@ MonoBehaviour: loop: 0 loopType: 0 targetObj: {fileID: 85218653905175749} + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 1 + duration: 0.2 + delay: 0 + curveType: 1 + changeType: 8 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 236858327795853349} + - initV3: {x: 0, y: -82.5, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 300, y: 0, z: 0} + changeFloat: 0 + duration: 0.2 + delay: 0 + curveType: 1 + changeType: 0 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 236858327795853349} isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab index 68466843aa..d8c8833882 100644 --- a/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SecretBox/SecretBoxBuyTenPanel.prefab @@ -94020,8 +94020,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u989D\u5916\u8D60\u900111\u4E2A\u5996\u7075\u7389" LanguageIndex: 0 @@ -128550,7 +128550,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -9.299999, y: 4.2} + m_AnchoredPosition: {x: -9.300003, y: 4.200001} m_SizeDelta: {x: 1.4, y: 1.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222431668941950158 @@ -128939,7 +128939,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000015258789, y: -0} + m_AnchoredPosition: {x: 0.000015258789, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222690519356434136 @@ -134991,8 +134991,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u989D\u5916\u8D60\u900110\u4E2A\u4E7E\u5764\u4EE4" LanguageIndex: 0 @@ -135112,7 +135112,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0.36} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 3, y: 5.3} + m_AnchoredPosition: {x: 3, y: 5.299999} m_SizeDelta: {x: -67.64, y: -25.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1989292816312034440 diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua index 1cd031f50d..cef3746c5b 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyTenPanel.lua @@ -23,6 +23,7 @@ function SecretBoxBuyTenPanel:InitComponent() orginLayer = 0 self.bg = Util.GetGameObject(self.gameObject, "effect") screenAdapte(self.bg) + this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) this.btnBack=Util.GetGameObject(self.gameObject, "bottom/backButton") this.openTenAgainButton=Util.GetGameObject(self.gameObject, "bottom/openTenAgainButton") this.costImage=Util.GetGameObject(self.gameObject, "bottom/openTenAgainButton/Image") @@ -46,8 +47,11 @@ function SecretBoxBuyTenPanel:InitComponent() -- 关于抽卡的LotterySetting数据 local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) - drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id - drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id + if curActivityId then + drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id + drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id + end + end --绑定事件(用于子类重写) @@ -131,6 +135,7 @@ end --界面打开时调用(用于子类重写) function SecretBoxBuyTenPanel:OnOpen(...) SoundManager.PlaySound(SoundConfig.UI_Siyuanzhen) + this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.ElementDrawCard }) -- this.itemIcon1.sprite=this.spLoader:LoadSprite(GetResourcePath(ItemConfig[SecretBoxManager.MainCost[2][1][1]].ResourceID)) local args = { ... } this.drop=args[1] @@ -218,8 +223,7 @@ end --界面销毁时调用(用于子类重写) function SecretBoxBuyTenPanel:OnDestroy() this.spLoader:Destroy() - - + SubUIManager.Close(this.UpView) this.views = nil if this.timer then this.timer:Stop()