From 9b6e14eeb166a8a1c8aaf0fd24b978507107dc64 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 17 Jun 2021 17:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=83=8A=E5=96=9C=E7=A4=BC=E7=9B=92?= =?UTF-8?q?=E3=80=91=E5=AE=8C=E6=88=90=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/SurpriseBox/SurpriseBoxPanel.prefab | 87 ++++++++++++++++++- .../NewActivity/CommonActPageManager.lua | 5 ++ .../Modules/SurpriseBox/SurpriseBoxPanel.lua | 42 +++++---- 3 files changed, 113 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/SurpriseBox/SurpriseBoxPanel.prefab b/Assets/ManagedResources/Prefabs/UI/SurpriseBox/SurpriseBoxPanel.prefab index 98c607712c..63556eba33 100644 --- a/Assets/ManagedResources/Prefabs/UI/SurpriseBox/SurpriseBoxPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SurpriseBox/SurpriseBoxPanel.prefab @@ -1436,7 +1436,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: -17, y: 50} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 227, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4672850317318427347 @@ -2447,7 +2447,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: -5, y: -27} + m_AnchoredPosition: {x: 0, y: -27} m_SizeDelta: {x: 254, y: 39} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2291346935398938331 @@ -3066,6 +3066,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6250846135457410054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7668763973216456267} + - component: {fileID: 4956397180043756474} + - component: {fileID: 3405265255703608832} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7668763973216456267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250846135457410054} + 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: 7722167287271391657} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4956397180043756474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250846135457410054} + m_CullTransparentMesh: 0 +--- !u!114 &3405265255703608832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6250846135457410054} + 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7B2C\u4E94\u65E5\u5F00\u542F\uFF0C\u656C\u8BF7\u671F\u5F85\u2026" + LanguageIndex: 0 --- !u!1 &6427665830375236391 GameObject: m_ObjectHideFlags: 0 @@ -4218,6 +4298,7 @@ RectTransform: m_Children: - {fileID: 4484483743944203898} - {fileID: 1208005355785250277} + - {fileID: 7668763973216456267} m_Father: {fileID: 2071093526669120201} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4488,7 +4569,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: 59, y: 103} + m_AnchoredPosition: {x: 100, y: 103} m_SizeDelta: {x: 129, y: 89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1780912265898179225 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index bebdc706d3..7a43d6d48b 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -141,6 +141,11 @@ local TypeUpdateFunc = { end end end + for i = #curData.rewards, 1,-1 do + if curData.rewards[i].progress == 5 then + table.remove(curData.rewards,i) + end + end end, } diff --git a/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua index d1e7cda765..059cb914ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua @@ -9,6 +9,7 @@ function SurpriseBox:InitComponent() self.mask = Util.GetGameObject(self.gameObject, "mask") self.scrollItem = Util.GetGameObject(self.gameObject, "panel/kuang/scroll") self.itemPre = Util.GetGameObject(self.gameObject, "ItemPre") + self.viewText = Util.GetGameObject(self.gameObject, "panel/view/Text") self.viewList = {} for i = 1, 4 do self.viewList[i] = Util.GetGameObject(self.gameObject, "panel/view/Grid/Item ("..i..")") @@ -82,7 +83,6 @@ end function SurpriseBox:ShowSingleData(item,data,index) LogGreen("PackId:"..tostring(data.otherData.PackId).." State:"..tostring(data.progress)) - if data.progress == 5 then return end local box = Util.GetGameObject(item,"box"):GetComponent("Image") local lock = Util.GetGameObject(item,"lock") local getBtn = Util.GetGameObject(item,"getBtn") @@ -100,7 +100,7 @@ function SurpriseBox:ShowSingleData(item,data,index) img:SetActive(data.otherData.Warning ~= nil) box.sprite = self.spLoader:LoadSprite("q_qiankun_xiangzi_01")--有色宝箱 tip:SetActive(false) - tipText.text = string.format("第%s天可购买",NumToSimplenessFont[data.otherData.BuyDay]) + tipText.text = string.format("%s天后可购买", data.otherData.BuyDay - self.actData.value) price:SetActive(true) priceText.text = string.format("%s元",data.otherData.Price) lock:SetActive(false) @@ -119,11 +119,11 @@ function SurpriseBox:ShowSingleData(item,data,index) elseif data.progress == 6 then--可见了,未解锁,可预览 box.sprite = self.spLoader:LoadSprite("j_jingxilihe_baoxiang2")--灰色宝箱 tip:SetActive(true) - lock:SetActive(false) + lock:SetActive(true) elseif data.progress == 7 then--可见了,未解锁,不可预览 box.sprite = self.spLoader:LoadSprite("j_jingxilihe_baoxiang2")--灰色宝箱 tip:SetActive(true) - lock:SetActive(false) + lock:SetActive(true) elseif data.progress == 8 then--买完了 box.sprite = self.spLoader:LoadSprite("j_jingxilihe_baoxiang2")--灰色宝箱 finished:SetActive(true) @@ -170,21 +170,27 @@ function SurpriseBox:SetViewList() for i = 1, 4 do self.viewList[i]:SetActive(false) end - local reward = self.PackData.otherData.Reward - for i = 1, #reward do - self.viewList[i]:SetActive(true) - local icon = Util.GetGameObject(self.viewList[i],"icon"):GetComponent("Image") - local name = Util.GetGameObject(self.viewList[i],"Text"):GetComponent("Text") - if not self.itemViewList[i] then - self.itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,self.viewList[i].transform) - end - self.itemViewList[i]:OnOpen(false, reward[i], 0,false,false,false,self.sortingOrder) - icon.sprite = SetIcon(self.spLoader,reward[i][1]) - name.text = string.format("%s×%s",itemConfig[reward[i][1]].Name,reward[i][2]) + if self.PackData.progress ~= 7 then + self.viewText:SetActive(false) + local reward = self.PackData.otherData.Reward + for i = 1, #reward do + self.viewList[i]:SetActive(true) + local icon = Util.GetGameObject(self.viewList[i],"icon"):GetComponent("Image") + local name = Util.GetGameObject(self.viewList[i],"Text"):GetComponent("Text") + if not self.itemViewList[i] then + self.itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,self.viewList[i].transform) + end + self.itemViewList[i]:OnOpen(false, reward[i], 0,false,false,false,self.sortingOrder) + icon.sprite = SetIcon(self.spLoader,reward[i][1]) + name.text = string.format("%s×%s",itemConfig[reward[i][1]].Name,reward[i][2]) - Util.AddOnceClick(icon.gameObject,function () - self.itemViewList[i]:OnBtnCkickEvent(reward[i][1]) - end) + Util.AddOnceClick(icon.gameObject,function () + self.itemViewList[i]:OnBtnCkickEvent(reward[i][1]) + end) + end + else + self.viewText:SetActive(true) + self.viewText:GetComponent("Text").text = string.format("%s天后开启,敬请期待···",self.PackData.otherData.BuyDay - self.actData.value) end end