diff --git a/Assets/ManagedResources/Prefabs/UI/JourneyWithWind/JourneyWithWindPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JourneyWithWind/JourneyWithWindPanel.prefab index f4f0a89f00..851ffc0287 100644 --- a/Assets/ManagedResources/Prefabs/UI/JourneyWithWind/JourneyWithWindPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JourneyWithWind/JourneyWithWindPanel.prefab @@ -347,6 +347,7 @@ RectTransform: m_LocalScale: {x: 1.0004462, y: 1.0004462, z: 1.0004462} m_Children: - {fileID: 4469683468750599681} + - {fileID: 1186578651053264938} m_Father: {fileID: 1102052322136090187} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3331,7 +3332,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u4E3B\u7EBF\u5173\u5361\u5361" + m_Text: "\u5956\u52B1" LanguageIndex: 0 --- !u!1 &1786804384331322804 GameObject: @@ -9676,6 +9677,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5108616311650332514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1186578651053264938} + - component: {fileID: 9188574295627705102} + - component: {fileID: 3413783486708343544} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1186578651053264938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5108616311650332514} + m_LocalRotation: {x: 0, y: 0, z: 0.05826097, w: 0.99830145} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1490639867638591168} + m_Father: {fileID: 4162933811339121748} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 6.68} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -15, y: 59} + m_SizeDelta: {x: 145.27, y: 85.77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9188574295627705102 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5108616311650332514} + m_CullTransparentMesh: 0 +--- !u!114 &3413783486708343544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5108616311650332514} + 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: 258d0de9bff365c4fb4b323882169a9c, 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 &5128744676066453791 GameObject: m_ObjectHideFlags: 0 @@ -12124,6 +12200,101 @@ RectTransform: m_AnchoredPosition: {x: 750.4, y: -204.875} m_SizeDelta: {x: 168, y: 352.18} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6700314147855198333 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1490639867638591168} + - component: {fileID: 7530403232714161594} + - component: {fileID: 5741218370385024171} + - component: {fileID: 7688365355073319887} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1490639867638591168 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700314147855198333} + 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: 1186578651053264938} + 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: -12.3, y: -3.4} + m_SizeDelta: {x: 91.06, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7530403232714161594 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700314147855198333} + m_CullTransparentMesh: 0 +--- !u!114 &5741218370385024171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700314147855198333} + 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.99215686, g: 0.98039216, b: 0.78431374, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53CC\u6708\u5361\u4E13\u4EAB" +--- !u!114 &7688365355073319887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6700314147855198333} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.42745098, g: 0.25490198, b: 0.1764706, a: 1} + m_EffectDistance: {x: 2, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6709248652871501660 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua index 792e5b861b..bd819d8bb8 100644 --- a/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JourneyWithWind/JourneyWithWindPanel.lua @@ -371,16 +371,23 @@ function this.ShowDayDataActivityReward() else Util.AddOnceClick(getBtn, function() if isGetState then - NetManager.GetActivityRewardRequest(curRewardTaskData.missionId, activityData.activityId, function(drop) - UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() - btnText.text = "已领取" - getBtn:GetComponent("Button").enabled = false - Util.SetGray(getBtn,true) - redPoint:SetActive(false) - CheckRedPointStatus(RedPointType.JourneyWithWind) - this.ShowDayBtnsData() + if MonthCardManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.LUXURYMONTHCARD) and MonthCardManager.GetMonthCardIsOpen(MONTH_CARD_TYPE.GIFT) then + NetManager.GetActivityRewardRequest(curRewardTaskData.missionId, activityData.activityId, function(drop) + UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() + btnText.text = "已领取" + getBtn:GetComponent("Button").enabled = false + Util.SetGray(getBtn,true) + redPoint:SetActive(false) + CheckRedPointStatus(RedPointType.JourneyWithWind) + this.ShowDayBtnsData() + end) end) - end) + else + MsgPanel.ShowTwo("当前仍有未激活的月卡,是否前往查看激活?", function() + end, function() + JumpManager.GoJump(36004) + end, Language[10731], Language[10019],nil, false) + end else if curRewardTaskData.state == 0 then PopupTipPanel.ShowTip("完成当日所有目标才可领取!")