From 0a257e6b31e1ef79453ab282b398565132c06e63 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 18 Jan 2024 17:41:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A2=84=E8=AE=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/GrowthGiftPageView/GrowthGiftPage.prefab | 12 ++++++------ .../Prefabs/UI/NewActivity/CommonActPage.prefab | 2 +- .../Prefabs/UI/NewActivity/ItemUpstarPre.prefab | 10 +++++----- .../~Lua/Modules/Operating/MissionPre.lua | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GrowthGiftPageView/GrowthGiftPage.prefab b/Assets/ManagedResources/Prefabs/UI/GrowthGiftPageView/GrowthGiftPage.prefab index d9692f6efb..004c9c139e 100644 --- a/Assets/ManagedResources/Prefabs/UI/GrowthGiftPageView/GrowthGiftPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GrowthGiftPageView/GrowthGiftPage.prefab @@ -330,7 +330,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: 2.1999998, y: -2.1999998} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 66.08} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3767776331293579830 @@ -362,9 +362,9 @@ 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 38 - m_FontStyle: 0 + m_FontStyle: 2 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 45 @@ -713,7 +713,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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 0 @@ -841,7 +841,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -209, y: -168} - m_SizeDelta: {x: 233.96, y: 66.08} + m_SizeDelta: {x: 258, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &15391406383627659 CanvasRenderer: @@ -871,7 +871,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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 6ff20609e8c68014394e6b730e1c7948, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab index 9bf16d5a76..9002cfb3d6 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonActPage.prefab @@ -409,7 +409,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377581433624104458} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab index ee9c3abcb4..1988b48d4f 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab @@ -3883,7 +3883,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: 1749f0558e7a633478f04db1ed64459b, type: 3} + m_Sprite: {fileID: 21300000, guid: 4f58e11140824794f88cb72ac324c08f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4348,7 +4348,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: -12, y: 56} + m_AnchoredPosition: {x: 9.3, y: 71.7} m_SizeDelta: {x: 51, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4708442608581007944 @@ -5136,7 +5136,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -29, y: 3} - m_SizeDelta: {x: 119, y: 77} + m_SizeDelta: {x: 137, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5394818939192951364 CanvasRenderer: @@ -5166,7 +5166,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: d8a904e4d56f67e48bed0f6f2d3642a6, type: 3} + m_Sprite: {fileID: 21300000, guid: b8f3ae7f408ddf54cb97bd150617752b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6818,7 +6818,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 28 - m_FontStyle: 2 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua index 5d07b9f17d..3537ea58dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/MissionPre.lua @@ -166,7 +166,7 @@ function MissionPre:SetContent1() self.type1.gameObject:SetActive(true) self.moneyNum.gameObject:SetActive(false) local curNumText = "("..(self.data.progress > self.data.value and self.data.value or self.data.progress) .."/"..self.data.value..")" - local chongzhiName=self.actConfig.ActiveType == ActivityTypeDef.yaojingleichong and "妖晶" or "仙晶" + local chongzhiName=self.actConfig.ActiveType == ActivityTypeDef.yaojingleichong and "钻石" or "仙晶" --self.type1Text1.text = string.format("%s%d%s%s%s",Language[11377],self.data.value,chongzhiName,"") self.type1Text1.text = Language[11377]..""..self.data.value..""..chongzhiName self.type1Text3.text = Language[12323]..curNumText @@ -186,7 +186,7 @@ end local type={ [0]={sprite = "Btn_hz_cheng_01",text = Language[10019]}, [1]={sprite = "Btn_hz_lan_01",text = Language[10018]}, - [2]={sprite = "s_slbz_1anniuhuise",text = Language[10101]}, + [2]={sprite = "Btn_hz_lan_01",text = Language[10101]}, } function MissionPre:SetIcon1(_itemdata) Util.SetGray(self.btnGet,_itemdata.state == 2) @@ -259,7 +259,7 @@ end function MissionPre:SetIcon(_itemdata) --0 未领取(等级已达到,未购买基金) 1 已领取 -1 未达到等级 2可领取 Util.SetGray(self.btnGet,false) - self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_slbz_1anniuongse") + self.btnGet:GetComponent("Image").sprite = self.spLoader:LoadSprite("Btn_hz_tongyong_001") self.redPoint.gameObject:SetActive(false) self.btnGet:GetComponent("Button").enabled = true if self.data.state == -1 then