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 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