Merge pull request #30 from esclaveDuReve/master

update
Merge pull request #31 from esclaveDuReve/master

地图文字颜色改为白字，更加清楚
Merge pull request #32 from esclaveDuReve/master

npc&object
Merge pull request #33 from esclaveDuReve/master

update
Merge pull request #34 from esclaveDuReve/master

补上缺失的空格
Merge pull request #35 from esclaveDuReve/master

update
Merge pull request #36 from esclaveDuReve/master

update
Merge pull request #37 from esclaveDuReve/master

更新
Merge pull request #38 from solael/master

update
Merge pull request #39 from solael/master

更新
skill

skill
Merge pull request #27 from USunOfBeach/master

skill