try to compress the project

CharlesPikachu · Jan 8, 2022 · 09b1d8b · 09b1d8b
1 parent 52d9dde
commit 09b1d8b
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 12 deletions.
diff --git a/cpgames/modules/core/base/resources/audios/liuyuedeyu.mp3 b/cpgames/modules/core/base/resources/audios/liuyuedeyu.mp3
diff --git a/cpgames/modules/core/bunnybadger/resources/audios/moonlight.wav b/cpgames/modules/core/bunnybadger/resources/audios/moonlight.wav
diff --git a/cpgames/modules/core/maze/resources/audios/bgm.mp3 b/cpgames/modules/core/maze/resources/audios/bgm.mp3
diff --git a/cpgames/modules/core/pacman/pacman.py b/cpgames/modules/core/pacman/pacman.py
@@ -33,7 +33,7 @@ class Config():
     PURPLE = (255, 0, 255)
     SKYBLUE = (0, 191, 255)
     # 背景音乐路径
-    BGM_PATH = os.path.join(rootdir, 'resources/audios/bg.mp3')
+    BGM_PATH = os.path.join(rootdir, 'resources/audios/bgm.mp3')
     # 字体路径
     FONT_PATHS_DICT = {
         'default_s': {'name': os.path.join(rootdir, 'resources/fonts/ALGER.TTF'), 'size': 18},

diff --git a/cpgames/modules/core/pacman/resources/audios/bg.mp3 b/cpgames/modules/core/pacman/resources/audios/bg.mp3
diff --git a/cpgames/modules/core/pacman/resources/audios/bgm.mp3 b/cpgames/modules/core/pacman/resources/audios/bgm.mp3
diff --git a/cpgames/modules/core/puzzlepieces/puzzlepieces.py b/cpgames/modules/core/puzzlepieces/puzzlepieces.py
@@ -36,9 +36,9 @@ class Config():
         IMAGE_PATHS_DICT[item] = os.path.join(rootdir, f'resources/images/{item}')
     # 字体路径
     FONT_PATHS_DICT = {
-        '1/4screenwidth': {'name': os.path.join(rootdir, 'resources/fonts/FZSTK.TTF'), 'size': SCREENSIZE[0] // 4},
-        '1/15screenwidth': {'name': os.path.join(rootdir, 'resources/fonts/FZSTK.TTF'), 'size': SCREENSIZE[0] // 15},
-        '1/20screenwidth': {'name': os.path.join(rootdir, 'resources/fonts/FZSTK.TTF'), 'size': SCREENSIZE[0] // 20},
+        '1/4screenwidth': {'name': os.path.join(rootdir.replace('puzzlepieces', 'base'), 'resources/fonts/simkai.ttf'), 'size': SCREENSIZE[0] // 4},
+        '1/15screenwidth': {'name': os.path.join(rootdir.replace('puzzlepieces', 'base'), 'resources/fonts/simkai.ttf'), 'size': SCREENSIZE[0] // 15},
+        '1/20screenwidth': {'name': os.path.join(rootdir.replace('puzzlepieces', 'base'), 'resources/fonts/simkai.ttf'), 'size': SCREENSIZE[0] // 20},
     }
 
 

diff --git a/cpgames/modules/core/puzzlepieces/resources/fonts/FZSTK.TTF b/cpgames/modules/core/puzzlepieces/resources/fonts/FZSTK.TTF
diff --git a/cpgames/modules/core/ski/resources/fonts/FZSTK.TTF b/cpgames/modules/core/ski/resources/fonts/FZSTK.TTF
diff --git a/cpgames/modules/core/ski/ski.py b/cpgames/modules/core/ski/ski.py
@@ -40,9 +40,9 @@ class Config():
     BGM_PATH = os.path.join(rootdir, 'resources/audios/bgm.mp3')
     # 字体路径
     FONT_PATHS_DICT = {
-        '1/5screenwidth': {'name': os.path.join(rootdir, 'resources/fonts/FZSTK.TTF'), 'size': SCREENSIZE[0] // 5},
-        '1/20screenwidth': {'name': os.path.join(rootdir, 'resources/fonts/FZSTK.TTF'), 'size': SCREENSIZE[0] // 20},
-        'default': {'name': os.path.join(rootdir, 'resources/fonts/FZSTK.TTF'), 'size': 30},
+        '1/5screenwidth': {'name': os.path.join(rootdir.replace('ski', 'base'), 'resources/fonts/simkai.ttf'), 'size': SCREENSIZE[0] // 5},
+        '1/20screenwidth': {'name': os.path.join(rootdir.replace('ski', 'base'), 'resources/fonts/simkai.ttf'), 'size': SCREENSIZE[0] // 20},
+        'default': {'name': os.path.join(rootdir.replace('ski', 'base'), 'resources/fonts/simkai.ttf'), 'size': 30},
     }
 
 

diff --git a/cpgames/modules/core/towerdefense/resources/audios/bgm.mp3 b/cpgames/modules/core/towerdefense/resources/audios/bgm.mp3
diff --git a/cpgames/modules/core/towerdefense/towerdefense.py b/cpgames/modules/core/towerdefense/towerdefense.py
@@ -83,7 +83,7 @@ class Config():
         },
     }
     # 背景音乐路径
-    BGM_PATH = os.path.join(rootdir, 'resources/audios/bgm.mp3')
+    BGM_PATH = os.path.join(rootdir.replace('towerdefense', 'base'), 'resources/audios/liuyuedeyu.mp3')
     # 不同难度的settings
     DIFFICULTY_PATHS_DICT = {
         'easy': os.path.join(rootdir, 'resources/difficulties/easy.json'),

diff --git a/cpgames/modules/core/twentyfourpoint/resources/audios/bgm.mp3 b/cpgames/modules/core/twentyfourpoint/resources/audios/bgm.mp3
diff --git a/cpgames/modules/core/twentyfourpoint/twentyfourpoint.py b/cpgames/modules/core/twentyfourpoint/twentyfourpoint.py
@@ -66,7 +66,7 @@ class Config():
         'warn': os.path.join(rootdir, 'resources/audios/warn.wav'),
     }
     # 背景音乐路径
-    BGM_PATH = os.path.join(rootdir, 'resources/audios/bgm.mp3')
+    BGM_PATH = os.path.join(rootdir.replace('twentyfourpoint', 'base'), 'resources/audios/liuyuedeyu.mp3')
     # 字体路径
     FONT_PATHS_DICT = {
         'default': {'name': os.path.join(rootdir.replace('twentyfourpoint', 'base'), 'resources/fonts/MaiandraGD.TTF'), 'size': 30},

diff --git a/setup.py b/setup.py
@@ -19,7 +19,7 @@
 
 '''package data'''
 package_data = {
-    'cpgames.modules.core.base': ['resources/fonts/*'],
+    'cpgames.modules.core.base': ['resources/fonts/*', 'resources/audios/*'],
     'cpgames.modules.core.aircraftwar': ['resources/audios/*', 'resources/images/*'],
     'cpgames.modules.core.alieninvasion': ['resources/*'],
     'cpgames.modules.core.angrybirds': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'],
@@ -36,8 +36,8 @@
     'cpgames.modules.core.minesweeper': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'],
     'cpgames.modules.core.pacman': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'],
     'cpgames.modules.core.pingpong': ['resources/audios/*', 'resources/images/*'],
-    'cpgames.modules.core.puzzlepieces': ['resources/fonts/*', 'resources/images/*'],
-    'cpgames.modules.core.ski': ['resources/audios/*', 'resources/fonts/*', 'resources/images/*'],
+    'cpgames.modules.core.puzzlepieces': ['resources/images/*'],
+    'cpgames.modules.core.ski': ['resources/audios/*', 'resources/images/*'],
     'cpgames.modules.core.sokoban': ['resources/audios/*', 'resources/images/*', 'resources/levels/*'],
     'cpgames.modules.core.tankwar': ['resources/audios/*', 'resources/images/bullet/*', 'resources/images/enemyTank/*', 'resources/images/food/*', 'resources/images/home/*', 'resources/images/others/*', 'resources/images/playerTank/*', 'resources/images/scene/*'],
     'cpgames.modules.core.tankwar.modules': ['levels/*'],