From 76fc72b0a25f62e0e69542b3c0b7cd0573468229 Mon Sep 17 00:00:00 2001 From: 1rentgen1 Date: Sun, 28 Jan 2024 17:29:28 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BE=D1=80=D0=B1=D0=B8=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .idea/pygameProject.iml | 2 +- main.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4c46908..ba706b5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/.idea/pygameProject.iml b/.idea/pygameProject.iml index 74d515a..9ae696c 100644 --- a/.idea/pygameProject.iml +++ b/.idea/pygameProject.iml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/main.py b/main.py index a01a9da..7e1aaa3 100644 --- a/main.py +++ b/main.py @@ -55,6 +55,12 @@ screen.blit(background_image, (0, 0)) + # Отрисовка орбит + pygame.draw.ellipse(screen, (255, 255, 255), orbit_1, 1) + pygame.draw.ellipse(screen, (255, 255, 255), orbit_2, 1) + pygame.draw.ellipse(screen, (255, 255, 255), orbit_3, 1) + pygame.draw.ellipse(screen, (255, 255, 255), orbit_4, 1) + # Обновление углов планет angle_1 = pygame.time.get_ticks() * angular_speed_1 angle_2 = pygame.time.get_ticks() * angular_speed_2 @@ -91,12 +97,6 @@ pygame.draw.rect(screen, setting_button_color, setting_button_rect, border_radius=setting_button_corner_radius) screen.blit(setting_button_icon, (setting_button_rect.centerx - setting_button_icon.get_width() // 2, setting_button_rect.centery - setting_button_icon.get_height() // 2)) - # Отрисовка орбит - pygame.draw.ellipse(screen, (255, 255, 255), orbit_1, 1) - pygame.draw.ellipse(screen, (255, 255, 255), orbit_2, 1) - pygame.draw.ellipse(screen, (255, 255, 255), orbit_3, 1) - pygame.draw.ellipse(screen, (255, 255, 255), orbit_4, 1) - # Отрисовка круглой кнопки "Клик" pygame.draw.circle(screen, click_button_color, click_button_rect.center, click_button_corner_radius) text_click = font.render("Клик", True, text_color) From f85f5f895112608c56df28cd224c7c79430dc2cd Mon Sep 17 00:00:00 2001 From: 1rentgen1 Date: Sun, 28 Jan 2024 18:20:32 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BD=D0=B5=D0=B4=D0=BE=D0=BA=D0=BB=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/border.png | Bin 0 -> 824 bytes main.py | 61 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 data/border.png diff --git a/data/border.png b/data/border.png new file mode 100644 index 0000000000000000000000000000000000000000..599f069bb44ea06cf9c53232ffa2f08d8038a651 GIT binary patch literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^zks-cgAGXDp7Q=30|V24PZ!6KinzBoFZ$k2kZ22Z zOK9Yl&5_zgyRqaO}wVyL;=d3c0N@y4RO8-!1-Y_~}t)fxdz9-$iyu>t0O%mNC10^?kMW z$k*n-U$p*uwej||_01Rl|J%klqxIk4TPt60U!8XSKmWVWmHT$gy~l9IKlrW=TmSpt zd5h)iclh%&e>TmEe(|AR$cjZ^6cHB!Gurmq$E^_Sewmn1H*3`n+p^f{^06=0H*@=6 zmTvf&x$WrR1+TY%JM^k>!z2E;Vf*LZV>#n~{lg2-y?XEe#n{YA(vMqa&h+`B*&a!k zefG5hy4Rc6-aEQ)-S$ZzyJ3& uOk6%aKCNfxoS%DV+zt!pzrQ#7H>>#3KFf0z8y5m|1cRrmpUXO@geCx3xjOOy literal 0 HcmV?d00001 diff --git a/main.py b/main.py index 7e1aaa3..9985932 100644 --- a/main.py +++ b/main.py @@ -7,20 +7,29 @@ background_image = pygame.image.load("data/background.png") +# библиотека цветов +vivid_orange = (255, 194, 38) +white = (255, 255, 255) +text_color = (0, 2, 18) + shop_button_rect = pygame.Rect(30, 20, 200, 65) -shop_button_color = (255, 194, 38) +shop_button_color = vivid_orange shop_button_corner_radius = 10 help_button_rect = pygame.Rect(730, 20, 65, 65) -help_button_color = (255, 194, 38) +help_button_color = vivid_orange help_button_corner_radius = 10 help_button_icon = pygame.image.load("data/help.png") setting_button_rect = pygame.Rect(810, 20, 65, 65) -setting_button_color = (255, 194, 38) +setting_button_color = vivid_orange setting_button_corner_radius = 10 setting_button_icon = pygame.image.load("data/setting.png") +money = 0 +money_color = vivid_orange +money_border_icon = pygame.image.load("data/border.png") + planet1_image = pygame.image.load("data/planet1.png") planet2_image = pygame.image.load("data/planet2.png") planet3_image = pygame.image.load("data/planet3.png") @@ -39,11 +48,26 @@ angular_speed_4 = 0.0005 click_button_rect = pygame.Rect(715, 420, 160, 160) -click_button_color = (255, 194, 38) +click_button_color = vivid_orange click_button_corner_radius = click_button_rect.width // 2 -text_color = (0, 2, 18) -font = pygame.font.SysFont(None, 32) +font_black = pygame.font.SysFont(None, 32) +font_vivid_orange = pygame.font.SysFont(None, 38) + + +def draw_task(color, y_coord, value, draw, length, speed): + global score + if draw and length < 200: + length += speed + elif length >= 200: + draw = False + length = 0 + score += value + task = pygame.draw.circle(screen, color, (30, y_coord), 20, 5) + value_text = font_black.render(str(round(value, 2)), True, text_color) + screen.blit(value_text, (16, y_coord - 10)) + return task, length, draw + running = True clock = pygame.time.Clock() @@ -52,14 +76,17 @@ for event in pygame.event.get(): if event.type == pygame.QUIT: running = False + if event.type == pygame.MOUSEBUTTONDOWN: + if task1.collidepoint(event.pos): + draw_green = True screen.blit(background_image, (0, 0)) # Отрисовка орбит - pygame.draw.ellipse(screen, (255, 255, 255), orbit_1, 1) - pygame.draw.ellipse(screen, (255, 255, 255), orbit_2, 1) - pygame.draw.ellipse(screen, (255, 255, 255), orbit_3, 1) - pygame.draw.ellipse(screen, (255, 255, 255), orbit_4, 1) + pygame.draw.ellipse(screen, white, orbit_1, 1) + pygame.draw.ellipse(screen, white, orbit_2, 1) + pygame.draw.ellipse(screen, white, orbit_3, 1) + pygame.draw.ellipse(screen, white, orbit_4, 1) # Обновление углов планет angle_1 = pygame.time.get_ticks() * angular_speed_1 @@ -87,7 +114,7 @@ screen.blit(planet4_image, (planet4_x - planet4_image.get_width() // 2, planet4_y - planet4_image.get_height() // 2)) pygame.draw.rect(screen, shop_button_color, shop_button_rect, border_radius=shop_button_corner_radius) - text1 = font.render("Магазин", True, text_color) + text1 = font_black.render("Магазин", True, text_color) text1_rect = text1.get_rect(center=shop_button_rect.center) screen.blit(text1, text1_rect) @@ -99,10 +126,20 @@ # Отрисовка круглой кнопки "Клик" pygame.draw.circle(screen, click_button_color, click_button_rect.center, click_button_corner_radius) - text_click = font.render("Клик", True, text_color) + text_click = font_black.render("Клик", True, text_color) text_click_rect = text_click.get_rect(center=click_button_rect.center) screen.blit(text_click, text_click_rect) + # отрисовка счёта + screen.blit(money_border_icon, (30, height - 140)) + text_money = font_vivid_orange.render("Ваш баланс:", True, vivid_orange) + screen.blit(text_money, (55, height - 115)) + display_score = font_vivid_orange.render(str(round(money, 2)), True, vivid_orange) + screen.blit(display_score, (55, height - 75)) + + # функционал + task1, green_length, draw_green = draw_task(vivid_orange, 50, green_value, draw_green, green_length, green_speed) + pygame.display.flip() clock.tick(60)