버그 수정, 구조 변경

2019-04-28 03:49:03 +09:00
parent fe2a076558
commit ef40f299ef
52 changed files with 140 additions and 165 deletions
@@ -406,7 +406,7 @@ class General implements iAction{
        return $value;
    }

-    public function onPreGeneralStatUpdate(General $general, string $statName, $value){
+    public function onCalcStat(General $general, string $statName, $value, $aux=null){
        //xxx: $general?
        foreach(array_merge([
            $this->nationType, 
@@ -419,16 +419,11 @@ class General implements iAction{
                continue;
            }
            /** @var iAction $iObj */
-            $value = $iObj->onPreGeneralStatUpdate($this, $statName, $value);
+            $value = $iObj->onCalcStat($this, $statName, $value, $aux);
        }
        return $value;
    }

-    public function onCalcStat(General $general, string $stat, $value){
-        //xxx: $general?
-        return $value;
-    }
-
    public function onCalcStrategic(string $turnType, string $varType, $value){
        foreach(array_merge([
            $this->nationType,