diff --git a/my_Tetris.py b/my_Tetris.py
index 8711234..a0aadbe 100644
--- a/my_Tetris.py
+++ b/my_Tetris.py
@@ -1,5 +1,6 @@
 import pygame
 from pygame import locals
+import random
 
 pygame.init()   # 初始化
 score = 0
@@ -7,6 +8,7 @@ grid_size = 20  # 格子大小
 grid_num_width = 15     # 横向格子数量
 grid_num_height = 25      # 纵向格子数量
 FPS = 30
+jsq = 0
 
 # 创建窗口
 screen = pygame.display.set_mode((460, 500))
@@ -45,7 +47,19 @@ cube_colors = [
     (153, 0, 51), (204, 255, 102), (255, 153, 0)]
 
 center = [2, 8]     # 第2行第8列
-current_shape = [(0, -1), (0, 0), (0, 1), (-1, 0)]
+
+shape = random.choice(shape_list)
+index = random.randint(0,len(shape)-1)
+current_shape = shape[index]
+color = random.choice(cube_colors)
+
+
+
+def check(center):
+    for cube in current_shape:
+        cube = (cube[0] + center[0], cube[1] + center[1])
+        if cube[0]<1 or cube[1]<1 or cube[0]>grid_num_height or  cube[1]>grid_num_width:
+            return False 
 
 while True:
     for event in pygame.event.get():
@@ -53,14 +67,35 @@ while True:
             exit()
         if event.type == locals.KEYDOWN:
             if event.key == locals.K_RIGHT:     # 向右
-                if center[1] < 15:
-                    center[1] += 1
+                center[1] = center[1] + 1
+                if check(center) == False:
+                    center[1] = center[1] - 1 
+                    break
             elif event.key == locals.K_LEFT:    # 向左
-                if center[1] > 1:
-                    center[1] -= 1
+                center[1] = center[1] - 1
+                if check(center) == False:
+                    center[1] = center[1] + 1 
+                    break
             elif event.key == locals.K_DOWN:    # 向下
-                if center[0] < 25:
-                    center[0] += 1
+                center[0] = center[0] + 1
+                if check(center) == False:
+                    center[0] = center[0] - 1 
+                    break          
+            elif event.key == locals.K_UP:
+                oldindex = index
+                index = index + 1
+                if index >= len(shape):
+                    index = 0
+                current_shape = shape[index]
+                if check(center) == False:
+                    index = oldindex
+                    current_shape = shape[index]
+
+    jsq = jsq + 1
+    if jsq%FPS==0:
+        center[0] = center[0] + 1
+        if check(center) == False:
+            center[0] = center[0] - 1
 
     # 将背景图画上去
     screen.blit(background, (0, 0))
@@ -70,7 +105,9 @@ while True:
         pos = (cube[0] + center[0], cube[1] + center[1])
         current_pos.append(pos)
     # 取出所有小方块的行、列位置，计算坐标，绘制俄罗斯方块
+    
     for cube in current_pos:
+        
         pygame.draw.rect(screen, color,
                     (cube[1] * 20-20, cube[0] * 20-20, 20, 20), 0)
         pygame.draw.rect(screen, (255, 255, 255),