change fight layer and logic
fix