diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66ed98f..119c4b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: path: ./out/*.dist # release处发布单文件可执行版exe - - name: “Release” + - name: Release uses: ncipollo/release-action@v1 with: allowUpdates: true diff --git a/source/component/menubar.py b/source/component/menubar.py index 1100c23..28404ec 100755 --- a/source/component/menubar.py +++ b/source/component/menubar.py @@ -168,6 +168,7 @@ class Card(): self.frozen_timer = -self.frozen_time self.refresh_timer = 0 self.select = True + self.clicked = False def loadFrame(self, name, scale): frame = tool.GFX[name] @@ -217,6 +218,9 @@ class Card(): elif self.sun_cost > sun_value: #disable status image = self.orig_image.copy() image.set_alpha(192) + elif self.clicked: + image = self.orig_image.copy() + image.set_alpha(128) else: image = self.orig_image return image @@ -441,6 +445,7 @@ class MoveCard(): self.rect.x = x self.rect.y = y self.rect.w = 1 + self.clicked = False self.image = self.createShowImage() self.card_name = card_name @@ -472,6 +477,10 @@ class MoveCard(): self.rect.w += 1 else: image = self.orig_image + if self.clicked: + image.set_alpha(192) + else: + image.set_alpha(255) return image def update(self, left_x, current_time): @@ -486,6 +495,7 @@ class MoveCard(): def draw(self, surface): surface.blit(self.image, self.rect) +# 传送带 class MoveBar(): def __init__(self, card_pool): self.loadFrame(c.MOVEBAR_BACKGROUND) diff --git a/source/state/level.py b/source/state/level.py index 47a9abd..4e694d9 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -712,9 +712,10 @@ class Level(tool.State): # 拖动植物或者铲子 if not self.drag_plant and mouse_pos and mouse_click[0] and not clickedSun: - result = self.menubar.checkCardClick(mouse_pos) - if result: - self.setupMouseImage(result[0], result[1]) + self.clickResult = self.menubar.checkCardClick(mouse_pos) + if self.clickResult: + self.setupMouseImage(self.clickResult[0], self.clickResult[1]) + self.clickResult[1].clicked = True clickedCardsOrMap = True # 播放音效 pg.mixer.Sound(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))) ,"resources", "sound", "clickCard.ogg")).play() @@ -722,7 +723,9 @@ class Level(tool.State): if mouse_click[1]: self.removeMouseImage() clickedCardsOrMap = True + self.clickResult[1].clicked = False elif mouse_click[0]: + self.clickResult[1].clicked = False if self.menubar.checkMenuBarClick(mouse_pos): self.removeMouseImage() else: