Revert "ダメージ計算式の変更2"

This reverts commit 330fbe433781146aca97a7c48bd23652f96dff61.
Revert "Revert "ダメージ計算式の変更2""

This reverts commit 0ab38f10a9db26ec83d0cfc41ad82640c074dc0b.
Merge branch 'master' of https://github.com/Hiromi-Ayase/ShizimilyRogue