From bc1b55d7f3e68e5cbdba421855b766d13159a497 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 29 Apr 2021 16:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B8=8F=E7=A2=8E=E5=87=8C=E9=9C=84?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E5=8C=85=E5=8E=A2=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaSuiLingXiao/TaSuiLingXiaoPanel.prefab | 98 ++++++++++++++++++- .../TaSuiLingXiao/TaSuiLingXiaoPanel.lua | 4 + 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab index 747c6e95a3..7e2c538ba3 100644 --- a/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TaSuiLingXiao/TaSuiLingXiaoPanel.prefab @@ -849,6 +849,101 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &3360248905253138725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1905241399309562114} + - component: {fileID: 8011557595146275574} + - component: {fileID: 1161351346277170949} + - component: {fileID: 8060048462192868648} + m_Layer: 5 + m_Name: count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1905241399309562114 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360248905253138725} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 7.099057} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6412076940529638420} + 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: 389, y: -57} + m_SizeDelta: {x: 40, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8011557595146275574 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360248905253138725} + m_CullTransparentMesh: 0 +--- !u!114 &1161351346277170949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360248905253138725} + 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: 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: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 0/45 +--- !u!114 &8060048462192868648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3360248905253138725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.47058824} + m_EffectDistance: {x: 2, y: -2} + m_UseGraphicAlpha: 1 --- !u!1 &3552130636997229061 GameObject: m_ObjectHideFlags: 0 @@ -1596,6 +1691,7 @@ RectTransform: - {fileID: 1639871059842017831} - {fileID: 1845967133346787627} - {fileID: 4908628792640704078} + - {fileID: 1905241399309562114} m_Father: {fileID: 1888552066746623679} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1640,7 +1736,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: 422, y: 2} + m_AnchoredPosition: {x: 387, y: 2} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2228000263759491488 diff --git a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua index 3fef1278c2..f15ecdee4f 100644 --- a/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TaSuiLingXiao/TaSuiLingXiaoPanel.lua @@ -16,6 +16,7 @@ function TaSuiLingXiao:InitComponent() self.finishedText = Util.GetGameObject(self.mid, "FinishedText") self.progress = Util.GetGameObject(self.mid, "progress") self.progressNum = Util.GetGameObject(self.mid, "progress/num"):GetComponent("Text") + self.count = Util.GetGameObject(self.mid, "progress/count"):GetComponent("Text") self.slide = Util.GetGameObject(self.mid, "progress/slide"):GetComponent("Image") self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition self.liveRoot = Util.GetGameObject(self.gameObject, "bg/liveRoot") @@ -162,15 +163,18 @@ function TaSuiLingXiao:ShowSlide() local bossMax = self.configData.BoxList[#self.configData.BoxList][1] local curBoss = 0 local boxId = 0 + local count = "" for i = 1, #self.configData.BoxList do if historyMax < self.configData.BoxList[i][1] then curBoss = self.configData.BoxList[i][1] boxId = self.configData.BoxList[i][2] + count = string.format("%s/%s",i,#self.configData.BoxList) break end end self.btnBox:GetComponent("Image").sprite = Util.LoadSprite(artConfig[boxId].Name) self.progressNum.text = string.format("%s/%s",historyMax,curBoss) + self.count.text = count self.slide.fillAmount = historyMax/curBoss self.finishedText:SetActive(historyMax == bossMax) self.progress:SetActive((historyMax > 0) and (historyMax < bossMax))