From 2cbb0b0a59fd71e1811e154676fcfaefa446f894 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 30 Jun 2021 18:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EffectResUI/Shop/Prefab/Fx_SquareFlow.prefab | 14 +++++++------- .../Prefabs/UI/ShopView/ShopView.prefab | 2 +- .../~Lua/Modules/Shop/MainShopPanel.lua | 3 ++- Assets/ManagedResources/~Lua/View/ShopView.lua | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/Shop/Prefab/Fx_SquareFlow.prefab b/Assets/ManagedResources/EffectResUI/Shop/Prefab/Fx_SquareFlow.prefab index ddde177429..91d4e62e80 100644 --- a/Assets/ManagedResources/EffectResUI/Shop/Prefab/Fx_SquareFlow.prefab +++ b/Assets/ManagedResources/EffectResUI/Shop/Prefab/Fx_SquareFlow.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691131933590079962} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 2, y: -28, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8476175074273985914} @@ -284,7 +284,7 @@ ParticleSystem: startSize: serializedVersion: 2 minMaxState: 0 - scalar: 0.9 + scalar: 0.97 minScalar: 1 maxCurve: serializedVersion: 2 @@ -337,7 +337,7 @@ ParticleSystem: startSizeY: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 1.7 minScalar: 1 maxCurve: serializedVersion: 2 @@ -601,7 +601,7 @@ ParticleSystem: m_RotationOrder: 4 randomizeRotationDirection: 0 maxNumParticles: 1000 - size3D: 0 + size3D: 1 rotation3D: 0 gravityModifier: serializedVersion: 2 @@ -975,7 +975,7 @@ ParticleSystem: countCurve: serializedVersion: 2 minMaxState: 0 - scalar: 1 + scalar: 10 minScalar: 30 maxCurve: serializedVersion: 2 @@ -4732,7 +4732,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3000 + m_SortingOrder: 201 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -4789,6 +4789,6 @@ 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, y: 0} + m_AnchoredPosition: {x: 0, y: -13.27} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index 42aa21a84a..e8170c0673 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -5690,7 +5690,7 @@ PrefabInstance: - target: {fileID: 8476175074273985914, guid: a05897d7661f3c74b8eef374b02d6fd5, type: 3} propertyPath: m_AnchoredPosition.y - value: 35 + value: -14 objectReference: {fileID: 0} - target: {fileID: 8476175074273985914, guid: a05897d7661f3c74b8eef374b02d6fd5, type: 3} diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index dad9529086..8131a12d3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -87,6 +87,7 @@ function MainShopPanel:BindEvent() -- 关闭界面打开主城 Util.AddClick(this.btnBack, function() + ShopManager.SetSelectIndex(0,{}) PlaySoundWithoutClick(SoundConfig.Sound_UICancel) --UIManager.OpenPanel(UIName.MainPanel) this:ClosePanel() @@ -97,7 +98,7 @@ function MainShopPanel:BindEvent() UIManager.OpenPanel(UIName.VipPanelV2) end) - ShopManager.SetSelectIndex(0,{}) + end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 79acf0b80f..5dca425e7f 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -527,7 +527,7 @@ function this:ShopItemAdapter(shopItem, itemData) --SetAlpha(limitTip, textA) SetAlpha(itemPrice, textA) local isshow = false - if self.ShopType == ShopManager.selectIndex2.shopType then + if self.ShopType == ShopManager.selectIndex2.shopType then for j = 1 , #ShopManager.selectIndex2.storeId do if itemData.id == ShopManager.selectIndex2.storeId[j] then isshow = true