Merge branch 'devel' of ssh://storage.hided.net:2525/devsam/core into devel

This commit is contained in:
2018-07-27 02:34:02 +09:00
2 changed files with 10 additions and 4 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ function MessageBox($str)
function LogText($prefix, $variable) function LogText($prefix, $variable)
{ {
$text = sprintf('%s : %s'."\n", $prefix, var_export($variable, true)); $text = sprintf('%s : %s'."\r\n", $prefix, var_export($variable, true));
file_put_contents(ROOT.'/d_log/dbg_logs.txt', $text, FILE_APPEND); file_put_contents(ROOT.'/d_log/dbg_logs.txt', $text, FILE_APPEND);
} }
+6
View File
@@ -303,7 +303,9 @@ function processWar($general, $city) {
if($general['special2'] == 51) { $ratio2 += 20; } if($general['special2'] == 51) { $ratio2 += 20; }
//도구 보정 : 둔갑천서, 태평요술 //도구 보정 : 둔갑천서, 태평요술
if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; } if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
LogText('avoid0', [date("Ymd_His"), $generalCrewType->id, $general['train'], $ratio2]);
if($ratio < $ratio2 && $avoid == 1) { if($ratio < $ratio2 && $avoid == 1) {
LogText('avoid0', true);
$batlog[] = "<C>●</><C>회피</>했다!</>"; $batlog[] = "<C>●</><C>회피</>했다!</>";
$myCrew /= 5; // 20%만 소모 $myCrew /= 5; // 20%만 소모
$avoid = 0; $avoid = 0;
@@ -1072,6 +1074,7 @@ function processWar($general, $city) {
if($general['special2'] == 51) { $ratio2 += 20; } if($general['special2'] == 51) { $ratio2 += 20; }
//도구 보정 : 둔갑천서, 태평요술 //도구 보정 : 둔갑천서, 태평요술
if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; } if($general['item'] == 26 || $general['item'] == 25) { $ratio2 += 20; }
LogText('avoid1', [date("Ymd_His"), $generalCrewType->id, $general['train'], $ratio2]);
if($ratio < $ratio2 && $myAvoid == 1) { if($ratio < $ratio2 && $myAvoid == 1) {
// 특기보정 : 격노 // 특기보정 : 격노
if($oppose['special2'] == 74 && rand() % 100 < 50) { if($oppose['special2'] == 74 && rand() % 100 < 50) {
@@ -1080,6 +1083,7 @@ function processWar($general, $city) {
$myCrew = CriticalScore2($myCrew); $myCrew = CriticalScore2($myCrew);
$opAvoid = 0; $opAvoid = 0;
} else { } else {
LogText('avoid1', true);
$batlog[] = "<C>●</><C>회피</>했다!</>"; $batlog[] = "<C>●</><C>회피</>했다!</>";
$oppbatlog[] = "<C>●</>상대가 <R>회피</>했다!</>"; $oppbatlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
$myCrew /= 5; // 20%만 소모 $myCrew /= 5; // 20%만 소모
@@ -1095,6 +1099,7 @@ function processWar($general, $city) {
if($oppose['special2'] == 51) { $ratio2 += 20; } if($oppose['special2'] == 51) { $ratio2 += 20; }
//도구 보정 : 둔갑천서, 태평요술 //도구 보정 : 둔갑천서, 태평요술
if($oppose['item'] == 26 || $oppose['item'] == 25) { $ratio2 += 20; } if($oppose['item'] == 26 || $oppose['item'] == 25) { $ratio2 += 20; }
LogText('avoid2', [date("Ymd_His"), $opposeCrewType->id, $oppose['train'], $ratio2]);
if($ratio < $ratio2 && $opAvoid == 1) { if($ratio < $ratio2 && $opAvoid == 1) {
// 특기보정 : 격노 // 특기보정 : 격노
if($general['special2'] == 74 && rand() % 100 < 33) { if($general['special2'] == 74 && rand() % 100 < 33) {
@@ -1109,6 +1114,7 @@ function processWar($general, $city) {
$opCrew = CriticalScore2($opCrew); $opCrew = CriticalScore2($opCrew);
$myAvoid = 0; $myAvoid = 0;
} else { } else {
LogText('avoid2', true);
$oppbatlog[] = "<C>●</><C>회피</>했다!</>"; $oppbatlog[] = "<C>●</><C>회피</>했다!</>";
$batlog[] = "<C>●</>상대가 <R>회피</>했다!</>"; $batlog[] = "<C>●</>상대가 <R>회피</>했다!</>";
$opCrew /= 5; // 20%만 소모 $opCrew /= 5; // 20%만 소모