diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab index 431eb89a11..c0aaadab00 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/EndLessCarbonPanel.prefab @@ -2021,9 +2021,9 @@ 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: -8.84, y: -77.650024} - m_SizeDelta: {x: 844.01, y: 155.3} - m_Pivot: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -8.840011, y: 77.650024} + m_SizeDelta: {x: 844.01, y: 0} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &2171549816907207518 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2031,7 +2031,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5160808257557411106} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2060,7 +2060,7 @@ MonoBehaviour: m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 --- !u!1 &5250587001998588755 GameObject: m_ObjectHideFlags: 0 @@ -2257,7 +2257,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5603089670860860651} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -2583,7 +2583,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 810.01, y: 16} + m_SizeDelta: {x: 810.01, y: 0} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4961086051323416824 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab index ddaad80ea6..a212addbdc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab @@ -2032,6 +2032,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u51FB\u8D255\u540D\u654C\u4EBA\uFF080/5\uFF09" LanguageIndex: 11378 +--- !u!1 &3745299035932216513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1374067341726917357} + - component: {fileID: 7336914229570142369} + - component: {fileID: 2256800829833974568} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1374067341726917357 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3745299035932216513} + 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: 4953167012788485815} + m_RootOrder: 5 + 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: 312.85, y: 1} + m_SizeDelta: {x: 216, y: 116} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7336914229570142369 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3745299035932216513} + m_CullTransparentMesh: 0 +--- !u!114 &2256800829833974568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3745299035932216513} + 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: 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: 21300000, guid: 3a19d32f59f4c2647be996277c6a2703, 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 &3751419510590610970 GameObject: m_ObjectHideFlags: 0 @@ -2186,102 +2260,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4570468645757834807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7629979870397849939} - - component: {fileID: 1821632006865487065} - - component: {fileID: 6355391102707366821} - - component: {fileID: 4146309203057698916} - m_Layer: 5 - m_Name: mask - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7629979870397849939 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4570468645757834807} - 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: 4953167012788485815} - m_RootOrder: 5 - 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: 312.85, y: 10.65} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1821632006865487065 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4570468645757834807} - m_CullTransparentMesh: 0 ---- !u!114 &6355391102707366821 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4570468645757834807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &4146309203057698916 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4570468645757834807} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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: 44 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 44 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u5DF2\u9886\u53D6" - LanguageIndex: 10004 --- !u!1 &4833811047410647605 GameObject: m_ObjectHideFlags: 0 @@ -3362,7 +3340,7 @@ RectTransform: - {fileID: 6992224539577121956} - {fileID: 5853479613635871175} - {fileID: 5408553177397332618} - - {fileID: 7629979870397849939} + - {fileID: 1374067341726917357} - {fileID: 6128043501703289260} m_Father: {fileID: 9018336820421192237} m_RootOrder: 2 diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index f3c58c3fc5..978cf1abd2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -672,7 +672,6 @@ function this.InitMissionData() end function this.SetRewardData() - MonsterCampManager.preType = 1 local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.wujinfuben) for k,v in ipairs(this.mission) do for j = 1,#allMissionData do diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua index 66fbf069db..0b07c4dc26 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua @@ -215,6 +215,7 @@ function EndLessMapView:BindEvent() return end if not this:CanClick() then return end + MonsterCampManager.preType = 2 UIManager.OpenPanel(UIName.TrialRewardPopup,EndLessMapManager.SetRewardData(),function(id,rewardFunc) NetManager.TakeMissionRewardRequest(TaskTypeDef.wujinfuben,id,function (msg) UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function()