Merge pull request #1 from fy0/master

更新最新版
Merge pull request #2 from fy0/master

更新至最新版
新增技能,对话框小头像

简单的技能释放,ShowText()添加小头像,添加enter提示,不能与立绘同时使用

扩展table方法
技能界面和扩展table
Merge branch 'master' of https://github.com/fy0/jianjia into fy0-master

Conflicts:
	Resources/Scripts/data/character.lua
	Resources/Scripts/data/enemy.lua
Merge pull request #8 from mter/master

对话框BUG修复，技能面板