From b7b69cec612fc49e5afb30344c5906b9d4cd2571 Mon Sep 17 00:00:00 2001 From: wszqkzqk Date: Tue, 9 Aug 2022 05:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8D=A1=E7=89=87=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/component/menubar.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/component/menubar.py b/source/component/menubar.py index 9a17f63..52bd69b 100755 --- a/source/component/menubar.py +++ b/source/component/menubar.py @@ -56,8 +56,8 @@ class Card(): def checkMouseClick(self, mouse_pos): x, y = mouse_pos - if(x >= self.rect.x and x <= self.rect.right and - y >= self.rect.y and y <= self.rect.bottom): + if (self.rect.x <= x <= self.rect.right and + self.rect.y <= y <= self.rect.bottom): return True return False @@ -84,27 +84,27 @@ class Card(): time = current_time - self.frozen_timer if time < self.frozen_time: #cool down status image = pg.Surface((self.rect.w, self.rect.h)) # 黑底 - # 在冷却时间不足且阳光也不足时，叠加两者效果显示，即同时改变透明度与图像覆盖 - if self.sun_cost > sun_value: - image.set_alpha(192) - frozen_image = self.orig_image.copy() + frozen_image = self.orig_image frozen_image.set_alpha(128) frozen_height = (self.frozen_time - time)/self.frozen_time * self.rect.h image.blit(frozen_image, (0,0), (0, 0, self.rect.w, frozen_height)) + self.orig_image.set_alpha(192) image.blit(self.orig_image, (0,frozen_height), (0, frozen_height, self.rect.w, self.rect.h - frozen_height)) elif self.sun_cost > sun_value: #disable status - image = self.orig_image.copy() - image.set_alpha(192) + image = pg.Surface((self.rect.w, self.rect.h)) # 黑底 + self.orig_image.set_alpha(192) + image.blit(self.orig_image, (0,0), (0, 0, self.rect.w, self.rect.h)) elif self.clicked: image = pg.Surface((self.rect.w, self.rect.h)) # 黑底 - chosen_image = self.orig_image.copy() + chosen_image = self.orig_image chosen_image.set_alpha(128) image.blit(chosen_image, (0,0), (0, 0, self.rect.w, self.rect.h)) else: image = self.orig_image + image.set_alpha(255) return image def update(self, sun_value, current_time):