From 53c42a56f7674bc3e7a0bfb0a7edd67d5d91db6a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 9 Jun 2021 11:20:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BA=BF=E4=B8=8A=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=89=B9=E6=9D=83=E3=80=91=E5=B1=9E=E6=80=A7=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=BC=BA=E5=B0=91=E9=BB=91=E8=89=B2=E5=8D=8A?= =?UTF-8?q?=E9=80=8F=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Vip/VipPanelV2.prefab | 77 ++++++++++++++++++- .../Compound/view/CompoundPanel_Equip.lua | 2 +- .../Compound/view/CompoundPanel_SoulPrint.lua | 2 +- .../Compound/view/CompoundPanel_Treasure.lua | 2 +- 4 files changed, 79 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab index bb9c2ff101..ff333bc23a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Vip/VipPanelV2.prefab @@ -6725,7 +6725,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 16, y: -0.000015258789} + m_AnchoredPosition: {x: 16, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2781897261202178156 @@ -7141,6 +7141,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u7FA4\u82F1\u5F81\u52DF4\u6B21" LanguageIndex: 0 +--- !u!1 &1389137624646221510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8448650800933589464} + - component: {fileID: 6246754660137236122} + - component: {fileID: 5499004602435994190} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8448650800933589464 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389137624646221510} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2689109811163513307} + m_RootOrder: 3 + 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.024986, y: -10.74} + m_SizeDelta: {x: 1082, y: 156.88} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6246754660137236122 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389137624646221510} + m_CullTransparentMesh: 0 +--- !u!114 &5499004602435994190 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389137624646221510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 3c3ca5860d5c52347bc1041be73c312c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1417096120411139096 GameObject: m_ObjectHideFlags: 0 @@ -38006,6 +38080,7 @@ RectTransform: - {fileID: 2598831097976425248} - {fileID: 2688741801705900761} - {fileID: 2689570574004261213} + - {fileID: 8448650800933589464} m_Father: {fileID: 2689486735632733049} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua index 7e6bc16fe7..b91abb6629 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Equip.lua @@ -236,7 +236,7 @@ function this.Compound() end NetManager.ComplexEquipRequest(curIndex,curSelectEquip.Star,compoundNum,function(msg) SoundManager.PlaySound(SoundConfig.UI_Duanzao) - SoundManager.PlaySound(SoundConfig.UI_Baoqi) + -- SoundManager.PlaySound(SoundConfig.UI_Baoqi) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() this.OnClickTabBtn(curIndex) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua index 37c2d6dfef..bb5a76fd8e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua @@ -203,7 +203,7 @@ function this.Compound() --LogError("materialState[i].equipSignConFig.Id "..i.." "..materialState[i].equipSignConFig.Id) end NetManager.ComplexSoulPrintRequest(curSelectSoulPrint.Id,matialSoulPrintids,function(msg) - SoundManager.PlaySound(SoundConfig.UI_Duanzao) + -- SoundManager.PlaySound(SoundConfig.UI_Duanzao) SoundManager.PlaySound(SoundConfig.UI_Baoqi) --删除魂印 UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 59b2e3c3f1..cb9884a008 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -220,7 +220,7 @@ function this.Compound() return end NetManager.ComplexTreasureRequest(curSelectEquip.equipType,curIndex,curSelectEquip.quantity,compoundNum,function(msg) - SoundManager.PlaySound(SoundConfig.UI_Duanzao) + -- SoundManager.PlaySound(SoundConfig.UI_Duanzao) SoundManager.PlaySound(SoundConfig.UI_Baoqi) for i = 1, #msg.equipIds do EquipTreasureManager.RemoveTreasureByIdDyn(msg.equipIds[i])