Add Debug Display UI & bug fix

1 improve state change
2 fix bug wall or army can combine