From d6771be0cf90410adf9b83e4c6606f34d55206dd Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 28 Jan 2021 17:29:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9D=92=E9=BE=99=E7=A7=98=E5=AE=9D=E7=99=BD?= =?UTF-8?q?=E7=89=87=EF=BC=8C=E4=BC=98=E5=8C=96gm=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=8E=A2=E5=AE=9D=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E8=AF=BB=E5=8F=96=E7=89=A9?= =?UTF-8?q?=E5=93=81=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/GMPanel.prefab | 52 +++++++++---------- .../UI/Mission/MissionDailyPanel.prefab | 6 +-- .../~Lua/Modules/Recharge/View/GiftView.lua | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/GMPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/GMPanel.prefab index 528dd26feb..599204da24 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/GMPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/GMPanel.prefab @@ -35,10 +35,10 @@ RectTransform: m_Father: {fileID: 2257205713042167254} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -533.5, y: -1862.4} - m_SizeDelta: {x: 200.05, y: 89.184} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 6.5, y: 57.599976} + m_SizeDelta: {x: 200.04999, y: 89.18396} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &271495145 CanvasRenderer: @@ -253,10 +253,10 @@ RectTransform: m_Father: {fileID: 2257205713042167254} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -250.32, y: -1862.4} - m_SizeDelta: {x: 200.05, y: 89.184} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 289.68, y: 57.599976} + m_SizeDelta: {x: 200.04999, y: 89.18396} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &540766503 CanvasRenderer: @@ -614,7 +614,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: -111.25126, y: -120.973335} + m_AnchoredPosition: {x: -111.25125, y: -120.973335} m_SizeDelta: {x: 326, y: 63} m_Pivot: {x: -0.34126154, y: -0.9202117} --- !u!222 &899403148 @@ -829,10 +829,10 @@ RectTransform: m_Father: {fileID: 2257205713042167254} m_RootOrder: 5 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: 6.5, y: 4.5} - m_SizeDelta: {x: 1067, y: 1661} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.2, y: 4.5} + m_SizeDelta: {x: -21.5, y: -259} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1200235898 MonoBehaviour: @@ -1369,10 +1369,10 @@ RectTransform: m_Father: {fileID: 2257205713042167254} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -800, y: -1862.4} - m_SizeDelta: {x: 200.05, y: 89.184} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -260, y: 57.599976} + m_SizeDelta: {x: 200.04999, y: 89.18396} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1950630791 CanvasRenderer: @@ -1740,7 +1740,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -48.5} + m_AnchoredPosition: {x: 0, y: -48.500122} m_SizeDelta: {x: -26, y: -123} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2259528839928710614 @@ -3380,10 +3380,10 @@ RectTransform: m_Father: {fileID: 2257205713042167254} m_RootOrder: 7 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: 6.5, y: 4.5} - m_SizeDelta: {x: 1067, y: 1661} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.2, y: 4.5} + m_SizeDelta: {x: -21.5, y: -259} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5568370438774669088 MonoBehaviour: @@ -3519,10 +3519,10 @@ RectTransform: m_Father: {fileID: 2257205713042167254} m_RootOrder: 6 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: 6.5, y: 4.5} - m_SizeDelta: {x: 1067, y: 1661} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 2.2, y: 4.5} + m_SizeDelta: {x: -21.5, y: -259} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7926481158117566736 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 8ab98c23b0..db08b9755e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -3862,7 +3862,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: aa6d51e09125b11469a29a303af4aa18, type: 3} + m_Sprite: {fileID: 21300000, guid: cc10e3864c7e15947bb98985da2be762, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6091,7 +6091,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 909e965ce6faba24389d9a5bc5818d26, type: 3} + m_Sprite: {fileID: 21300000, guid: 03cf8c2c54619044f983bd805dcb6c4b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -10133,7 +10133,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 291.99997, y: -42} - m_SizeDelta: {x: 318.565, y: 39.2} + m_SizeDelta: {x: 325, y: 39.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7701535949295788202 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua index a7a39c9962..a22e4b4b0b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftView.lua @@ -417,7 +417,7 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex) if isPrivilegeGift then--特权商城 shopItemData = shopItemConfig[data.id] shows = shopItemData.Goods - name.text = GetLanguageStrById(shopItemData.GoodsName) + name.text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ItemConfig,shows[1][1]).Name) boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.FINDTREASURE_GIFT, data.id) limitNum = ShopManager.GetShopItemLimitBuyCount(data.id) costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FINDTREASURE_GIFT, data.id, 1)