From 871b2ad23bd1c4d478bddb7418a815c50e2cdd33 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 28 Oct 2021 16:40:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E7=95=8C=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=A4=A7=E9=97=B9=E5=A4=A9=E5=AE=AB=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab | 2 +- .../Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab | 4 ++-- .../Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index e7b48dc84a..4780d3b04e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -61557,7 +61557,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.32941177, g: 0.11372549, b: 0.047058824, a: 1} + m_Color: {r: 0.16862746, g: 0.16862746, b: 0.16862746, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab index bb2c5b6ca1..ff20bbfcc3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionSelectHalidomPanel.prefab @@ -66,7 +66,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -700,7 +700,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -2, y: -0.000075656135} + m_AnchoredPosition: {x: -2, y: -0.00005083497} m_SizeDelta: {x: 666.65, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &1304049099460694528 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua index 73d12cc678..6719a61e00 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua @@ -135,6 +135,7 @@ function this.SingleItemDataShow2(go, data,curShopDataId) Util.GetGameObject(go, "zhe"):SetActive(storeConfig.IsDiscount > 0) Util.GetGameObject(go, "zhe"):GetComponent("Image").sprite = this.spLoader:LoadSprite("s_shop_zhekou_0"..storeConfig.DiscountDegree.."_zh") --LogError("ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID "..ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID) + Util.SetGray(Util.GetGameObject(go, "price"),storeConfig.Limit - data.buyNum <= 0) Util.GetGameObject(go, "price/costIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(ConfigManager.GetConfigData(ConfigName.ItemConfig,item).ResourceID)) Util.GetGameObject(go, "price/Text"):GetComponent("Text").text = num local buyBtn = Util.GetGameObject(go,"price/btnBuy") From 0903782f0eed4afb839d4dc83a0a31e047066c7d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 28 Oct 2021 16:51:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=95=8C=E9=9D=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E6=B3=95=E5=AE=9D=E7=95=8C=E9=9D=A2=E9=94=99?= =?UTF-8?q?=E4=BD=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab | 6 +++--- .../~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab index bdd54d504a..706dd86861 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab @@ -409,10 +409,10 @@ MonoBehaviour: m_Padding: m_Left: -45 m_Right: 0 - m_Top: 0 + m_Top: 80 m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 160 + m_ChildAlignment: 1 + m_Spacing: 130 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua index 81358662e7..34727a68f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup.lua @@ -219,7 +219,7 @@ function RewardTalismanSingleShowPopup:OnShowPanelData() end end end - self.equipProGridCom.spacing = 150 + self.equipProGridCom.spacing = 130 if self.jumpViewList and #self.jumpViewList then self.getTuGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(911.56,self.equipProGridCom.spacing*(#self.jumpViewList)) end From c43667aa671290849e308cd11d5056074bb406f9 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 28 Oct 2021 16:53:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E7=8E=89=E8=99=9A=E8=AE=BA?= =?UTF-8?q?=E9=81=93=E3=80=91=3D=3D=3D=3D=3D=3D=3D=E4=B8=BB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab index eaaeb8948a..b829f29259 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaMainPanel.prefab @@ -774,7 +774,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -119, y: -98} + m_AnchoredPosition: {x: -106, y: -43} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &314648388604415527