OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
b2372d6f 1 parent 8ef270d4

1.调整一些字号大小

Inline Side-by-side
Showing 3 changed files with 4 additions and 3 deletions
...@@ -20,6 +20,7 @@ class ImmerseController extends AdminController ...@@ -20,6 +20,7 @@ class ImmerseController extends AdminController
20 protected function grid() 20 protected function grid()
21 { 21 {
22 return Grid::make(new Immerse(), function (Grid $grid) { 22 return Grid::make(new Immerse(), function (Grid $grid) {
23 + $grid->model()->orderByDesc("id");
23 // 去掉新增和删除按钮 24 // 去掉新增和删除按钮
24 $grid->disableCreateButton(); 25 $grid->disableCreateButton();
25 // $grid->disableFilterButton(); 26 // $grid->disableFilterButton();
......
...@@ -211,7 +211,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -211,7 +211,7 @@ class AdminMakeImmerse implements ShouldQueue
211 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text')); 211 $text_file = $this->getAbsolutePath($this->getTempPath('.txt','text'));
212 file_put_contents($text_file, 'Parlando.ink'); 212 file_put_contents($text_file, 'Parlando.ink');
213 $font_file = $this->getAbsolutePath("files/d7300fd8be7ff27fb0a11d1afe717374.otf"); 213 $font_file = $this->getAbsolutePath("files/d7300fd8be7ff27fb0a11d1afe717374.otf");
214 - $font_size = $this->calcFontSize(12); 214 + $font_size = $this->calcFontSize(9);
215 $drawtext .= 'drawtext="'. 215 $drawtext .= 'drawtext="'.
216 'fontfile=' . escapeshellarg($font_file) . ':' . 216 'fontfile=' . escapeshellarg($font_file) . ':' .
217 'textfile=' . escapeshellarg($text_file) . ':' . 217 'textfile=' . escapeshellarg($text_file) . ':' .
...@@ -323,7 +323,7 @@ class AdminMakeImmerse implements ShouldQueue ...@@ -323,7 +323,7 @@ class AdminMakeImmerse implements ShouldQueue
323 'fontsize=' . $font_size . ':' . 323 'fontsize=' . $font_size . ':' .
324 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 324 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
325 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' . 325 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
326 - 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' . 326 + 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size * 2) . ':' .
327 '", '; 327 '", ';
328 }elseif($content['tag'] == 'source'){ 328 }elseif($content['tag'] == 'source'){
329 $arr = explode("\n", $content['text']); 329 $arr = explode("\n", $content['text']);
......
...@@ -603,7 +603,7 @@ class UserMakeImmerse implements ShouldQueue ...@@ -603,7 +603,7 @@ class UserMakeImmerse implements ShouldQueue
603 'fontsize=' . $font_size . ':' . 603 'fontsize=' . $font_size . ':' .
604 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' . 604 'fontcolor_expr=' . escapeshellarg($text_color . '%{eif\\\\: clip(255*(1*between(t\\, ' . $DS . ' + ' . $FID . '\\, ' . $DE . ' - ' . $FOD . ') + ((t - ' . $DS . ')/' . $FID . ')*between(t\\, ' . $DS . '\\, ' . $DS . ' + ' . $FID . ') + (-(t - ' . $DE . ')/' . $FOD . ')*between(t\\, ' . $DE . ' - ' . $FOD . '\\, ' . $DE . '))\\, 0\\, 255) \\\\: x\\\\: 2 }') . ':' .
605 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' . 605 'x=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][0]) . ':' .
606 - 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size) . ':' . 606 + 'y=' . escapeshellarg(VideoTemp::POSITION_FFMPEG['midMiddle'][1] . '+' . $font_size * 2) . ':' .
607 '", '; 607 '", ';
608 }elseif($content['tag'] == 'source'){ 608 }elseif($content['tag'] == 'source'){
609 $arr = explode("\n", $content['text']); 609 $arr = explode("\n", $content['text']);
......