From e7c8d5290d40c0179cd5a1dd76711dbac2aae62b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 25 May 2021 10:30:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BB=99=E7=BC=98=E6=8A=BD?= =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua index 53bb1ab2de..13d83402e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitBox.lua @@ -46,7 +46,7 @@ function this:OnShow(_parent,...) parent=_parent sortingOrder =_parent.sortingOrder local args = {...} - _CostItem=lotterySetting[RecruitType.RecruitBox]._CostItem[1][2] + _CostItem=lotterySetting[RecruitType.RecruitBox].CostItem[1][2] local con = string.split(specialConfig[49].Value, "#") _Con_Recharge = tonumber(con[1]) From 289a75c7412eb295f5dce72ad1f14730a4ac73fb Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 25 May 2021 10:31:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=8C=82=E6=9C=BA=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=82=E6=9C=BA=E5=B8=AE=E5=8A=A9=E5=92=8C?= =?UTF-8?q?vip=E4=BB=BB=E5=8A=A1=E9=87=8D=E5=8F=A0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightPointPassMainPanel.prefab | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 4ee02402e4..cf1e77de3a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -6028,7 +6028,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -509.9, y: 316.8} + m_AnchoredPosition: {x: -509.9, y: 359} m_SizeDelta: {x: 977.6, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1596169475 @@ -52490,9 +52490,9 @@ RectTransform: m_Father: {fileID: 6976277603980592380} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -7, y: -563} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 424, y: 363} m_SizeDelta: {x: 68, y: 16} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8353568290887318895 @@ -70821,7 +70821,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: -29.59, y: -80.3} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 106.99, y: 93.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2371187725804371199 @@ -129685,7 +129685,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.090013504, y: -8.409996} + m_AnchoredPosition: {x: 0.09001541, y: -8.409996} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3714496386058682428 @@ -130246,11 +130246,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5391497229806396012} m_Modifications: - - target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf, - type: 3} - propertyPath: m_Name - value: UI_Effect_MuBiaoJiangLi - objectReference: {fileID: 0} - target: {fileID: 8645003667159546895, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} propertyPath: m_LocalPosition.x @@ -130356,6 +130351,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 4537954547819557299, guid: 45fb9a1ded4a71146ba636b09e5dabcf, + type: 3} + propertyPath: m_Name + value: UI_Effect_MuBiaoJiangLi + objectReference: {fileID: 0} - target: {fileID: 7667894851207529766, guid: 45fb9a1ded4a71146ba636b09e5dabcf, type: 3} propertyPath: m_IsActive