Skip to content

Commit a06f78a

Browse files
committed
GRR
1 parent fd3fb5f commit a06f78a

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

.DS_Store

0 Bytes
Binary file not shown.

.github/workflows/BuildMacARM64.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,6 @@ jobs:
5757
draft: true
5858
prerelease: true
5959
generateReleaseNotes: true
60-
#- name: Find Release Asset
61-
# id: find_asset
62-
# run: echo "asset=$(find dist -type f -name '*.exe')" >> $GITHUB_ENV
63-
- name: Install zip and Compress Directory
64-
run: |
65-
Compress-Archive -Path dist\* -DestinationPath dist.zip
66-
shell: pwsh
67-
- name: Upload Release Asset
68-
#id: upload-release-asset
69-
#uses: softprops/action-gh-release@v2.1.0
70-
uses: actions/upload-release-asset@v1.0.2
71-
with:
72-
upload_url: ${{ steps.create_release.outputs.upload_url }}
73-
##asset_path: dist/MicrosoftCopilotClickerPygame-Windows-amd64.exe
74-
##asset_path: ${{ env.asset }}
75-
asset_path: dist.zip
76-
asset_name: MicrosoftCopilotClickerPygame-MacOS-ARM64.zip
77-
asset_content_type: application/zip
78-
##token: ${{ secrets.variables.MY_PERSONAL_ACCESS_TOKEN }}
79-
8060
- name: Upload build artifacts
8161
uses: actions/upload-artifact@v4
8262
with:

main.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,11 +594,15 @@ def PlayMusic(musNum):
594594
music2 = rl.load_music_stream(str(THIS_DIR / musicfilepath))
595595
#pygame.mixer.music.set_volume(pygamemixermusic)
596596
#pygame.mixer.music.play()
597+
rl.set_music_volume(music1, pygamemixermusic)
598+
rl.set_music_volume(music2, pygamemixermusic)
597599
rl.stop_music_stream(music1)
598600
rl.stop_music_stream(music2)
599601
rl.play_music_stream(music1)
600602
PlayMusic(random.randint(1,6))
601-
pygame.mixer.music.set_volume(pygamemixermusic * float(Settings[1]["value"] / 100))
603+
#pygame.mixer.music.set_volume(pygamemixermusic * float(Settings[1]["value"] / 100))
604+
rl.set_music_volume(music1, pygamemixermusic * float(Settings[1]["value"] / 100))
605+
rl.set_music_volume(music2, pygamemixermusic * float(Settings[1]["value"] / 100))
602606
click_sound = pygame.mixer.Sound(resource_path(str(THIS_DIR / "./assets/audio/Click mouse - Fugitive Simulator - The-Nick-of-Time.wav")))
603607
hover_sound = pygame.mixer.Sound(resource_path(str(THIS_DIR / "./assets/audio/251389__deadsillyrabbit__button_hover-wav.wav")))
604608
upgrade_sound = pygame.mixer.Sound(resource_path(str(THIS_DIR / "./assets/audio/Upgrade SOund 0001.wav")))
@@ -932,7 +936,9 @@ def prestige():
932936
resetupgrades()
933937
PlayMusic(random.randint(1,6))
934938
musicplays = 0
935-
pygame.mixer.music.set_volume(pygamemixermusic * float(Settings[1]["value"] / 100))
939+
#pygame.mixer.music.set_volume(pygamemixermusic * float(Settings[1]["value"] / 100))
940+
rl.set_music_volume(music1, pygamemixermusic * float(Settings[1]["value"] / 100))
941+
rl.set_music_volume(music2, pygamemixermusic * float(Settings[1]["value"] / 100))
936942
gems += gemstoget
937943

938944
# Draw upgrade buttons
@@ -999,7 +1005,9 @@ def distance_to(ax, ay, bx, by):
9991005
screen.blit(realarrowupimg1, (1100*WindowXscale + CamPos[0]*WindowXscale, (34*WindowYscale) + mos_y/40 + CamPos[1]*WindowYscale))
10001006

10011007
if not isinstance(Settings[1]["value"], str):
1002-
pygame.mixer.music.set_volume(pygamemixermusic * float(Settings[1]["value"] / 100))
1008+
#pygame.mixer.music.set_volume(pygamemixermusic * float(Settings[1]["value"] / 100))
1009+
rl.set_music_volume(music1, pygamemixermusic * float(Settings[1]["value"] / 100))
1010+
rl.set_music_volume(music2, pygamemixermusic * float(Settings[1]["value"] / 100))
10031011
if not isinstance(Settings[0]["value"], str):
10041012
upgrade_sound.set_volume(Decimal(Settings[0]["value"]/100))
10051013
hover_sound.set_volume(Decimal(Settings[0]["value"]/100))

0 commit comments

Comments
 (0)