test merge

2
Revert "test merge"

This reverts commit 0001a7ae56b0ab63a897b656764470a73b17dce2.
test merge2

3
start

2
2

2
Merge branch 'master' into game_fight

Conflicts:

proj.ios/sanguo.xcodeproj/project.xcworkspace/xcuserdata/wangshaopei.xcu
serdatad/UserInterfaceState.xcuserstate
战斗添加同步命令

战斗添加同步
Merge branch 'game_fight'

Conflicts:

proj.ios/sanguo.xcodeproj/project.xcworkspace/xcuserdata/wangshaopei.xcu
serdatad/UserInterfaceState.xcuserstate