Merge branch 'devel' into stat_cache_fix

2024-02-17 00:01:40 +09:00
parent c5ed2d47fc af4401d9bb
commit 46f460c8ad
21 changed files with 1897 additions and 220 deletions
@@ -806,7 +806,7 @@ class General extends GeneralBase implements iAction
                continue;
            }
            /** @var iAction $iObj */
-            $value = $iObj->onCalcStat($this, $statName, $value, $aux);
+            $value = $iObj->onCalcStat($general, $statName, $value, $aux);
        }
        return $value;
    }
@@ -819,7 +819,7 @@ class General extends GeneralBase implements iAction
                continue;
            }
            /** @var iAction $iObj */
-            $value = $iObj->onCalcOpposeStat($this, $statName, $value, $aux);
+            $value = $iObj->onCalcOpposeStat($general, $statName, $value, $aux);
        }
        return $value;
    }