diff --git a/dev/script.js b/dev/script.js index 6341f2a..0299b22 100755 --- a/dev/script.js +++ b/dev/script.js @@ -153,7 +153,7 @@ side_background.x = x0; side_background.y = y0; side_background.sprite = Sprite(side_background.image); -side_background.sprite.SetPosition(side_background.x, side_background.y, 8); +side_background.sprite.SetPosition(side_background.x, side_background.y, 1); side_background.sprite.SetOpacity(1); // Sise Logo @@ -168,7 +168,7 @@ side_logo.x = (side_background.width - side_logo.width) / 2; side_logo.y = screen.height - screen.height * 0.25; side_logo.sprite = Sprite(side_logo.image); -side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 9); +side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 2); side_logo.sprite.SetOpacity(1); // **************************************** // @@ -182,7 +182,7 @@ project_link.sprite = Sprite(project_link.image); project_link.x = (side_background.width - project_link.width) / 2; project_link.y = side_logo.y + side_logo.height; -project_link.sprite.SetPosition(project_link.x, project_link.y, 9); +project_link.sprite.SetPosition(project_link.x, project_link.y, 2); project_link.sprite.SetOpacity(1); // **************************************** // @@ -197,19 +197,19 @@ logo.y = Percent(10, screen.height); // позиция логотипа logo.sprite.SetPosition(logo.x, logo.y, 2); logo.sprite.SetOpacity(1); -// PROGRESS BACKGROUND -progress_background.image = Image("PROGRESS_BACKGROUND.png"); -progress_background.image = progress_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); +// PROGRESS FORM +progress_form.image = Image("PROGRESS_FORM.png"); +progress_form.image = progress_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); -progress_background.width = progress_background.image.GetWidth(); -progress_background.height = progress_background.image.GetHeight(); +progress_form.width = progress_form.image.GetWidth(); +progress_form.height = progress_form.image.GetHeight(); -progress_background.x = Percent(50, screen.width) - progress_background.width / 2; -progress_background.y = Percent(99, screen.height) - progress_background.height; +progress_form.x = Percent(50, side_background.width) - progress_form.width / 2; +progress_form.y = Percent(75, side_background.height) - progress_form.height; -progress_background.sprite = Sprite(progress_background.image); -progress_background.sprite.SetPosition(progress_background.x, progress_background.y, 2); -progress_background.sprite.SetOpacity(0.45); +progress_form.sprite = Sprite(progress_form.image); +progress_form.sprite.SetPosition(progress_form.x, progress_form.y, 2); +progress_form.sprite.SetOpacity(0.45); // SPINNER spinner.image = Image("SPINNER.png"); @@ -218,11 +218,11 @@ spinner.image = spinner.image.Scale(Percent(1, screen.width), Percent(1, screen. spinner.width = spinner.image.GetWidth(); spinner.height = spinner.image.GetHeight(); -spinner.x = progress_background.x + progress_background.width - spinner.width; -spinner.y = progress_background.y + spinner.height / 10; +spinner.x = progress_form.x + progress_form.width - spinner.width; +spinner.y = progress_form.y + spinner.height / 10; spinner.sprite = Sprite(spinner.image); -spinner.sprite.SetPosition(spinner.x, spinner.y, 11); // позиция за или перед +spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед // PROGRESS TEXT @@ -231,41 +231,41 @@ progress_text.image = Image.Text(progress_t + "%", 255, 255, 255, 1, progressfon progress_text.width = progress_text.image.GetWidth(); progress_text.height = progress_text.image.GetHeight(); -progress_text.x = progress_background.x + progress_background.width - (4 * Percent(70, progress_text.height)); // позиция % по X -progress_text.y = progress_background.y + progress_text.height; // позиция % по Y +progress_text.x = progress_form.x + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X +progress_text.y = progress_form.y + progress_text.height; // позиция % по Y progress_text.sprite = SpriteNew(); -progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 6); +progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3); // PROGRESS BOX progress_box.image = Image("PROGRESS_BOX.png"); -progress_box.image = progress_box.image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); +progress_box.image = progress_box.image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height)); progress_box.width = progress_box.image.GetWidth(); progress_box.height = progress_box.image.GetHeight(); -progress_box.x = Percent(50, screen.width) - progress_box.width / 2; -progress_box.y = Percent(95, screen.height) - progress_box.height / 2; +progress_box.x = progress_form.x + (progress_form.width - progress_box.width) / 2; +progress_box.y = progress_form.y + (progress_form.height - progress_box.height) / 2; progress_box.sprite = Sprite(progress_box.image); -progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 5); +progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 3); // PROGRESS BAR progress_bar.original_image = Image("PROGRESS_BAR.png"); -progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); +progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height)); progress_bar.width = progress_bar.original_image.GetWidth(); progress_bar.height = progress_bar.original_image.GetHeight(); -progress_bar.x = Percent(50, screen.width) - progress_bar.original_image.GetWidth() / 2; -progress_bar.y = Percent(95, screen.height) - progress_bar.original_image.GetHeight() / 2; +progress_bar.x = progress_form.x + (progress_form.width - progress_bar.original_image.GetWidth()) / 2; +progress_bar.y = progress_form.y + (progress_form.height - progress_bar.original_image.GetHeight()) / 2; progress_bar.sprite = Sprite(); -progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 6); +progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 4); // PROGRESS FADE progress_fade.image = Image("PROGRESS_FADE.png"); -progress_fade.image = progress_fade.image.Scale(Percent(10, progress_background.width), Percent(15, progress_background.height)); +progress_fade.image = progress_fade.image.Scale(Percent(10, progress_form.width), Percent(15, progress_form.height)); progress_fade.width = progress_fade.image.GetWidth(); progress_fade.height = progress_fade.image.GetHeight(); @@ -295,35 +295,35 @@ status = "normal"; //count = 0; function dialog_setup() { - local.box_background; + local.box_form; local.lock; local.entry; local.prompt_sprite; - box_background.image = Image("BOX.png"); - box_background.image = box_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); + box_form.image = Image("BOX.png"); + box_form.image = box_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); - box_background.width = box_background.image.GetWidth(); - box_background.height = box_background.image.GetHeight(); + box_form.width = box_form.image.GetWidth(); + box_form.height = box_form.image.GetHeight(); - box_background.x = Percent(50, screen.width) - box_background.width / 2; - box_background.y = progress_background.y - box_background.height - Percent(1, screen.height); - box_background.z = 10000; + box_form.x = progress_form.x; + box_form.y = progress_form.y - box_form.height - Percent(1, screen.height); + box_form.z = 10000; - box_background.sprite = Sprite(box_background.image); - box_background.sprite.SetPosition(box_background.x, box_background.y, box_background.z); - box_background.sprite.SetOpacity(0.45); + box_form.sprite = Sprite(box_form.image); + box_form.sprite.SetPosition(box_form.x, box_form.y, box_form.z); + box_form.sprite.SetOpacity(0.45); entry.image = Image("ENTRY.png"); - entry.image = entry.image.Scale(Percent(90, box_background.width), Percent(33, box_background.height)); + entry.image = entry.image.Scale(Percent(90, box_form.width), Percent(33, box_form.height)); entry.width = entry.image.GetWidth(); entry.height = entry.image.GetHeight(); - entry.x = box_background.x + box_background.width/2 - entry.width/2; - entry.y = box_background.y + box_background.height/2 - entry.height/2; - entry.z = box_background.z + 1; + entry.x = box_form.x + box_form.width/2 - entry.width/2; + entry.y = box_form.y + box_form.height/2 - entry.height/2; + entry.z = box_form.z + 1; entry.sprite = Sprite(entry.image); entry.sprite.SetPosition(entry.x, entry.y, entry.z); @@ -336,17 +336,17 @@ function dialog_setup() { lock.x = entry.x + entry.width - lock.width - (entry.height - lock.height); lock.y = entry.y + entry.height/2 - lock.height/2; - lock.z = box_background.z + 2; + lock.z = box_form.z + 2; lock.sprite = Sprite(lock.image); lock.sprite.SetPosition(lock.x, lock.y, lock.z); prompt_sprite = SpriteNew(); - prompt_sprite.SetPosition(entry.x, box_background.y + entry.height/2, box_background.z + 1); + prompt_sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1); - global.dialog.box_background = box_background; + global.dialog.box_form = box_form; global.dialog.lock = lock; global.dialog.entry = entry; global.dialog.bullet_image = Image("BULLET.png"); @@ -356,7 +356,7 @@ function dialog_setup() { function dialog_opacity(opacity) { if (opacity == 0) { - dialog.box_background.sprite.SetOpacity(opacity); + dialog.box_form.sprite.SetOpacity(opacity); dialog.lock.sprite.SetOpacity(opacity); dialog.entry.sprite.SetOpacity(opacity); } @@ -449,12 +449,12 @@ function refreshHandler() { text_end.sprite = Sprite(text_end.image); text_end.x = progress_box.x; text_end.y = progress_box.y - progress_text.image.GetHeight() * 2; - text_end.sprite.SetPosition(text_end.x, text_end.y, 6); + text_end.sprite.SetPosition(text_end.x, text_end.y, 2); } progress_fade.x = progress_bar.x; progress_fade.y = progress_bar.y; - progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 6); + progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 4); if (fade_dir == 0) { counter++; @@ -504,7 +504,7 @@ message_sprite=SpriteNew(); function message_callback(prompt) { message = Image.Text(prompt, 0.5, 0.5, 0.5, 1, ubuntufont); message_sprite.SetImage(message); - message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 9); + message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 2); message_sprite.SetOpacity(1); } @@ -515,7 +515,7 @@ Plymouth.SetMessageFunction(message_callback); for(i=0; i < NUM_SCROLL_LINES; i++) { lines[i]= Image.Text("", 0.5, 0.5, 0.5, 1, ubuntufont); //цвет строк message_sprite[i] = SpriteNew(); - message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 9); + message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 2); } //высота строк //отступ строк function StringLength(string) { diff --git a/melawy-fenek/BOX.svg b/melawy-fenek/BOX.svg deleted file mode 100644 index 4a177b0..0000000 --- a/melawy-fenek/BOX.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - diff --git a/melawy-fenek/BOX1.svg b/melawy-fenek/BOX1.svg deleted file mode 100644 index b5479e4..0000000 --- a/melawy-fenek/BOX1.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - diff --git a/melawy-fenek/PROGRESS_BACKGROUND.png b/melawy-fenek/PROGRESS_BACKGROUND.png deleted file mode 100644 index 47b2d01..0000000 Binary files a/melawy-fenek/PROGRESS_BACKGROUND.png and /dev/null differ diff --git a/melawy-fenek/PROGRESS_BACKGROUND.svg b/melawy-fenek/PROGRESS_BACKGROUND.svg deleted file mode 100644 index 217944d..0000000 --- a/melawy-fenek/PROGRESS_BACKGROUND.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - diff --git a/melawy-fenek/PROGRESS_FORM.png b/melawy-fenek/PROGRESS_FORM.png new file mode 100644 index 0000000..5f5639a Binary files /dev/null and b/melawy-fenek/PROGRESS_FORM.png differ diff --git a/melawy-fenek/SIDE_BACKGROUND.png b/melawy-fenek/SIDE_BACKGROUND.png deleted file mode 100644 index 35fbcbd..0000000 Binary files a/melawy-fenek/SIDE_BACKGROUND.png and /dev/null differ diff --git a/melawy-fenek/SIDE_BACKGROUND0.png b/melawy-fenek/SIDE_BACKGROUND0.png deleted file mode 100644 index 00ab1ab..0000000 Binary files a/melawy-fenek/SIDE_BACKGROUND0.png and /dev/null differ diff --git a/melawy-fenek/SIDE_BACKGROUND0.svg b/melawy-fenek/SIDE_BACKGROUND0.svg deleted file mode 100644 index ed82cd1..0000000 --- a/melawy-fenek/SIDE_BACKGROUND0.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - diff --git a/melawy-fenek/SIDE_BACKGROUND2.xcf b/melawy-fenek/SIDE_BACKGROUND2.xcf deleted file mode 100644 index 9ad9337..0000000 Binary files a/melawy-fenek/SIDE_BACKGROUND2.xcf and /dev/null differ diff --git a/melawy-fenek/script.script b/melawy-fenek/script.script index 70a9e70..1fae61a 100755 --- a/melawy-fenek/script.script +++ b/melawy-fenek/script.script @@ -153,7 +153,7 @@ side_background.x = x0; side_background.y = y0; side_background.sprite = Sprite(side_background.image); -side_background.sprite.SetPosition(side_background.x, side_background.y, 8); +side_background.sprite.SetPosition(side_background.x, side_background.y, 1); side_background.sprite.SetOpacity(1); // Sise Logo @@ -168,7 +168,7 @@ side_logo.x = (side_background.width - side_logo.width) / 2; side_logo.y = screen.height - screen.height * 0.25; side_logo.sprite = Sprite(side_logo.image); -side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 9); +side_logo.sprite.SetPosition(side_logo.x, side_logo.y, 2); side_logo.sprite.SetOpacity(1); // **************************************** // @@ -182,7 +182,7 @@ project_link.sprite = Sprite(project_link.image); project_link.x = (side_background.width - project_link.width) / 2; project_link.y = side_logo.y + side_logo.height; -project_link.sprite.SetPosition(project_link.x, project_link.y, 9); +project_link.sprite.SetPosition(project_link.x, project_link.y, 2); project_link.sprite.SetOpacity(1); // **************************************** // @@ -197,19 +197,19 @@ logo.y = Percent(10, screen.height); // позиция логотипа logo.sprite.SetPosition(logo.x, logo.y, 2); logo.sprite.SetOpacity(1); -// PROGRESS BACKGROUND -progress_background.image = Image("PROGRESS_BACKGROUND.png"); -progress_background.image = progress_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); +// PROGRESS FORM +progress_form.image = Image("PROGRESS_FORM.png"); +progress_form.image = progress_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); -progress_background.width = progress_background.image.GetWidth(); -progress_background.height = progress_background.image.GetHeight(); +progress_form.width = progress_form.image.GetWidth(); +progress_form.height = progress_form.image.GetHeight(); -progress_background.x = Percent(50, screen.width) - progress_background.width / 2; -progress_background.y = Percent(99, screen.height) - progress_background.height; +progress_form.x = Percent(50, side_background.width) - progress_form.width / 2; +progress_form.y = Percent(75, side_background.height) - progress_form.height; -progress_background.sprite = Sprite(progress_background.image); -progress_background.sprite.SetPosition(progress_background.x, progress_background.y, 2); -progress_background.sprite.SetOpacity(0.45); +progress_form.sprite = Sprite(progress_form.image); +progress_form.sprite.SetPosition(progress_form.x, progress_form.y, 2); +progress_form.sprite.SetOpacity(0.45); // SPINNER spinner.image = Image("SPINNER.png"); @@ -218,11 +218,11 @@ spinner.image = spinner.image.Scale(Percent(1, screen.width), Percent(1, screen. spinner.width = spinner.image.GetWidth(); spinner.height = spinner.image.GetHeight(); -spinner.x = progress_background.x + progress_background.width - spinner.width; -spinner.y = progress_background.y + spinner.height / 10; +spinner.x = progress_form.x + progress_form.width - spinner.width; +spinner.y = progress_form.y + spinner.height / 10; spinner.sprite = Sprite(spinner.image); -spinner.sprite.SetPosition(spinner.x, spinner.y, 11); // позиция за или перед +spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед // PROGRESS TEXT @@ -231,41 +231,41 @@ progress_text.image = Image.Text(progress_t + "%", 255, 255, 255, 1, progressfon progress_text.width = progress_text.image.GetWidth(); progress_text.height = progress_text.image.GetHeight(); -progress_text.x = progress_background.x + progress_background.width - (4 * Percent(70, progress_text.height)); // позиция % по X -progress_text.y = progress_background.y + progress_text.height; // позиция % по Y +progress_text.x = progress_form.x + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X +progress_text.y = progress_form.y + progress_text.height; // позиция % по Y progress_text.sprite = SpriteNew(); -progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 6); +progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3); // PROGRESS BOX progress_box.image = Image("PROGRESS_BOX.png"); -progress_box.image = progress_box.image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); +progress_box.image = progress_box.image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height)); progress_box.width = progress_box.image.GetWidth(); progress_box.height = progress_box.image.GetHeight(); -progress_box.x = Percent(50, screen.width) - progress_box.width / 2; -progress_box.y = Percent(95, screen.height) - progress_box.height / 2; +progress_box.x = progress_form.x + (progress_form.width - progress_box.width) / 2; +progress_box.y = progress_form.y + (progress_form.height - progress_box.height) / 2; progress_box.sprite = Sprite(progress_box.image); -progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 5); +progress_box.sprite.SetPosition(progress_box.x, progress_box.y, 3); // PROGRESS BAR progress_bar.original_image = Image("PROGRESS_BAR.png"); -progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_background.width), Percent(15, progress_background.height)); +progress_bar.original_image = progress_bar.original_image.Scale(Percent(90, progress_form.width), Percent(15, progress_form.height)); progress_bar.width = progress_bar.original_image.GetWidth(); progress_bar.height = progress_bar.original_image.GetHeight(); -progress_bar.x = Percent(50, screen.width) - progress_bar.original_image.GetWidth() / 2; -progress_bar.y = Percent(95, screen.height) - progress_bar.original_image.GetHeight() / 2; +progress_bar.x = progress_form.x + (progress_form.width - progress_bar.original_image.GetWidth()) / 2; +progress_bar.y = progress_form.y + (progress_form.height - progress_bar.original_image.GetHeight()) / 2; progress_bar.sprite = Sprite(); -progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 6); +progress_bar.sprite.SetPosition(progress_bar.x, progress_bar.y, 4); // PROGRESS FADE progress_fade.image = Image("PROGRESS_FADE.png"); -progress_fade.image = progress_fade.image.Scale(Percent(10, progress_background.width), Percent(15, progress_background.height)); +progress_fade.image = progress_fade.image.Scale(Percent(10, progress_form.width), Percent(15, progress_form.height)); progress_fade.width = progress_fade.image.GetWidth(); progress_fade.height = progress_fade.image.GetHeight(); @@ -295,35 +295,35 @@ status = "normal"; //count = 0; fun dialog_setup() { - local.box_background; + local.box_form; local.lock; local.entry; local.prompt_sprite; - box_background.image = Image("BOX.png"); - box_background.image = box_background.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); + box_form.image = Image("BOX.png"); + box_form.image = box_form.image.Scale(Percent(20, screen.width), Percent(10, screen.height)); - box_background.width = box_background.image.GetWidth(); - box_background.height = box_background.image.GetHeight(); + box_form.width = box_form.image.GetWidth(); + box_form.height = box_form.image.GetHeight(); - box_background.x = Percent(50, screen.width) - box_background.width / 2; - box_background.y = progress_background.y - box_background.height - Percent(1, screen.height); - box_background.z = 10000; + box_form.x = progress_form.x; + box_form.y = progress_form.y - box_form.height - Percent(1, screen.height); + box_form.z = 10000; - box_background.sprite = Sprite(box_background.image); - box_background.sprite.SetPosition(box_background.x, box_background.y, box_background.z); - box_background.sprite.SetOpacity(0.45); + box_form.sprite = Sprite(box_form.image); + box_form.sprite.SetPosition(box_form.x, box_form.y, box_form.z); + box_form.sprite.SetOpacity(0.45); entry.image = Image("ENTRY.png"); - entry.image = entry.image.Scale(Percent(90, box_background.width), Percent(33, box_background.height)); + entry.image = entry.image.Scale(Percent(90, box_form.width), Percent(33, box_form.height)); entry.width = entry.image.GetWidth(); entry.height = entry.image.GetHeight(); - entry.x = box_background.x + box_background.width/2 - entry.width/2; - entry.y = box_background.y + box_background.height/2 - entry.height/2; - entry.z = box_background.z + 1; + entry.x = box_form.x + box_form.width/2 - entry.width/2; + entry.y = box_form.y + box_form.height/2 - entry.height/2; + entry.z = box_form.z + 1; entry.sprite = Sprite(entry.image); entry.sprite.SetPosition(entry.x, entry.y, entry.z); @@ -336,17 +336,17 @@ fun dialog_setup() { lock.x = entry.x + entry.width - lock.width - (entry.height - lock.height); lock.y = entry.y + entry.height/2 - lock.height/2; - lock.z = box_background.z + 2; + lock.z = box_form.z + 2; lock.sprite = Sprite(lock.image); lock.sprite.SetPosition(lock.x, lock.y, lock.z); prompt_sprite = SpriteNew(); - prompt_sprite.SetPosition(entry.x, box_background.y + entry.height/2, box_background.z + 1); + prompt_sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1); - global.dialog.box_background = box_background; + global.dialog.box_form = box_form; global.dialog.lock = lock; global.dialog.entry = entry; global.dialog.bullet_image = Image("BULLET.png"); @@ -356,7 +356,7 @@ fun dialog_setup() { fun dialog_opacity(opacity) { if (opacity == 0) { - dialog.box_background.sprite.SetOpacity(opacity); + dialog.box_form.sprite.SetOpacity(opacity); dialog.lock.sprite.SetOpacity(opacity); dialog.entry.sprite.SetOpacity(opacity); } @@ -449,12 +449,12 @@ fun refreshHandler() { text_end.sprite = Sprite(text_end.image); text_end.x = progress_box.x; text_end.y = progress_box.y - progress_text.image.GetHeight() * 2; - text_end.sprite.SetPosition(text_end.x, text_end.y, 6); + text_end.sprite.SetPosition(text_end.x, text_end.y, 2); } progress_fade.x = progress_bar.x; progress_fade.y = progress_bar.y; - progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 6); + progress_fade.sprite.SetPosition(counter + progress_fade.x, progress_fade.y, 4); if (fade_dir == 0) { counter++; @@ -504,7 +504,7 @@ message_sprite=SpriteNew(); fun message_callback(prompt) { message = Image.Text(prompt, 0.5, 0.5, 0.5, 1, ubuntufont); message_sprite.SetImage(message); - message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 9); + message_sprite.SetPosition(Percent(2, screen.width), Percent(50, screen.height), 2); message_sprite.SetOpacity(1); } @@ -515,7 +515,7 @@ Plymouth.SetMessageFunction(message_callback); for(i=0; i < NUM_SCROLL_LINES; i++) { lines[i]= Image.Text("", 0.5, 0.5, 0.5, 1, ubuntufont); //цвет строк message_sprite[i] = SpriteNew(); - message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 9); + message_sprite[i].SetPosition(Percent(2, screen.width), Percent(5, screen.height) + (i * 17), 2); } //высота строк //отступ строк fun StringLength(string) {