From a2ed23dd2403286aa817ad4edd6060082e89c126 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 26 Jan 2021 11:00:12 +0800 Subject: [PATCH] Revert "tips loading tijiao" This reverts commit 27066d703349f9e263060f9640b95c3926f6b0bc. --- .../Prefabs/UI/Loading/LoadingPanel.prefab | 10 +++++----- Assets/ManagedResources/~Lua/Data/ConfigData.lua | 1 - .../~Lua/Modules/Message/LoadingPanel.lua | 5 +---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab index 5c9820fd3f..62637e4fa3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab @@ -109,8 +109,8 @@ 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: -9.5, y: -5.1000004} - m_SizeDelta: {x: 883.1, y: 30} + m_AnchoredPosition: {x: 0, y: -5.1000004} + m_SizeDelta: {x: 720, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222588509206233048 CanvasRenderer: @@ -147,13 +147,13 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 1 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: "\u6B63\u5728\u66F4\u65B0\u6E38\u620F\u8D44\u6E90... 43%" LanguageIndex: 10922 --- !u!1 &1532315163269532 GameObject: diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 3d3b4f03a0..1184ec89f1 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -180,7 +180,6 @@ ConfigName = { SpiritAnimalSummon = "SpiritAnimalSummon", NewHeroConfig = "NewHeroConfig", PlayerHeadIcon = "PlayerHeadIcon", - Tips = "TipsConfig", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua index 23ceda8ddb..7c0a27da3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/LoadingPanel.lua @@ -2,7 +2,6 @@ LoadingPanel = Inherit(BasePanel) local this = LoadingPanel local sprites = {"loding1"} -local tipsConfig = ConfigManager.GetConfig(ConfigName.Tips) --初始化组件(用于子类重写) function LoadingPanel:InitComponent() Log("LoadingPanel:InitComponent") @@ -19,9 +18,6 @@ function LoadingPanel:OnOpen() math.randomseed(os.time()) index = math.random(1, #sprites) this.bg.sprite = Util.LoadSprite(sprites[index]) - math.randomseed(os.time()) - index = math.random(1, 20) - this.Tip.text = tipsConfig[index].Tips end local callList = {} @@ -73,6 +69,7 @@ function LoadingPanel.Start() this.Slider.maxValue = #callList - 1 this.Slider.value = curIndex --"你知道嘛:充值会让你变得更强!" --Language[11346] + this.Tip.text = "" LoadingPanel.OnStep() end