From 5ccab4680917791914fc341ce08fd67c2613ea7f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 26 Feb 2021 12:03:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=A5=96=E5=8A=B1=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 3 +++ Assets/ManagedResources/~Lua/View/ItemView.lua | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index c4a1e21019..ce5c0095fe 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1679,6 +1679,9 @@ function GetEquipSuitStr(Star,num) end function GetCutOutStr(_str,_num) + if not _str then + return "" + end local str="" if LengthString(_str) > _num + 1 then str=SubString(_str,_num) .. "..." diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index c804296b75..1781886301 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -124,7 +124,7 @@ function ItemView:GetRewardShow(_itemData, effectLayer) self.innateImage:SetActive(false) self.iconGo:SetActive(true) self.circleFrameBg:SetActive(false) - self.name:GetComponent("Text").text = GetCutOutStr(_itemData.configData.Name,4) + self.name:GetComponent("Text").text = GetCutOutStr(_itemData.itemConfig.Name,4) Util.AddParticleSortLayer(self.UI_Effect_Kuang_JinSe, effectLayer - self.EffectOrginLayerQu) Util.AddParticleSortLayer(self.UI_Effect_Kuang_HongSe, effectLayer - self.EffectOrginLayerQu) Util.AddParticleSortLayer(self.UI_Effect_jinkuang_Fang, effectLayer - self.EffectOrginLayerQu) From 742767461c3209e7203669b34517ecd2920bb1e4 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 26 Feb 2021 13:52:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=AF=BC=E8=A1=A8=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E5=85=B3=E9=97=AD=E8=80=81=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs b/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs index 610d83799b..af6199b22e 100644 --- a/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs +++ b/Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs @@ -166,7 +166,7 @@ namespace GameEditor.Core.DataConfig public class DataConfigWindow : EditorWindow { - [MenuItem("Data Config/Window")] + //[MenuItem("Data Config/Window")] private static void ShowConfigWin() { var win = GetWindow(); @@ -309,13 +309,13 @@ namespace GameEditor.Core.DataConfig } } - [MenuItem("Data Config/一键导表")] + //[MenuItem("Data Config/一键导表")] public static void ExcelALLConfig() { excelALLConfig(false, DataConfigSetting.execlDir); } - [MenuItem("Data Config/变化导表")] + //[MenuItem("Data Config/变化导表")] public static void ExcelChangeConfig() { excelALLConfig(true, DataConfigSetting.execlDir);