From 266c5b12af94348c1bd49c6865d3c08c799dc717 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 20 Sep 2023 14:37:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E7=89=A9=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E7=82=B9=E5=B0=86=E7=A5=9E=E7=AC=A6=E4=B8=8D=E8=B6=B3=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/ItemView/ItemView.prefab | 48 ++++++++++- .../UI/RoleGift/PlayerGiftPanel.prefab | 79 ++++++++++++++++++- .../Prefabs/UI/RoleGift/RoleGiftPanel.prefab | 77 +++++++++++++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../~Lua/Modules/Recruit/RecruitPanelNew.lua | 11 ++- .../~Lua/Modules/RoleInfo/PlayerGiftPanel.lua | 6 +- .../~Lua/Modules/RoleInfo/RoleGiftPanel.lua | 6 +- 7 files changed, 216 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab b/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab index 883fb194d2..defca81466 100644 --- a/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab @@ -4645,7 +4645,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &1308101793526790 GameObject: m_ObjectHideFlags: 0 @@ -9802,7 +9802,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &1594880937725616 GameObject: m_ObjectHideFlags: 0 @@ -14514,7 +14514,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &1608035319839550 GameObject: m_ObjectHideFlags: 0 @@ -19388,7 +19388,7 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MaskInteraction: 1 --- !u!1 &1847103075531332 GameObject: m_ObjectHideFlags: 0 @@ -73988,6 +73988,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5105490566854265685, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} --- !u!4 &7987541132360792074 stripped @@ -74068,6 +74073,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 184376518157790514, guid: 37188270916d7b7408c84c2a0cb12583, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 37188270916d7b7408c84c2a0cb12583, type: 3} --- !u!4 &2199886401291512776 stripped @@ -74208,6 +74218,36 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.9 objectReference: {fileID: 0} + - target: {fileID: 8904198714480050047, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904198713310030723, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904198713654882537, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904198713641915434, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904198713800480830, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904198714661017609, guid: bd194af093bc5564ba7ae00a6f664c2d, + type: 3} + propertyPath: m_MaskInteraction + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd194af093bc5564ba7ae00a6f664c2d, type: 3} --- !u!224 &5045099944225478942 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab index 7f7b49b8ae..067c4b76d6 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/PlayerGiftPanel.prefab @@ -21544,8 +21544,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 522, y: -430} - m_SizeDelta: {x: 6, y: -633.085} + m_AnchoredPosition: {x: 522, y: -419.79} + m_SizeDelta: {x: 6, y: -1310.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5083175378485869623 CanvasRenderer: @@ -46434,6 +46434,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8547986629803574391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1754688594440183982} + - component: {fileID: 3008215089465123411} + - component: {fileID: 5780549822098748886} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1754688594440183982 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8547986629803574391} + 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: 1204790047860540825} + m_RootOrder: 2 + 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_SizeDelta: {x: 156, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3008215089465123411 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8547986629803574391} + m_CullTransparentMesh: 0 +--- !u!114 &5780549822098748886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8547986629803574391} + 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: 2ea1fe5acc99be04999f7b48e10acb26, 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 &8834269062274997685 GameObject: m_ObjectHideFlags: 0 @@ -46465,6 +46539,7 @@ RectTransform: m_Children: - {fileID: 1516799551590029293} - {fileID: 2479234583821864682} + - {fileID: 1754688594440183982} m_Father: {fileID: 9007592198577183178} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab index 08aa60b492..e5045265ea 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab @@ -5686,7 +5686,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -65, y: -230.3} + m_AnchoredPosition: {x: -65, y: -230.2998} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4705537261379448976 @@ -21568,6 +21568,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4730744364332779010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5484845520806637205} + - component: {fileID: 366343576360196540} + - component: {fileID: 1350842460040399371} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5484845520806637205 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4730744364332779010} + 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: 9115163719476813900} + m_RootOrder: 2 + 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_SizeDelta: {x: 156, y: 76} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &366343576360196540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4730744364332779010} + m_CullTransparentMesh: 0 +--- !u!114 &1350842460040399371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4730744364332779010} + 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: 2ea1fe5acc99be04999f7b48e10acb26, 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 &4896053487266152166 GameObject: m_ObjectHideFlags: 0 @@ -42420,6 +42494,7 @@ RectTransform: m_Children: - {fileID: 1914945485547596977} - {fileID: 4671568660436110223} + - {fileID: 5484845520806637205} m_Father: {fileID: 4072935318317542415} m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 690f2822fb..ce55391613 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1145,6 +1145,7 @@ ItemType = { ReplaceCard=52,--神将置换卡 GodWeapon =53, --神兵 GodWeaponChip=54,--神兵碎片 + Gift=56,--礼物 } JumpType = { Lottery = 1, --招募 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 00d6777c42..d1fafdfcf9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -394,7 +394,16 @@ function RecruitPanelNew:UpdatePanelData() Util.AddOnceClick(m.btn,function() if not isFree then if BagManager.GetItemCountById(itemId)#allUpIds) this.equipPreList[_go].gameObject:SetActive(true) this.equipPreList[_go].transform:SetAsFirstSibling() - if itemConfig[_itemData.id].ItemType == ItemType.Equip then + --if itemConfig[_itemData.id].ItemType == ItemType.Equip then this.equipPreList[_go]:OnOpen(false,{_itemData.id,_itemData.num}, 1.1, true, false, false, orginLayer,_itemData.idDyn) -- 0.查看属性 1.穿戴 2.卸下 3.交换 --宝物界面 @@ -375,7 +377,7 @@ function this.SingleItemDataShow(_go, _itemData) end end ) - end + --end end