Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-07-01 12:31:01 +08:00
commit 67dd2abbcb
2 changed files with 2 additions and 2 deletions

View File

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

View File

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