From 3b62c91c6919d029f5e5da410d4006c2518b70b0 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 19 Oct 2020 11:40:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=8D=E9=81=A5=E6=B8=B8?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9A=82=E4=B8=8D=E5=BC=80=E6=94=BE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab | 62 +++++++++---------- .../~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua | 47 +++++++------- 2 files changed, 52 insertions(+), 57 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab index 3694a308ee..8b538f2937 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoYouPanel.prefab @@ -975,7 +975,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &125408333 RectTransform: m_ObjectHideFlags: 0 @@ -1492,7 +1492,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &246930214 @@ -1530,7 +1530,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1873,7 +1873,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &339605738 @@ -1911,7 +1911,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2043,7 +2043,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &381443216 @@ -2081,7 +2081,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -3654,7 +3654,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &620265399 RectTransform: m_ObjectHideFlags: 0 @@ -3730,7 +3730,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &631857903 RectTransform: m_ObjectHideFlags: 0 @@ -5043,7 +5043,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &876873962 @@ -5081,7 +5081,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -5422,7 +5422,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &910934217 RectTransform: m_ObjectHideFlags: 0 @@ -6205,7 +6205,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1046873122 @@ -6243,7 +6243,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -9153,7 +9153,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1432809733 RectTransform: m_ObjectHideFlags: 0 @@ -9481,7 +9481,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1486657852 RectTransform: m_ObjectHideFlags: 0 @@ -9653,7 +9653,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1498523454 RectTransform: m_ObjectHideFlags: 0 @@ -10037,7 +10037,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1555781816 @@ -10075,7 +10075,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -10443,7 +10443,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1599155049 @@ -10481,7 +10481,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -10595,7 +10595,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1616179281 RectTransform: m_ObjectHideFlags: 0 @@ -11155,7 +11155,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1749371890 RectTransform: m_ObjectHideFlags: 0 @@ -12212,7 +12212,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1882786942 RectTransform: m_ObjectHideFlags: 0 @@ -12306,7 +12306,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1897034938 @@ -12344,7 +12344,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -12474,7 +12474,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: 52, y: -1481} + m_AnchoredPosition: {x: 32, y: -1481} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1928246518 @@ -12586,7 +12586,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1934369478 @@ -12624,7 +12624,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -13368,7 +13368,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.000015258789, y: -41.63} + m_AnchoredPosition: {x: 0.000015258789, y: -130.00012} m_SizeDelta: {x: 50.8, y: 200.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2092370304 @@ -13406,7 +13406,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 50 - m_Alignment: 4 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index 0c29f81029..2c0cbc183a 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -5,19 +5,6 @@ local cursortingOrder local freeTravel = ConfigManager.GetConfig(ConfigName.FreeTravel) local _MaxNum = 10 -local _Zi = { - [1] = "x_xiaoyaoyou_ditu_dizi", - [2] = "x_xiaoyaoyou_ditu_buzi", - [3] = "x_xiaoyaoyou_ditu_hezi", - [4] = "x_xiaoyaoyou_ditu_huangzi", - [5] = "x_xiaoyaoyou_ditu_jingzi", - [6] = "x_xiaoyaoyou_ditu_longzi", - [7] = "x_xiaoyaoyou_ditu_luzi", - [8] = "x_xiaoyaoyou_ditu_shengzi", - [9] = "x_xiaoyaoyou_ditu_xianzi", - [10] = "x_xiaoyaoyou_ditu_xuezi", -} - --初始化组件(用于子类重写) function this:InitComponent() @@ -67,7 +54,7 @@ function this:OnOpen(data) local _cruLevel = PlayerManager.level Log("当前玩家等级:".._cruLevel) for index, config in ConfigPairs(freeTravel) do - local _isUnLock=_cruLevel>=config.UnlockLevel--判断章节是否开启 + local _isUnLock = config.UnlockLevel >= 0 and _cruLevel >= config.UnlockLevel--判断章节是否开启 local showReward = ConfigManager.GetConfigData(ConfigName.RewardGroup,config.FinalReward).ShowItem local _progress=0 Log("当前mapid:"..config.MapID) @@ -78,6 +65,7 @@ function this:OnOpen(data) mapId=config.MapID, mapName=config.FreeTravelName, mapImage=config.MapIcon, + ziImage=config.NameIcon, isUnLock=_isUnLock, progress=_progress, passReward=showReward[1], @@ -115,9 +103,9 @@ function this.SingleDataShow(btn, go, data, index) local reward = Util.GetGameObject(go, "fightIcon/reward") local name = Util.GetGameObject(go, "fightIcon/name"):GetComponent("Text") local _rewardObj= SubUIManager.Open(SubUIConfig.ItemView, reward.transform) - local progressObj=Util.GetGameObject(go,"fightIcon/progress") - local progress=Util.GetGameObject(go,"fightIcon/progress/Image"):GetComponent("Image") - local progressVle=Util.GetGameObject(go,"fightIcon/progress/Text"):GetComponent("Text") + -- local progressObj=Util.GetGameObject(go,"fightIcon/progress") + -- local progress=Util.GetGameObject(go,"fightIcon/progress/Image"):GetComponent("Image") + -- local progressVle=Util.GetGameObject(go,"fightIcon/progress/Text"):GetComponent("Text") local tip = Util.GetGameObject(go,"fightIcon/tip"):GetComponent("Text") local num = Util.GetGameObject(go,"fightIcon/tip/num"):GetComponent("Text") local tip2 = Util.GetGameObject(go,"fightIcon/tip/tip"):GetComponent("Text") @@ -136,20 +124,27 @@ function this.SingleDataShow(btn, go, data, index) -- lock:SetActive(not data.isUnLock) name.text=data.mapName if data.isUnLock then - tip.text = "已\n解\n锁" + tip.text = "云\n游\n进\n度" tip2.text = "" - num.text = "" + local prog=data.progress < 100 and data.progress or 0 + num.text = string.format("%u\n%%",prog) else - tip.text = "玩\n家\n等\n级" - tip2.text = "解\n锁" - num.text = data.unlockLevel + if data.unlockLevel >= 0 then + tip.text = "玩\n家\n等\n级" + tip2.text = "解\n锁" + num.text = data.unlockLevel + else + tip.text = "敬\n请\n期\n待" + tip2.text = "" + num.text = "" + end end -- fightIcon.sprite=Util.LoadSprite(data.mapImage) - zi.sprite = Util.LoadSprite(_Zi[index]) + zi.sprite = Util.LoadSprite(data.ziImage) local prog=data.progress < 100 and data.progress or 0 - progressObj:SetActive(data.isUnLock) - progress.fillAmount=prog/100 - progressVle.text=string.format("%u/100",prog) + -- progressObj:SetActive(data.isUnLock) + -- progress.fillAmount=prog/100 + -- progressVle.text=string.format("%u/100",prog) _rewardObj:OnOpen(false, data.passReward, 1) end function this:OnShow()