From 6117dd2363e3066de3ef1c12760b0e139e2956e1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 7 Apr 2021 16:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=89=9B=E6=B0=94=E5=86=B2=E5=A4=A9?= =?UTF-8?q?=E3=80=91=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab | 2 +- .../Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab | 4 ++-- .../~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua | 2 +- .../~Lua/Modules/RewardBox/RewardBoxPanel.lua | 2 +- .../~Lua/Modules/Setting/SettingPlayerRide.lua | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab index 7ce8f9a953..6544ad9f66 100644 --- a/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NiuQiChongTian/NiuQiChongTianPanel.prefab @@ -8665,7 +8665,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 0.8 m_Text: "\u795E\u5C06\u7F6E\u6362" LanguageIndex: 10337 --- !u!1 &7063237023464100415 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab index 1aa0c00db9..ee4fab760c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/RewardItemSingleShowPopup.prefab @@ -2399,8 +2399,8 @@ 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: -13.299999, y: -126.99999} - m_SizeDelta: {x: 835.3, y: 74.7} + m_AnchoredPosition: {x: -13.299999, y: -148.1} + m_SizeDelta: {x: 835.3, y: 116.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5328007497398450486 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua index e15c695a59..3917265990 100644 --- a/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NiuQiChongTian/NiuQiChongTianPanel.lua @@ -160,7 +160,7 @@ function NiuQiChongTian:SingleDataShow(go, index,data) local shadow = Util.GetGameObject(go, "shadow") local shows = data.Reward - title.text = data.Text + title.text = GetLanguageStrById(data.Text) redPoint:SetActive(data.state == 1) btn.interactable = data.state ~= 2 btnImg.sprite = Util.LoadSprite(BtnState[data.state].ImgName) diff --git a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua index d75820b894..8e826e5a67 100644 --- a/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RewardBox/RewardBoxPanel.lua @@ -123,7 +123,7 @@ end -- 打开,重新打开时回调 function RewardBoxPanel:OnShow() - this.name.text = itemConfig[this.itemId].Name + this.name.text = GetLanguageStrById(itemConfig[this.itemId].Name) itemList={} curId = nil tagNum = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua index 2d3a56c8be..6add7d9ef1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua +++ b/Assets/ManagedResources/~Lua/Modules/Setting/SettingPlayerRide.lua @@ -18,6 +18,7 @@ function SettingPlayerRide:InitComponent(gameObject) this.live2dRootParent = Util.GetGameObject(gameObject, "live2dRootParent") this.live2dRootParent2 = Util.GetGameObject(gameObject, "live2dRootParent2") this.name = Util.GetGameObject(gameObject, "name/Text"):GetComponent("Text") + SetTextVerTial(this.name,Vector3.New(120,0,0),nil,nil,5) Util.GetGameObject(gameObject, "skinProInfo/getInfoImage/Text"):GetComponent("Text").text = Language[11829] this.getInfo = Util.GetGameObject(gameObject, "skinProInfo/getInfo"):GetComponent("Text") Util.GetGameObject(gameObject, "skinProInfo/proImage/Text"):GetComponent("Text").text = Language[11965] @@ -135,8 +136,8 @@ function this.SingleRideClickShowInfo(data,go) local isGet,isUser = PlayerManager.userMountList[curPlayerHeadIconConfig.Id],curUserRideId == curPlayerHeadIconConfig.Id curItemConfig = ConfigManager.GetConfigData(ConfigName.ItemConfig,curPlayerHeadIconConfig.ItemId) local rideData = PlayerManager.userMountList[curPlayerHeadIconConfig.Id] - this.name.text = curItemConfig.Name - this.getInfo.text = curItemConfig.ItemDescribe + this.name.text = GetLanguageStrById(curItemConfig.Name) + this.getInfo.text = GetLanguageStrById(curItemConfig.ItemDescribe) this.scrollViewPro:SetData(curPlayerHeadIconConfig.UnlockProperty,function(index,root) local propertyConfig = ConfigManager.GetConfigData(ConfigName.PropertyConfig, curPlayerHeadIconConfig.UnlockProperty[index][1]) Util.GetGameObject(root, "proValue"):GetComponent("Text").text = GetLanguageStrById(propertyConfig.Info).." ".. GetPropertyFormatStr(propertyConfig.Style, curPlayerHeadIconConfig.UnlockProperty[index][2])