update the combat

sort the relationship in CombatFiled/DialogBorad/Hero and Map. Still far
from finished.