Add SpellCritBase and MeleeCritBase. Fix some bugs
Signed-off-by: zhengruiw02 <zhengruiw02@gmail.com>