diff --git a/dev/script.js b/dev/script.js index c269845..f025729 100755 --- a/dev/script.js +++ b/dev/script.js @@ -219,8 +219,8 @@ 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_form.x + progress_form.width - spinner.width - spinner.width / 2; -spinner.y = progress_form.y + spinner.height / 10 + spinner.height / 2; +spinner.x = progress_form.x + progress_form.width - Percent(10, progress_form.width); +spinner.y = progress_form.y + Percent(10, progress_form.height); spinner.sprite = Sprite(spinner.image); spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед @@ -232,9 +232,8 @@ 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_form.x + progress_text.width / 2;// + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X -// progress_text.y = progress_form.y + progress_text.height / 2;// + progress_text.height; // позиция % по Y -progress_text.y = spinner.y; +progress_text.x = progress_form.x + Percent(5, progress_form.width); // позиция % по X +progress_text.y = progress_form.y + Percent(10, progress_form.height); // позиция % по Y progress_text.sprite = SpriteNew(); progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3); @@ -345,7 +344,7 @@ function dialog_setup() { hint.sprite = SpriteNew(); - hint.sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1); + hint.sprite.SetPosition(entry.x, box_form.y + Percent(5, box_form.height), box_form.z + 1); bullet_i.image = Image("BULLET.png"); diff --git a/dev/src/dark-red-border/ENTRY.png b/dev/src/dark-red-border/ENTRY.png index 58da9fd..1e419d9 100755 Binary files a/dev/src/dark-red-border/ENTRY.png and b/dev/src/dark-red-border/ENTRY.png differ diff --git a/dev/src/dark-red-border/ENTRY.xcf b/dev/src/dark-red-border/ENTRY.xcf index 752add3..330c5ef 100644 Binary files a/dev/src/dark-red-border/ENTRY.xcf and b/dev/src/dark-red-border/ENTRY.xcf differ diff --git a/dev/src/light-red-border/ENTRY.png b/dev/src/light-red-border/ENTRY.png index 3e0ed35..0f3176e 100755 Binary files a/dev/src/light-red-border/ENTRY.png and b/dev/src/light-red-border/ENTRY.png differ diff --git a/dev/src/light-red-border/ENTRY.xcf b/dev/src/light-red-border/ENTRY.xcf index bcca277..edb29ad 100644 Binary files a/dev/src/light-red-border/ENTRY.xcf and b/dev/src/light-red-border/ENTRY.xcf differ diff --git a/dev/src/light/ENTRY.png b/dev/src/light/ENTRY.png index 3e0ed35..0f3176e 100755 Binary files a/dev/src/light/ENTRY.png and b/dev/src/light/ENTRY.png differ diff --git a/melawy-nier-a2/ENTRY.png b/melawy-nier-a2/ENTRY.png index 58da9fd..1e419d9 100755 Binary files a/melawy-nier-a2/ENTRY.png and b/melawy-nier-a2/ENTRY.png differ diff --git a/melawy-nier-a2/script.script b/melawy-nier-a2/script.script index 2d087cf..b0845a0 100755 --- a/melawy-nier-a2/script.script +++ b/melawy-nier-a2/script.script @@ -219,8 +219,8 @@ 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_form.x + progress_form.width - spinner.width - spinner.width / 2; -spinner.y = progress_form.y + spinner.height / 10 + spinner.height / 2; +spinner.x = progress_form.x + progress_form.width - Percent(10, progress_form.width); +spinner.y = progress_form.y + Percent(10, progress_form.height); spinner.sprite = Sprite(spinner.image); spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед @@ -232,9 +232,8 @@ 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_form.x + progress_text.width / 2;// + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X -// progress_text.y = progress_form.y + progress_text.height / 2;// + progress_text.height; // позиция % по Y -progress_text.y = spinner.y; +progress_text.x = progress_form.x + Percent(5, progress_form.width); // позиция % по X +progress_text.y = progress_form.y + Percent(10, progress_form.height); // позиция % по Y progress_text.sprite = SpriteNew(); progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3); @@ -345,7 +344,7 @@ fun dialog_setup() { hint.sprite = SpriteNew(); - hint.sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1); + hint.sprite.SetPosition(entry.x, box_form.y + Percent(5, box_form.height), box_form.z + 1); bullet_i.image = Image("BULLET.png");