From bdb8510d92194803c30176996f7a5ad8190e1e67 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 21 Oct 2021 18:00:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9D=90=E9=AA=91=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Setting/SettingPanel.prefab | 16 ++++++++-------- .../~Lua/Modules/Setting/SettingPlayerRide.lua | 7 ++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab index 1a6f6e51eb..d07ded9781 100644 --- a/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Setting/SettingPanel.prefab @@ -484,9 +484,9 @@ 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: -280.3, y: -131.6} - m_SizeDelta: {x: 519.5, y: 159.6} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -131.6} + m_SizeDelta: {x: 540, y: 159.6} + m_Pivot: {x: 1, y: 0.5} --- !u!1 &396130673485725596 GameObject: m_ObjectHideFlags: 0 @@ -3467,8 +3467,8 @@ 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: -0.46741, y: -1.6} - m_SizeDelta: {x: 392.77, y: 138.8} + m_AnchoredPosition: {x: 0.86, y: 1.4928} + m_SizeDelta: {x: 395.43, y: 138.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2990390581569018762 CanvasRenderer: @@ -12650,8 +12650,8 @@ 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: -0.47, y: 0.00048816} - m_SizeDelta: {x: 392.77, y: 135.6} + m_AnchoredPosition: {x: 0.85996, y: 1.4916} + m_SizeDelta: {x: 395.43, y: 138.58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7096263496067464868 CanvasRenderer: @@ -16981,7 +16981,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1094151485460785958 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index ca912faaba..159bca5b0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -45,8 +45,10 @@ function SettingPlayerRide:InitComponent(gameObject) this.proPre = Util.GetGameObject(gameObject, "skinProInfo/proPre") this.proGrid = Util.GetGameObject(gameObject, "skinProInfo/proGrid") + local rootHight = this.proGrid.transform.rect.height + local width = this.proGrid.transform.rect.width this.scrollViewPro=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.proGrid.transform,this.proPre, - nil,Vector2.New(458.2,159.6),1,2,Vector2.New(0,0)) + nil,Vector2.New(width,rootHight),1,2,Vector2.New(0,0)) this.scrollViewPro.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0) this.scrollViewPro.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5) this.scrollViewPro.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5) @@ -103,7 +105,6 @@ end --显示信息 function this.ShowPanelData() local rideList = ConfigManager.GetAllConfigsDataByKey(ConfigName.PlayerHeadIcon,"Type",PlayerHeadIconType.Ride) - LogGreen("rideList:"..#rideList) --设置滚动区信息 curUserRideId = PlayerManager.GetPlayerRide() curUserRideConFig = rideList[1] @@ -165,7 +166,7 @@ function this.SingleRideClickShowInfo(data,go) this.getInfo.text = GetLanguageStrById(curPlayerHeadIconConfig.ItemDescribe) this.scrollViewPro:SetData(curPlayerHeadIconConfig.UnlockProperty,function(index,root) local propertyConfig = ConfigManager.GetConfigData(ConfigName.PropertyConfig, curPlayerHeadIconConfig.UnlockProperty[index][1]) - Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info).." ".. GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2]) + Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info)..GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2]) end, not false, not false) this.stateImgGo:SetActive(true) if not isGet and not isUser then From 6c9f0098cf967a14641b76325a33d22020c88294 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 21 Oct 2021 18:02:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E9=80=8D=E9=81=A5=E6=B8=B8?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=8A=A0=E9=80=9F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E8=BD=AC=E7=9B=98=E5=8D=A1=E6=AD=BB=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XiaoYao/XiaoYaoLuckyTurnTablePopup.lua | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua index 8a294d04ed..57e855c552 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoLuckyTurnTablePopup.lua @@ -92,23 +92,11 @@ function XiaoYaoLuckyTurnTablePopup:test(itemId) this.turnEffect2:Stop() this.turnEffect2 = nil end - this.turnEffect2 = Timer.New(function() + for i = 1 , 10 do this:tableTurnEffect(1/t) t=t+5 - end,0.1,10,true) - this.turnEffect2:Start() - coroutine.wait(1) - -- --减速阶段 - -- if this.turnEffect2 then - -- this.turnEffect2:Stop() - -- this.turnEffect2 = nil - -- end - -- this.turnEffect2 = Timer.New(function() - -- this:tableTurnEffect(1/t) - -- t=t-3.3 - -- end,0.1,10,true) - -- this.turnEffect2:Start() - -- coroutine.wait(1) + coroutine.wait(0.1) + end this:tableTurnEffect(0.1,itemId) end) end @@ -132,7 +120,6 @@ function XiaoYaoLuckyTurnTablePopup:tableTurnEffect(speed,itemId) SoundManager.PlaySound(SoundConfig.Sound_zp) SoundManager.PlaySound(SoundConfig.UI_Xingyunzhuanpan) index = index + 1 - --LogGreen("index == "..index) --检测最后的奖励 if itemId and index == itemId then this.turnEffect:Stop() From b24061ccd0c64c9367dde0011bfe12f36ea91e3a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 21 Oct 2021 18:12:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E9=99=8D=E4=B8=96?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index d3b0ff5899..6d51c0b879 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -127,6 +127,7 @@ end function this.LoadLive2D() local liveId = ActivityGiftManager.GetActivityDataById(42).Drawing heroId = liveId or 10011 + heroData = heroConfig[heroId] liveId = heroConfig[heroId].Live this.clickName.text = GetLanguageStrById(heroConfig[heroId].ReadingName) SetTextVerTial(this.clickName,Vector3.New(59,-10,0)) @@ -243,7 +244,6 @@ end function this.InitShow() ActivityGiftManager.isFirstForSupremeHero = true - --heroData = heroConfig[heroId] actIsOpen = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.SupremeHero) > 0 actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero) From 68cbb5905a595c7072c04bfdcda5214e10627f5f Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 21 Oct 2021 18:58:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=87=B3=E5=B0=8A=E9=99=8D=E4=B8=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/SupremeHeroPopup.prefab | 2 +- .../~Lua/Modules/Popup/SupremeHeroPopup.lua | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab index 28fbb91dac..55977a24f0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/SupremeHeroPopup.prefab @@ -9780,7 +9780,7 @@ ParticleSystem: startDelay: serializedVersion: 2 minMaxState: 0 - scalar: 3.2 + scalar: 0 minScalar: 0 maxCurve: serializedVersion: 2 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua index 6d51c0b879..0d0c09e9e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua @@ -109,7 +109,7 @@ function SupremeHeroPopup:InitComponent() this.panelist[i].jianEffect = Util.GetGameObject(this.panelist[i].jian, "Effect_UI_SupremeHeroPopup_jian") this.panelist[i].Fx_mat_UI_SupremeHeroPopup_daohen = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_daohen") this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_renwuchuxian") - this.panelist[i].Fx_mat_UI_SupremeHeroPopup_changzhu = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_daohen") + this.panelist[i].Fx_mat_UI_SupremeHeroPopup_changzhu = Util.GetGameObject(this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian, "Particle System") this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian.gameObject:SetActive(true) elseif i == 2 then this.panelist[i].jianEffect = Util.GetGameObject(this.panelist[i].role, "Image/fx_yujiantongxing_01") @@ -225,6 +225,7 @@ function SupremeHeroPopup:OnShow() else curPage = 1 end + --curPage = 2 this.InitShowPanel() this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(1)) this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(2)) @@ -279,9 +280,15 @@ function this.SetMissionData() if i == curPage then if v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then elseif isFrist then - Timer.New(function() - v.gameObject:SetActive(true) - end,3.6):Start() + if v.gameObject.name == "Particle System" then + Timer.New(function() + v.gameObject:SetActive(true) + end,3.2):Start() + else + Timer.New(function() + v.gameObject:SetActive(true) + end,3.6):Start() + end else v.gameObject:SetActive(true) end @@ -293,6 +300,9 @@ function this.SetMissionData() end end end + Timer.New(function() + isFrist = false + end,4):Start() if curPage == 1 then this.previewBtn.gameObject:SetActive(true) else