From a5a93d43a75507e2cf6640b5041a28f22c340ba6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 7 Jan 2021 19:24:04 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1007787=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E9=98=B6=E6=AE=B5=E5=A5=96=E5=8A=B1=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=B1=95=E7=A4=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B1=82?= =?UTF-8?q?=E6=95=B0=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/MonsterCamp/MonsterCampPanel.prefab | 316 +++++++++++++++++- .../Prefabs/UI/Popup/TrialRewardPopup.prefab | 2 +- .../~Lua/Modules/Map/MapPanel.lua | 11 +- .../~Lua/Modules/Map/MapTrialManager.lua | 13 + .../MonsterCamp/MonsterCampManager.lua | 41 +++ .../Modules/MonsterCamp/MonsterCampPanel.lua | 15 + .../~Lua/Modules/Popup/TrialRewardPopup.lua | 44 ++- 7 files changed, 408 insertions(+), 34 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab index b538df4387..ef736dc114 100644 --- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab @@ -332,7 +332,7 @@ RectTransform: - {fileID: 3907906506323065469} - {fileID: 6878597553412593988} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -508,7 +508,7 @@ RectTransform: - {fileID: 7331895246647774641} - {fileID: 3188063442549365701} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -5555,7 +5555,7 @@ ParticleSystem: --- !u!199 &1397471074226472267 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -6017,7 +6017,7 @@ RectTransform: - {fileID: 3926676854293940564} - {fileID: 4920989026737389910} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -10765,7 +10765,7 @@ ParticleSystem: --- !u!199 &4134560543265343287 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10932,7 +10932,7 @@ RectTransform: m_LocalScale: {x: 1.0003678, y: 1.0003678, z: 1.0003678} m_Children: [] m_Father: {fileID: 1327116469934475768} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11082,7 +11082,7 @@ RectTransform: - {fileID: 7432021966333019638} - {fileID: 3059491238752697250} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -15858,7 +15858,7 @@ ParticleSystem: --- !u!199 &497846283403455051 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16024,7 +16024,7 @@ RectTransform: - {fileID: 5855793443095081974} - {fileID: 9093125522467151139} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20891,7 +20891,7 @@ ParticleSystem: --- !u!199 &1755391511871408359 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20981,7 +20981,7 @@ RectTransform: m_Children: - {fileID: 4411714024882206677} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -25727,7 +25727,7 @@ ParticleSystem: --- !u!199 &8187472554774414778 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25861,6 +25861,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5124570275465779809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8789564629059870571} + - component: {fileID: 3699624079998589606} + - component: {fileID: 9037308244187129846} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8789564629059870571 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5124570275465779809} + 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: 6526898012636184484} + m_RootOrder: 0 + 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: 157, y: 157} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3699624079998589606 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5124570275465779809} + m_CullTransparentMesh: 0 +--- !u!114 &9037308244187129846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5124570275465779809} + 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: 83bf2073e01fdc548b5637f8d35485a3, 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 &5918394097178018778 GameObject: m_ObjectHideFlags: 0 @@ -26623,6 +26697,7 @@ RectTransform: m_Children: - {fileID: 1252269825180492747} - {fileID: 2178611684651558167} + - {fileID: 6526898012636184484} - {fileID: 2016680350859881001} - {fileID: 5134851181183420791} - {fileID: 6997640854457639571} @@ -26724,6 +26799,145 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6769116361188463087 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6526898012636184484} + - component: {fileID: 5309387925394968} + - component: {fileID: 5634819942566702175} + - component: {fileID: 1124606334071657533} + - component: {fileID: 5161746287848977177} + m_Layer: 5 + m_Name: btnReward + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6526898012636184484 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769116361188463087} + 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: + - {fileID: 8789564629059870571} + - {fileID: 8274709192307696016} + m_Father: {fileID: 1327116469934475768} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0.5, y: 1795.5} + m_SizeDelta: {x: 157, y: 157} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &5309387925394968 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769116361188463087} + m_CullTransparentMesh: 0 +--- !u!114 &5634819942566702175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769116361188463087} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1124606334071657533} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1124606334071657533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769116361188463087} + 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: 0} + 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_Sprite: {fileID: 0} + 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!95 &5161746287848977177 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6769116361188463087} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6778560999596628872 GameObject: m_ObjectHideFlags: 0 @@ -27073,7 +27287,7 @@ RectTransform: m_Children: - {fileID: 3053479466104011835} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 10 + 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} @@ -27569,6 +27783,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7638407653033131398 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8274709192307696016} + - component: {fileID: 2977214690244849245} + - component: {fileID: 9220340141927522446} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8274709192307696016 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7638407653033131398} + 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: 6526898012636184484} + m_RootOrder: 1 + 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: 2.5999985, y: -0.000013351} + m_SizeDelta: {x: 127, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2977214690244849245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7638407653033131398} + m_CullTransparentMesh: 0 +--- !u!114 &9220340141927522446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7638407653033131398} + 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: 70a4c39dc3795d342822c1d4d984f73b, 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 &7805627607938593167 GameObject: m_ObjectHideFlags: 0 @@ -28330,7 +28618,7 @@ RectTransform: m_Children: - {fileID: 2637777044708192040} m_Father: {fileID: 1327116469934475768} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab index 9d43e0daed..320cfdf9bc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab @@ -536,7 +536,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1620471100564594411 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 16c64ea3d5..c3450d303e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -109,7 +109,16 @@ function this:BindEvent() PopupTipPanel.ShowTip("正在行走 不可点击!") return end - UIManager.OpenPanel(UIName.TrialRewardPopup) + UIManager.OpenPanel(UIName.TrialRewardPopup,MapTrialManager.SetRewardData(),function(id,rewardFunc) + NetManager.RequestLevelReward(id, function(msg) + MapTrialManager.SetTrialRewardInfo(id) --本地记录已领奖励信息 + UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() + if rewardFunc then + rewardFunc() + end + end) + end) + end) end) missionView.BindEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 8fc926cc15..b7fa7102bc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -319,4 +319,17 @@ function this.TrialRedCheck() return MapTrialManager.TrialRewardRedPointCheck() end +function this.SetRewardData() + local dataList = {} + for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.TrialKillConfig)) do + local data = {} + data.Id = v.Id + data.info = string.format(Language[11616],v.Count,MapTrialManager.GetKilCount(),v.Count) + data.BoxReward = v.BoxReward + data.state = MapTrialManager.GetTrialRewardState(v.Id) + table.insert(dataList,data) + end + return dataList +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index c81a41880d..85ca6936d4 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -10,6 +10,19 @@ local resConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig) function this.Initialize() this.monsterWave = 0 -- 当前妖兽波次 this.m_Jump = false -- 跳过战斗设置 + this.getRewardWave = {} +end + +function this.SetRewardWave(waves) + if not this.getRewardWave then + this.getRewardWave = {} + end + for i = 1 ,#waves do + if not this.getRewardWave[waves[i]] then + this.getRewardWave[waves[i]] = waves[i] + end + end + end -- 返回5个大虾的信息, 显示怪物的第一个, @@ -140,5 +153,33 @@ function this.CheckBattleJump() return isOpen end +-- 0 已经领取,1 可领取,2不能领取· +function this.GetTrialRewardState(id) + if id <= this.monsterWave then + if this.getRewardWave[id] and this.getRewardWave[id] > 0 then + return 0 + else + return 1 + end + else + return 2 + end +end + + +function this.SetRewardData() + local dataList = {} + for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.FloodConfig)) do + if v.SpecialReward and #v.SpecialReward > 0 then + local data = {} + data.Id = v.Id + data.info = string.format("通过心魔试炼第%s波",v.Id) + data.BoxReward = v.SpecialReward + data.state = this.GetTrialRewardState(v.Id) + table.insert(dataList,data) + end + end + return dataList +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua index 25dd961602..e0b1fe0471 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua @@ -13,6 +13,7 @@ function MonsterCampPanel:InitComponent() this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnFight") this.nextWave = Util.GetGameObject(self.gameObject, "Bg/btnWave") this.btnRank = Util.GetGameObject(self.gameObject, "Bg/btnRank") + this.btnReward = Util.GetGameObject(self.gameObject, "Bg/btnReward") -- 跳过战斗 this.battleJumpRoot = Util.GetGameObject(self.gameObject, "passBattle") @@ -103,6 +104,20 @@ function MonsterCampPanel:BindEvent() MonsterCampManager.SetBattleJump(not isOn) this.InitShow() end) + Util.AddClick(this.btnReward, function () + UIManager.OpenPanel(UIName.TrialRewardPopup,MonsterCampManager.SetRewardData(),function(id,rewardFunc) + NetManager.RequestLevelReward(id, function(msg) + MonsterCampManager.SetRewardWave({id}) --本地记录已领奖励信息 + UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() + if rewardFunc then + rewardFunc() + end + CheckRedPointStatus(RedPointType.TrialReward) + CheckRedPointStatus(RedPointType.Trial) + end) + end) + end) + end) end --添加事件监听(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index 06db0ecad3..e2ac10668c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -2,9 +2,10 @@ require("Base/BasePanel") local TrialRewardPopup = Inherit(BasePanel) local this = TrialRewardPopup -local trialKillConfig=ConfigManager.GetConfig(ConfigName.TrialKillConfig) +local rewardConfig local itemList={} --预设容器 local sortingOrder=0 +local getFunc = {} function TrialRewardPopup:InitComponent() this.panel=Util.GetGameObject(this.gameObject,"Panel") this.backBtn=Util.GetGameObject(this.panel,"BackBtn") @@ -39,7 +40,9 @@ function TrialRewardPopup:OnSortingOrderChange() end function TrialRewardPopup:OnOpen(...) - + local arg = {...} + rewardConfig = arg[1] + getFunc = arg[2] end function TrialRewardPopup:OnShow() @@ -57,12 +60,8 @@ end --刷新 function this.RefreshPanel() - local d={} - for _, configInfo in ConfigPairs(trialKillConfig) do - table.insert(d, configInfo) - end - this.scrollView:SetData(d,function(index,root) - this.SetScrollPre(root,d[index]) + this.scrollView:SetData(rewardConfig,function(index,root) + this.SetScrollPre(root,rewardConfig[index]) end) this.scrollView:SetIndex(1) end @@ -75,23 +74,24 @@ function this.SetScrollPre(root,data) local getBtn=Util.GetGameObject(root,"GetBtn") local mask=Util.GetGameObject(root,"mask") - info.text=string.format( Language[11616],data.Count,MapTrialManager.GetKilCount(),data.Count) + info.text=data.info --string.format( Language[11616],data.Count,MapTrialManager.GetKilCount(),data.Count) ResetItemView(root,grid.transform,itemList,#data.BoxReward,0.9,sortingOrder,false,data.BoxReward) --按钮状态 - local s=MapTrialManager.GetTrialRewardState(data.Id) - goBtn:GetComponent("Button").interactable=s~=0 - if s==0 then + --local s=MapTrialManager.GetTrialRewardState(data.Id) + goBtn:GetComponent("Button").interactable=data.state~=0 + + if data.state==0 then -- goText.text=Language[10350] mask:SetActive(true) goBtn:SetActive(false) getBtn:SetActive(false) - elseif s==1 then + elseif data.state==1 then -- goText.text=Language[10022] mask:SetActive(false) goBtn:SetActive(false) getBtn:SetActive(true) - elseif s==2 then + elseif data.state==2 then -- goText.text=Language[10023] mask:SetActive(false) goBtn:SetActive(true) @@ -102,18 +102,26 @@ function this.SetScrollPre(root,data) this:ClosePanel() end) Util.AddOnceClick(getBtn,function() - NetManager.RequestLevelReward(data.Id, function(msg) - MapTrialManager.SetTrialRewardInfo(data.Id) --本地记录已领奖励信息 - UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function() + if getFunc then + getFunc(data.Id,function() mask:SetActive(true) getBtn:SetActive(false) + this.ChangeState(data.Id) this.RefreshPanel() CheckRedPointStatus(RedPointType.TrialReward) CheckRedPointStatus(RedPointType.Trial) end) - end) + end end) end +function this.ChangeState(id) + for k,v in ipairs(rewardConfig) do + if v.Id == data.Id then + v.state = 0 + return + end + end +end return TrialRewardPopup \ No newline at end of file