From bc04671ed5b57b18a86e59dfe0743a0eee8d69dc Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 1 Jul 2021 11:31:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=8F=E6=80=92=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Fonts/ArtFont_4/ArtFont_4_cfont.fontsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Fonts/ArtFont_4/ArtFont_4_cfont.fontsettings b/Assets/ManagedResources/Fonts/ArtFont_4/ArtFont_4_cfont.fontsettings index 8ef6333e94..a549b39082 100644 --- a/Assets/ManagedResources/Fonts/ArtFont_4/ArtFont_4_cfont.fontsettings +++ b/Assets/ManagedResources/Fonts/ArtFont_4/ArtFont_4_cfont.fontsettings @@ -9,7 +9,7 @@ Font: m_Name: ArtFont_4_cfont serializedVersion: 5 m_LineSpacing: 0.1 - m_DefaultMaterial: {fileID: 0} + m_DefaultMaterial: {fileID: 2100000, guid: 07a42bba2063bab4da514db380832200, type: 2} m_FontSize: 0 m_Texture: {fileID: 0} m_AsciiStartOffset: 0 From 7f8247acaf8079efeab798da023fe87a5b99f745 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 1 Jul 2021 11:47:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E5=9B=B0=E9=9A=BE=E5=89=AF=E6=9C=AC=20=2013=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20=E6=A3=80=E6=B5=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/HardStageEventManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua index b70d8db2e0..b62728c2b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/HardStageEventManager.lua @@ -41,7 +41,7 @@ function this.OnBuffAdd(caster,target,buff) if ctrlNumList[type] then ctrlNumList[type]=ctrlNumList[type]+1 else - table.insert(ctrlNumList,type) + --table.insert(ctrlNumList,type) ctrlNumList[type]=1 end end