devel 코드 merge

2019-04-07 22:58:44 +09:00
parent 6b281628ed 03fc7a579a
commit 2c15c7087e
18 changed files with 944 additions and 142 deletions
@@ -155,9 +155,9 @@ class Personnel{
                $setOriginalCityValues['gen3'] = 0;
            }

-            $setValues['betray'] = $db->sqleval('betray + 1');
            $setValues['experience'] = $db->sqleval('experience * (1 - 0.1 * betray)');//XXX: 상수
            $setValues['dedication'] = $db->sqleval('dedication * (1 - 0.1 * betray)');//XXX: 상수
+            $setValues['betray'] = $db->sqleval('betray + 1');
        }
        else{
            //재야이면 100 100 증가