Merge branch 'develop' of github.com:fredericky/45eb9e92911a4f
Merge branch 'master' of github.com:fredericky/45eb9e92911a4f
modify skill
merge
Merge branch 'master' of github.com:fredericky/45eb9e92911a4f
Merge branch 'master' of github.com:fredericky/45eb9e92911a4f
modify cast, reinforce
modify db
battleService
fix bug of opponentlist,to exclude friend and self
merge develop
modify reinforce
Merge branch 'master' of github.com:fredericky/45eb9e92911a4f
xml modified
Merge branch 'master' of github.com:fredericky/45eb9e92911a4f
debug pk
1.操作冷却模块重构
merge conflict
modified CoolDown
Merge branch 'master' into develop