From 7a6935eb42fba5aa4259d9d387e287d6e98609a6 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 16 Aug 2021 14:45:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=AA=E5=88=9D=E7=A7=98=E5=8D=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab | 8 ++++---- .../~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua | 2 +- .../Modules/DynamicActivity/DynamicActivityManager.lua | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab index fbea1fc8eb..14fc4562da 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/TaiChuMiJuanPanel.prefab @@ -707,7 +707,7 @@ GameObject: - component: {fileID: 4553105843183576068} - component: {fileID: 2876656824097227893} m_Layer: 5 - m_Name: itemPre1 + m_Name: itemPre m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1166,7 +1166,7 @@ GameObject: - component: {fileID: 7909892950731924465} - component: {fileID: 5846793020732928758} m_Layer: 5 - m_Name: itemPre + m_Name: itemPre2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1701,7 +1701,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.199997, y: -0.000045521072} + m_AnchoredPosition: {x: 1.199997, y: 0} m_SizeDelta: {x: -42, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &921486100088032325 @@ -1719,7 +1719,7 @@ MonoBehaviour: m_Padding: m_Left: 32 m_Right: 20 - m_Top: 86 + m_Top: 80 m_Bottom: 34 m_ChildAlignment: 1 m_Spacing: 6 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua index 4142706298..80ff9080fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/TaiChuMiJuanPanel.lua @@ -66,7 +66,7 @@ function TaiChuMiJuanPanel:OnShow(...) end this.itemPres[i].go.gameObject:SetActive(true) this.itemPres[i].bg.sprite = this.data[i].sprite - --this.itemPres[i].bg:SetNativeSize() + this.itemPres[i].bg:SetNativeSize() Util.AddOnceClick(this.itemPres[i].go,function() SDKMgr:OpenWeb(this.data[i].linkAddress) end) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 7b825b7c42..e4e16b4c00 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -58,7 +58,7 @@ end function this.GetATaiChuMiJuanData(data) this.IsFisish = true - local str = string.match(data.windowLink,"^[%s]*(.-)[%s]*$") + local str = string.match(data.windowLink,"^%s*(.-)%s*$") if not this.TaiChuMiJuanData[data.id] or this.TaiChuMiJuanData[data.id].windowLink ~= str then this.IsFisish = false coroutine.start(function() @@ -77,7 +77,7 @@ function this.GetATaiChuMiJuanData(data) this.TaiChuMiJuanData[data.id] = {} end this.TaiChuMiJuanData[data.id].id = data.id - this.TaiChuMiJuanData[data.id].linkAddress = string.match(data.strategyLink,"^[%s]*(.-)[%s]*$") + this.TaiChuMiJuanData[data.id].linkAddress = string.match(data.strategyLink,"^%s*(.-)%s*$") this.TaiChuMiJuanData[data.id].windowLink = str this.TaiChuMiJuanData[data.id].sprite = m_sprite this.IsFisish = true