From 84a9fd51f6fbafd1a1f6f3bdf09a198bec17c2dd Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 13 Feb 2023 17:49:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E9=AD=94=E6=8C=91=E6=88=98=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=BF=AB=E9=80=9F=E6=8C=91=E6=88=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonsterCamp/MonsterCampNewPanel.prefab | 262 ++++++++++++------ .../MonsterCamp/MonsterCampNewPanel.lua | 7 +- 2 files changed, 177 insertions(+), 92 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab index 32a2406d06..13b8dc72f9 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampNewPanel.prefab @@ -1219,6 +1219,7 @@ RectTransform: - {fileID: 5771674330105935116} - {fileID: 3220256385954936758} - {fileID: 6867756170676383893} + - {fileID: 2181242146140049895} m_Father: {fileID: 3260027998717083522} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3330,6 +3331,85 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &7746613592857739442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2181242146140049895} + - component: {fileID: 4481059066501633565} + - component: {fileID: 40339492877299601} + m_Layer: 5 + m_Name: hintTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2181242146140049895 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7746613592857739442} + 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: 3260027997770271091} + m_RootOrder: 11 + 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: -859} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4481059066501633565 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7746613592857739442} + m_CullTransparentMesh: 0 +--- !u!114 &40339492877299601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7746613592857739442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5F00\u901A\u8D85\u7EA7GM\u5F00\u542F\u5FEB\u901F\u6311\u6218" --- !u!1 &8580407688451453896 GameObject: m_ObjectHideFlags: 0 @@ -3780,7 +3860,7 @@ PrefabInstance: propertyPath: m_RootOrder value: 16 objectReference: {fileID: 0} - - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 @@ -3790,66 +3870,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819405606816, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 5731619939437485109, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 7432402436113426622} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 5293127911268393279} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 3240460224080572288} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 2840362793928472374} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 7740213782836015980} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 5761712634343647041} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 3454918016999600044} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3332306486969623012} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 6736817646950735205} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 3041315385410730375} - - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 7432402436113426622} - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -3905,17 +3930,72 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 272606939306848659} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7432402436113426622} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 5293127911268393279} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 3240460224080572288} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 2840362793928472374} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 7740213782836015980} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 5761712634343647041} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3454918016999600044} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3332306486969623012} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6736817646950735205} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 3041315385410730375} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7432402436113426622} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &272606939306848659 stripped +--- !u!4 &134712767994979535 stripped Transform: - m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} ---- !u!4 &7535775316978415161 stripped +--- !u!4 &272606939306848659 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} @@ -3931,12 +4011,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} ---- !u!4 &5612610801638118359 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 5624729761576140223} - m_PrefabAsset: {fileID: 0} --- !u!4 &5761712634343647041 stripped Transform: m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, @@ -3961,9 +4035,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} ---- !u!4 &3332306486969623012 stripped +--- !u!4 &6394707123396274470 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} @@ -3973,9 +4047,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} ---- !u!4 &4059876004828611866 stripped +--- !u!4 &3041315385410730375 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5612610801638118359 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2685122275388404978 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} @@ -3985,6 +4071,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} +--- !u!4 &7535775316978415161 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4059876004828611866 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 5624729761576140223} + m_PrefabAsset: {fileID: 0} --- !u!224 &7863660303576691920 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, @@ -4003,33 +4101,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} ---- !u!4 &6394707123396274470 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 5624729761576140223} - m_PrefabAsset: {fileID: 0} ---- !u!4 &134712767994979535 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 5624729761576140223} - m_PrefabAsset: {fileID: 0} --- !u!4 &8363257201524967884 stripped Transform: m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} ---- !u!4 &2685122275388404978 stripped +--- !u!4 &3332306486969623012 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 5624729761576140223} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3041315385410730375 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 5624729761576140223} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index e5cbf51ef6..928568132a 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -42,7 +42,6 @@ function MonsterCampNewPanel:InitComponent() this.titleText = Util.GetGameObject(self.gameObject, "InfoRoot/tiitleRoot/title"):GetComponent("Text") this.moppingUpBtn = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/moppingUpBtn") - this.moppingUpBtn:SetActive(false) Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/moppingUpBtn/Text"):GetComponent("Text").text = "快速挑战" this.freeMoppingTimes = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/freeMoppingTimes"):GetComponent("Text") this.buyMoppingTimes = Util.GetGameObject(self.gameObject, "InfoRoot/bottomLayout/buyMoppingTimes"):GetComponent("Text") @@ -188,6 +187,12 @@ function MonsterCampNewPanel:OnShow() this.OnShowPanel() end function this.OnShowPanel() + local isBuy=OperatingManager.IsBuyGift(2202) + if isBuy then + this.moppingUpBtn:SetActive(true) + else + this.moppingUpBtn:SetActive(false) + end SoundManager.PlayMusic(SoundConfig.BGM_Carbon) CheckRedPointStatus(RedPointType.EpicExplore_LevleReward) CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp)