Merge pull request #1 from liuzg129/master

hello
Update main.lua
add boss
mod text with number
change
change
Merge branch 'local'

Conflicts:
	text.txt
change
change
add
change
add
Merge branch 'local'
mod
add
Merge branch 'local'

Conflicts:
	text.txt
Merge pull request #1 from xiaoxiao-geng/master

合并更新