Merge branch 'devel' into stat_cache_fix

fix: 사전거병 후 군주가 사라지는 경우에 대한 수정 (#247 )
Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/247
2024-02-17 00:01:40 +09:00 · 2024-02-17 00:01:34 +09:00 · 2023-12-30 04:15:33 +00:00 · 2023-10-29 09:05:29 +09:00
1 changed files with 4 additions and 4 deletions
@@ -365,14 +365,14 @@ class General extends GeneralBase implements iAction
            }
        }

-        $this->calcCache[$cKey] = $statValue;
-
        $statValue = Util::clamp($statValue, 0, GameConst::$maxLevel);

        if ($useFloor) {
            return Util::toInt($statValue);
        }

+        $this->calcCache[$cKey] = $statValue;
+        
        return $statValue;
    }

@@ -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;
    }
Author	SHA1	Message	Date
Hide_D	46f460c8ad	Merge branch 'devel' into stat_cache_fix	2024-02-17 00:01:40 +09:00
Hide_D	af4401d9bb	fix: 사전거병 후 군주가 사라지는 경우에 대한 수정 (#247 ) Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/247	2024-02-17 00:01:34 +09:00
Hide_D	1b858ae36c	fix: onCalcOpposeStat이 제대로 전파되지 않았음	2023-12-30 04:15:33 +00:00
포스트모더니즘	c5ed2d47fc	fix: 스탯 계산 시에 캐시 사용하는 부분 수정 시도	2023-10-29 09:05:29 +09:00