Merge pull request '多场景来回切换版本' (#3) from feature-mutiple-scene into main

Reviewed-on: http://tc.junepve.top:3000/zhiyuan/Project1/pulls/3

page/page.py

@@ -6,7 +6,10 @@
 # Datetime:     2026/7/25 下午10:44
 # Description:
 # ---------------------------------------------------------------------------
+import os
+
 import pygame
+from src.config.game_config import data_path
 
 # 初始化pygame
 pygame.init()
@@ -22,7 +25,8 @@ screen = pygame.display.set_mode(size)
 pygame.display.set_caption("New_game")
 
 # 播放并循环音乐
-pygame.mixer_music.load(r'D:\python_project\Game_project\file\vespidaze-upbeat-rpg-battle-460971.mp3')
+data_path = data_path()
+pygame.mixer_music.load(os.path.join(data_path, "vespidaze-upbeat-rpg-battle-460971.mp3"))
 pygame.mixer_music.play(-1)
 
 # 状态值

src/config/game_config.py

@@ -13,4 +13,5 @@ def data_path():
     data_path = os.path.join(project_path, "data")
     return data_path
 
-print(data_path())
+if __name__ == '__main__':
+    print(data_path())

src/config/scenes.py

@@ -0,0 +1,8 @@
+from src.scenes.main_menu_scene import MainMenuScene
+from src.scenes.game_scene import GameScene
+
+
+scene_dict = {
+    "MainMenuScene": MainMenuScene,
+    "GameScene": GameScene,
+}

src/scenes/base_scene.py

@@ -2,15 +2,27 @@ import pygame
 
 class BaseScene:
     def __init__(self, screen: pygame.Surface, clock: pygame.time.Clock):
+        """
+        初始化场景，接收并保存画布、计时器
+        """
         self.screen = screen
         self.clock = clock
         self.next_scene = None
 
     def update(self):
+        """
+        场景的每帧更新逻辑
+        """
         pass
 
     def handle_event(self, events):
+        """
+        接收主循环传来的事件并处理
+        """
         pass
 
-    def switch_to_scene(self, scene_class):
-        self.next_scene = scene_class(self.screen, self.clock)
+    def switch_to_scene(self, scene_name):
+        """
+        切换场景
+        """
+        self.next_scene = scene_name

src/scenes/game_scene.py

@@ -1,12 +1,24 @@
+import os
+
 import pygame
 
-from src.config.game_config import GameConfig
+from src.config.game_config import data_path, GameConfig
 from src.scenes.base_scene import BaseScene
 
 
 class GameScene(BaseScene):
+    name = "GameScene"
     def __init__(self, screen, clock):
         super().__init__(screen, clock)
+        # 初始化音乐
+        pygame.mixer.init()
+        # 播放并循环音乐
+        pygame.mixer_music.load(os.path.join(data_path(), "vespidaze-upbeat-rpg-battle-460971.mp3"))
+        pygame.mixer_music.play(-1)
+
+        self.back_status = False
+
+        # 状态值
         self.dirty_x = 400
         self.dirty_y = 300
 
@@ -21,6 +33,8 @@ class GameScene(BaseScene):
         self.BLUE = (0, 0, 255)
 
     def update(self):
+        if self.back_status:
+            self.switch_to_scene("MainMenuScene")
         if self.Left_status and self.dirty_x >= 0:
             self.dirty_x -= 1
         if self.right_status and self.dirty_x <= GameConfig.window_x - 20:
@@ -29,11 +43,26 @@ class GameScene(BaseScene):
             self.dirty_y -= 1
         if self.down_status and self.dirty_y <= GameConfig.window_y - 30:
             self.dirty_y += 1
+            # 填充窗口颜色
+        self.screen.fill((255, 255, 255))
+
+        # 绘制矩形(移动体和固定体)
         dirty = pygame.draw.rect(self.screen, self.BLUE, [self.dirty_x, self.dirty_y, 20, 30])
+        enemy = pygame.draw.rect(self.screen, self.RED, [40, 60, 10, 10])
+
+        # 碰撞监测
+        if dirty.colliderect(enemy):
+            print("die")
+            self.dirty_x = 400
+            self.dirty_y = 300
+            dirty = pygame.draw.rect(self.screen, self.BLUE, [self.dirty_x, self.dirty_y, 20, 30])
 
     def handle_event(self, event):
+        # 按下按键
         if event.type == pygame.KEYDOWN:
-            if event.key == pygame.K_LEFT or event.key == pygame.K_a:
+            if event.key == pygame.K_ESCAPE:
+                self.back_status = True
+            elif event.key == pygame.K_LEFT or event.key == pygame.K_a:
                 self.Left_status = True
             elif event.key == pygame.K_RIGHT or event.key == pygame.K_d:
                 self.right_status = True
@@ -41,6 +70,7 @@ class GameScene(BaseScene):
                 self.up_status = True
             elif event.key == pygame.K_DOWN or event.key == pygame.K_s:
                 self.down_status = True
+        # 松开按键
         elif event.type == pygame.KEYUP:
             if event.key == pygame.K_LEFT or event.key == pygame.K_a:
                 self.Left_status = False

src/scenes/main_menu_scene.py

@@ -5,44 +5,48 @@ import pygame
 from src.config.color import Color
 from src.config.game_config import data_path, GameConfig
 from src.scenes.base_scene import BaseScene
-from src.scenes.game_scene import GameScene
 
 
 class MainMenuScene(BaseScene):
+    name = "MainMenuScene"
+    """
+    主菜单场景，显示提示信息，展示雨天特效
+    """
     def __init__(self, screen, clock):
+        """
+        初始化函数，初始化按钮按下状态、雨滴列表
+        """
         super().__init__(screen, clock)
         self.button_status = False
         self.debug_status = False
 
+        # 设置字体
+        font_file = os.path.join(data_path(),"Dymon-ShouXieTi.otf")
+        self.font = pygame.font.Font(font_file,16)
+        # 文本
+        self.game_info_text = self.font.render('按任意键开始游戏，鼠标点击退出', True, Color.white)
+
         # 雨滴列表
         self.rain_max = 50
         self.rain_list = []
         # 雨滴生命周期
         self.rain_live_max = 6
-
-        # 设置字体
-        font_file = os.path.join(data_path(),"Dymon-ShouXieTi.otf")
-        self.font = pygame.font.Font(font_file,16)
-
-        # 文本
-        self.game_info_text = self.font.render('按任意键开始游戏，鼠标点击退出', True, Color.white)
-
         # 初始化雨滴
         self.init_rain(self.rain_max)
 
     def update(self):
         # 按键按下则切换场景
         if self.button_status:
-            self.switch_to_scene(GameScene)
+            self.switch_to_scene("GameScene")
 
         # 显示提示文本
-
         screen_rect = self.screen.get_rect()  # 获取屏幕矩形
         text_rect = self.game_info_text.get_rect()  # 获取文本矩形
         self.__show(text_rect, (0, 15))
         text_rect.center = screen_rect.center  # 将文本居中到屏幕
         self.screen.blit(self.game_info_text, text_rect.topleft)
 
+        # 调试信息，debug模式下显示
         self.__show(screen_rect)
         self.__show(text_rect,(0,30))
         self.__show(text_rect.center,(0,45))
@@ -51,12 +55,18 @@ class MainMenuScene(BaseScene):
         self.rain_fall()
 
     def handle_event(self, event):
+        """
+        接收主循环传来的事件并处理
+        """
         if event.type == pygame.KEYDOWN:
             self.button_status = True
         elif event.type == pygame.MOUSEBUTTONDOWN:
             return "exit"  # 主循环接收返回，为exit时设置running为False，退出游戏
 
     def __show(self, info, dest=(0, 0)):
+        """
+        显示调试文本
+        """
         if not self.debug_status:
             return
         if not isinstance(info, str):
@@ -65,6 +75,9 @@ class MainMenuScene(BaseScene):
         self.screen.blit(info_text, dest)
 
     def __rain_list_append(self, status=0):
+        """
+        向列表中添加一个雨滴，默认状态为0
+        """
         x = random.randint(0, int(GameConfig.window_x))
         y = random.randint(0, int(GameConfig.window_y))
         rain = {

start.py

@@ -1,6 +1,7 @@
 import pygame
 
 from src.config.game_config import GameConfig
+from src.config.scenes import scene_dict
 from src.scenes.main_menu_scene import MainMenuScene
 
 
@@ -16,8 +17,10 @@ class Game:
         # 设置计时器
         self.clock = pygame.time.Clock()
 
+        # 场景字典
+        self.game_scenes = scene_dict
         # 当前场景
-        self.scene = MainMenuScene(self.screen, self.clock)
+        self.scene = self.game_scenes["MainMenuScene"](self.screen, self.clock)
 
         # 运行循环
         self.running = True
@@ -35,7 +38,9 @@ class Game:
 
             # 检查是否切换场景
             if self.scene.next_scene is not None:
-                self.scene = self.scene.next_scene
+                if self.scene.next_scene in self.game_scenes.keys():
+                    scene_class = self.game_scenes[self.scene.next_scene]
+                    self.scene = scene_class(self.screen, self.clock)
 
             # 清屏
             self.screen.fill(GameConfig.bg_color)