位置编辑bug修正
[隐藏]
战斗修正
[卡牌隐藏]
Merge branch 'master' of 192.168.189.14:fant2_clientres
Merge branch 'master' of 192.168.189.14:fant2_clientres
统一界面
BUG修正
Merge branch 'master' of 192.168.189.14:fant2_clientres
阵型编辑
[隐藏]
Merge branch 'master' of 192.168.189.14:fant2_clientres
申请战斗直接胜利
Merge branch 'master' of 192.168.189.14:fant2_clientres
[卡牌详细信息]
Merge branch 'master' of 192.168.189.14:fant2_clientres
【商城】界面调整
人物血量更新
[卡牌强化]
Merge branch 'master' of 192.168.189.14:fant2_clientres