diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarGift.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarGift.prefab index 3d7d71f2fb..05b566a1e3 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarGift.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/UpStarGift.prefab @@ -309,7 +309,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8454504298841997453} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -388,11 +388,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5810025747253022854} - {fileID: 395463002317354654} - {fileID: 6391445494830930080} - {fileID: 4714540340252889000} - {fileID: 6529346918078605616} - - {fileID: 5810025747253022854} - {fileID: 2426106541411852941} - {fileID: 3852872511820499555} - {fileID: 3897601406745934660} @@ -451,7 +451,8 @@ GameObject: m_Component: - component: {fileID: 5810025747253022854} - component: {fileID: 1274816371022389869} - - component: {fileID: 1051729076567138337} + - component: {fileID: 1024404281980088491} + - component: {fileID: 3500278342993290022} m_Layer: 5 m_Name: live m_TagString: Untagged @@ -472,7 +473,7 @@ RectTransform: m_Children: - {fileID: 8550321217173031876} m_Father: {fileID: 8454504298841997453} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -487,7 +488,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1976316999412061881} m_CullTransparentMesh: 0 ---- !u!114 &1051729076567138337 +--- !u!114 &1024404281980088491 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -496,9 +497,39 @@ MonoBehaviour: m_GameObject: {fileID: 1976316999412061881} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 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!114 &3500278342993290022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976316999412061881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &2384432804281337261 GameObject: m_ObjectHideFlags: 0 @@ -694,7 +725,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8454504298841997453} - m_RootOrder: 1 + 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} @@ -1035,7 +1066,7 @@ RectTransform: m_Children: - {fileID: 8077133622727871801} m_Father: {fileID: 8454504298841997453} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1110,6 +1141,7 @@ RectTransform: m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: - {fileID: 440106847441782755} + - {fileID: 194438041716442628} m_Father: {fileID: 8454504298841997453} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1308,7 +1340,7 @@ 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: 0, y: 0} + m_AnchoredPosition: {x: 310, y: -550} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5759065364542601348 @@ -1602,6 +1634,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: LanguageIndex: 0 +--- !u!1 &7613568661227146198 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 194438041716442628} + - component: {fileID: 5256207338311503178} + - component: {fileID: 6142660401723770194} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &194438041716442628 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7613568661227146198} + 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: 2426106541411852941} + 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: 116.6, y: 30.5} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5256207338311503178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7613568661227146198} + m_CullTransparentMesh: 0 +--- !u!114 &6142660401723770194 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7613568661227146198} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7836232575941379537 GameObject: m_ObjectHideFlags: 0 @@ -1758,7 +1864,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8454504298841997453} - m_RootOrder: 0 + 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} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 94928daf48..dd44bc517b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -991,6 +991,7 @@ RedPointType = { wujinTreasure = 8501, wujinBianDui = 8502, chaofanrushengRed = 8503, + UpStarGift = 8504, jijin128 = 78, jijin328 = 79, diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 209354cfc2..89f9f58417 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1187,6 +1187,24 @@ function this.CheckRedPointChaofanRuSheng() end return false end +--限时升星红点检查 +function this.CheckRedPointUpStarGift() + if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.UpStarGift) then + return false + end + local data = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.UpStarGift) + if data and data.mission and #data.mission > 0 then + if not data.value or data.value == 0 then + return true + end + for i = 1, #data.mission do + if data.mission[i].state == 1 then + return true + end + end + end + return false +end --右侧伸缩条大小检测 function this.CheckRightUpArenaSize() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua index 6ca1496bd7..3ef6b96754 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua @@ -61,7 +61,7 @@ function UpStarGift:BindEvent() UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) end) Util.AddClick(self.btnAdd,function() - local choose, isTemp = self:GetCurChooseHero() + local choose, isTemp = self:GetCurChooseHero() if not isTemp then PopupTipPanel.ShowTip("当前已处于锁定状态") return @@ -71,8 +71,6 @@ function UpStarGift:BindEvent() PopupTipPanel.ShowTip("未找到本期活动的神将信息") return end - LogRedTable(heroList) - LogRed(choose) -- 打开选择界面 UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero, heroList, choose, function(chooseId) self.tempChoose = chooseId @@ -105,6 +103,10 @@ function UpStarGift:BindEvent() end) Util.AddClick(self.btnLock,function() local choose, isTemp = self:GetCurChooseHero() + if not choose or choose == 0 then + PopupTipPanel.ShowTip("请先选择一个神将") + return + end if not isTemp then PopupTipPanel.ShowTip("当前已处于锁定状态") return @@ -208,6 +210,12 @@ function UpStarGift:RefreshData(isUpdata,isTop,isAni) if self.actConfig.RpType > 0 then CheckRedPointStatus(self.actConfig.RpType) end + + -- 按钮显示 + local choose, isTemp = self:GetCurChooseHero() + self.btnAdd:SetActive(choose == 0 and isTemp) + self.btnChoose:SetActive(isTemp) + self.btnLock:SetActive(isTemp) self:RefreshActData(isTop,isAni) self:RefreshTime() @@ -231,7 +239,7 @@ end -- 获取当前选择的人（临时/锁定） function UpStarGift:GetCurChooseHero() local choose = 0 - local isTemp = false + local isTemp = true if self.ActData.value and self.ActData.value ~= 0 then choose = self.ActData.value isTemp = false @@ -240,19 +248,20 @@ function UpStarGift:GetCurChooseHero() choose = self.tempChoose isTemp = true end - -- 没有的话就选第一个人作为默认显示的奖励 - if choose == 0 then - choose = self.ActData.rewards[1].targetId - isTemp = true - end return choose, isTemp end -- 获取奖励列表 function UpStarGift:GetRewardDataList() local choose = self:GetCurChooseHero() - local dataList = {} + + -- 没有的话就选第一个人作为默认显示的奖励 + if choose == 0 then + choose = self.ActData.rewards[1].targetId + end + -- 显示列表 + local dataList = {} for k, v in ipairs(self.ActData.rewards) do if v.targetId == choose then table.insert(dataList, v) @@ -335,6 +344,7 @@ function UpStarGift:RefreshLive() local live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform, Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0)) live:GetComponent("SkeletonGraphic").AnimationState:SetAnimation(0, "idle", true) + live.transform.sizeDelta = Vector2.New(10000, 10000) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 566a922a38..ace7802f15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -601,6 +601,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Practice_fourQua,PracticeManager.CheckFourQuadrantRed,FUNCTION_OPEN_TYPE.PRACTICE) RPData:AddCheckFunc(RedPointType.Practice_Cultivation,PracticeManager.CheckPlayerCultivetionRed,FUNCTION_OPEN_TYPE.PRACTICE) RPData:AddCheckFunc(RedPointType.chaofanrushengRed,ActivityGiftManager.CheckRedPointChaofanRuSheng) + RPData:AddCheckFunc(RedPointType.UpStarGift,ActivityGiftManager.CheckRedPointUpStarGift) --山河试炼 RPData:AddCheckFunc(RedPointType.FightLevelTrial,FightLevelManager.CheckTrialRedPoint) diff --git a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua index 63f9f7db29..ab88080226 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua @@ -31,6 +31,10 @@ end --绑定事件（用于子类重写） function UpStarPre:BindEvent() Util.AddOnceClick(self.btnBuy.gameObject, function() + if self.isTemp then + PopupTipPanel.ShowTip("请先选择一个神将") + return + end if self.data.state == 0 then PopupTipPanel.ShowTip("神将达指定星级后解锁") return @@ -42,6 +46,10 @@ function UpStarPre:BindEvent() end) Util.AddOnceClick(self.GetBtn, function() + if self.isTemp then + PopupTipPanel.ShowTip("请先选择一个神将") + return + end NetManager.GetActivityRewardRequest(self.data.missionId,self.actData.activityId,function(msg) UIManager.OpenPanel(UIName.RewardItemPopup,msg,1) self.data.state = 2 @@ -104,6 +112,29 @@ function UpStarPre:SetShows(key,shows,parent) end self.itemList[key][i].go.gameObject:SetActive(true) self.itemList[key][i].item:OnOpen(false, {shows[i][1],shows[i][2],shows[i][3],shows[i][4]}, 0.85,false,false,false,self.sortingOrder) + -- 定制显示 + if self.parent.GetCurChooseHero then + self.choose, self.isTemp = self.parent:GetCurChooseHero() + -- 临时状态不再显示锁头 + if self.isTemp then + self.itemList[key][i].lock.gameObject:SetActive(false) + end + -- 未选择时角色和角色碎片显示问号 + if self.choose == 0 then + local con = itemConfig[shows[i][1]] + if con and (con.ItemType == ItemType.Hero or con.ItemType == ItemType.HeroDebris) then + -- 不显示阵营 + self.itemList[key][i].item.proImage.gameObject:SetActive(false) + self.itemList[key][i].item.fragmentIcon.gameObject:SetActive(false) + -- 显示问号 + self.itemList[key][i].item.icon.sprite = self.spLoader:LoadSprite("y_yosr_wenhao") + self.itemList[key][i].item.icon:SetNativeSize() + -- 屏蔽按钮事件 + Util.AddOnceClick(self.itemList[key][i].item.frameBtn, function() end) + end + + end + end end end end @@ -116,7 +147,8 @@ function UpStarPre:SetBtn1() self.itemList[2][i].Get.gameObject:SetActive(false) end end - if self.data.state == 1 then + -- 只有在锁定状态才显示可领取 + if self.data.state == 1 and not self.isTemp then self.GetBtn.gameObject:SetActive(true) self.redPoint.gameObject:SetActive(true) else @@ -145,7 +177,8 @@ function UpStarPre:SetBtn() self.btnBuy.enabled = false self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[2].sprte) else - if self.data.state == 0 then + -- 未选择神将时显示未购买 + if self.data.state == 0 or self.isTemp then self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[0].sprte) else self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite(State[1].sprte) diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 66cc8040fe..4f35651699 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -112,6 +112,8 @@ function ItemView:OnOpen(isGet, itemDatas, _scale, isShowName, isShowAddImage, i elseif isGet == false and itemDatas then self:NoGetRewardShow(itemDatas, effectLayer, isShowAddImage) end + -- 重置icon大小 + self.icon.transform.sizeDelta = Vector2.New(120, 120) end function ItemView:GetRewardShow(_itemData, effectLayer) self.rightUplv.gameObject:SetActive(false)