[学习内容]外星人入侵项目实践

p7528755 · p7528755 · commit ef60505a449c · 2017-05-22T22:01:07.000+08:00
1.修复消灭所有外星人之后游戏不能重新开始
2.增加外星人触碰底线时，游戏无法重新开始
diff --git a/alien.py b/alien.py
@@ -41,12 +41,12 @@ def __init__(self, screen):
         self.__speed = 1
         self.__min_distance_alien = 50
         self.__min_distance_wall = 40
-        self.__current_distance_alien_left = -1
-        self.__current_distance_alien_right = -1
-        self.__current_distance_wall_left = -1
-        self.__current_distance_wall_right = -1
-        self.__current_distance_bottom = -1
-        self.__current_distance_top = -1
+        self.__current_distance_alien_left = 0
+        self.__current_distance_alien_right = 0
+        self.__current_distance_wall_left = 0
+        self.__current_distance_wall_right = 0
+        self.__current_distance_bottom = 0
+        self.__current_distance_top = 0
 
     def blitme(self):
         """在指定的位置绘制外星人"""
diff --git a/game_functions.py b/game_functions.py
@@ -87,28 +87,29 @@ def creat_fleet_alien(screen, game_state, aliens, aliens_num):
             aliens.add(alien)
 
 
-def alien_short(scrren, gamge_state, aliens, ship, ai_settings):
+def alien_short(scrren, game_state, aliens, ship, ai_settings):
     """判断子弹是否命中外星人"""
     bullets = ship.get_bullets()
     # 求子弹和外星人交集
-    collisions = pygame.sprite.groupcollide(aliens, bullets, True, True)
+    collisions = pygame.sprite.groupcollide(aliens, bullets, True, False)
 
     # 外星人都被消灭时重新创建外星人
     if 0 == len(aliens):
         bullets.empty()
         alien_num = ai_settings.cal_alien_num_line_default(scrren)
-        creat_fleet_alien(scrren, aliens, alien_num)
+        creat_fleet_alien(scrren, game_state.game_state, aliens, alien_num)
         ai_settings.set_alien_info_default(aliens, alien_num)
     # print collisions
 
 
 def shiphit_alienoverline(scrren, game_state, ship, aliens):
     """外星人和飞船碰撞和过线处理"""
 
-    # for alien in aliens:
-    #     # 任意一个外星人过线
-    #     if 0 == alien.get_distance_wall_top():
-    #         game_state.game_state = 'stop'
+    for alien in aliens:
+        # 任意一个外星人过线
+        if 0 > alien.get_distance_wall_top():
+            game_state.game_state = 'stop'
+            break
 
     if pygame.sprite.spritecollideany(ship, aliens):
         game_state.game_state = 'stop'
@@ -132,4 +133,11 @@ def shiphit_alienoverline(scrren, game_state, ship, aliens):
             sleep(5)
             sys.exit()
 
+  # #  elif 'running' == game_state.game_state:
+  # #      if 0 == alien.get_distance_wall_top():
+  #
+  #       if 0 == len(aliens):
+  #           creat_fleet_alien(scrren, game_state, aliens, aliens_num)
+
+
 
diff --git a/settings.py b/settings.py
@@ -11,22 +11,22 @@ def __init__(self):
 
         # 屏幕设置
         self.scrren_width = 650
-        self.scrren_height = 1000
+        self.scrren_height = 700
         self.bg_color = (255, 255, 255)
 
         # 飞船设置
-        self.ship_speed = 1
+        self.ship_speed = 10
         self.ship_bullet_allowed = 100
         self.ship_limit = 3
 
         # 子弹设置
-        self.bullet_speed = 5
-        self.bullet_width = 3
-        self.bullet_height = 8
+        self.bullet_speed = 1
+        self.bullet_width = 200
+        self.bullet_height = 80
         self.bullet_color = 0, 0, 0
 
         # 外星人设置
-        self.alien_speed_range = {'low': 0.05, 'high': 0.3}
+        self.alien_speed_range = {'low': 0.01, 'high': 0.14}
 
         self.alien_max_num = 10
 
