devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

전투 로그 바꾼것 제대로 안나오는 것을 수정

Browse Source
This commit is contained in:
Hide_D
2018-04-10 22:44:00 +09:00
parent 0437d45997
commit e487846c56
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/css/common.css
+4
View File
@@ -48,6 +48,10 @@ select { font-family:'굴림'; line-height:100%; }
content:"◆"; content:"◆";
} }
.small_war_log{
display:inline-block;
}
.small_war_log .war_type_attack{ .small_war_log .war_type_attack{
color:cyan; color:cyan;
} }
hwe/process_war.php
+6 -6
View File
@@ -412,14 +412,14 @@ function processWar($general, $city) {
'killed_crew' => -$mykillnum 'killed_crew' => -$mykillnum
]; ];
$res = $templates->render('small_war_log',[ $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
'year'=>$year, 'year'=>$year,
'month'=>$month, 'month'=>$month,
'war_type'=>'siege', 'war_type'=>'siege',
'war_type_str'=>'성', 'war_type_str'=>'성',
'me' => $render_attacker, 'me' => $render_attacker,
'you' => $render_defender, 'you' => $render_defender,
]); ]));
$log[] = $res;//TODO: $log를 출력할 때 date에 대해선 숨겨야 함. $log[] = $res;//TODO: $log를 출력할 때 date에 대해선 숨겨야 함.
$batlog[] = $res; $batlog[] = $res;
@@ -1288,23 +1288,23 @@ function processWar($general, $city) {
'killed_crew' => -$opdeathnum 'killed_crew' => -$opdeathnum
]; ];
$res = $templates->render('small_war_log',[ $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
'year'=>$year, 'year'=>$year,
'month'=>$month, 'month'=>$month,
'war_type'=>'attack', 'war_type'=>'attack',
'war_type_str'=>'공', 'war_type_str'=>'공',
'me' => $render_attacker, 'me' => $render_attacker,
'you' => $render_defender, 'you' => $render_defender,
]); ]));
$oppres = $templates->render('small_war_log',[ $oppres = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
'year'=>$year, 'year'=>$year,
'month'=>$month, 'month'=>$month,
'war_type'=>'defense', 'war_type'=>'defense',
'war_type_str'=>'수', 'war_type_str'=>'수',
'me' => $render_defender, 'me' => $render_defender,
'you' => $render_attacker, 'you' => $render_attacker,
]); ]));
$log[] = $res; $log[] = $res;
$batlog[] = $res; $batlog[] = $res;
hwe/templates/small_war_log.php
+4 -4
View File
@@ -16,9 +16,9 @@
</span> </span>
<span class="crew_plate"> <span class="crew_plate">
<span class="remain_crew"><?=$me['remain']?></span> <span class="remain_crew"><?=$me['remain_crew']?></span>
<span class="killed_plate"> <span class="killed_plate">
(<span class="killed_crew"><?=$me['killed']?></span>) (<span class="killed_crew"><?=$me['killed_crew']?></span>)
</span> </span>
</span> </span>
</span> </span>
@@ -27,9 +27,9 @@
<span class="you"> <span class="you">
<span class="crew_plate"> <span class="crew_plate">
<span class="remain_crew"><?=$you['remain']?></span> <span class="remain_crew"><?=$you['remain_crew']?></span>
<span class="killed_plate"> <span class="killed_plate">
(<span class="killed_crew"><?=$you['killed']?></span>) (<span class="killed_crew"><?=$you['killed_crew']?></span>)
</span> </span>
</span> </span>