Merge branch 'develop' of https://bdgit.educoder.net/pahiq8bnc/Jungle into develop

server/server.py

@@ -13,6 +13,7 @@ else:
     import Queue
     from thread import *
 
+
 class Config:
     SOCKET_HOST = '127.0.0.1'  # Symbolic name meaning all available interfaces
     SOCKET_PORT = 50005  # Arbitrary non-privileged port
@@ -20,6 +21,7 @@ class Config:
     MAX_THNIKING_TIME = 60
     MAX_TOTAL_TIME = 600
 
+
 class Client:
     def __init__(self, conn, addr, name, side, time, total):
         self.conn = conn
@@ -29,11 +31,14 @@ class Client:
         self.time = time
         self.total = total
 
+
 mutex = Lock()
 mutex_playing = Lock()
 
 playing_ones = {}
 waiting_players = Queue.Queue()
+
+
 # init queues
 # for games in range(1, 10):
 #	waiting_players[games] = Queue.Queue()
@@ -55,6 +60,7 @@ def load_config():
             else:
                 pass
 
+
 def get_counterpart_from(waiting_ones):
     counterpart = None
     mutex.acquire()
@@ -63,17 +69,20 @@ def get_counterpart_from(waiting_ones):
     mutex.release()
     return counterpart
 
+
 def to_wait_in_queue(client, the_queue):
     mutex.acquire()
     the_queue.put(client)
     mutex.release()
 
+
 def remove_one_from_queue(the_queue):
     mutex.acquire()
     if (the_queue.qsize() == 1):
         the_queue.get()
     mutex.release()
 
+
 def send_msg_to(client, msg):
     packet = json.dumps(msg)
     if (sys.version[:1] == "3"):
@@ -81,6 +90,7 @@ def send_msg_to(client, msg):
     # print(client.addr[0] + ":" + str(client.addr[1]) + "\t" + str(msg))
     client.conn.send(packet)
 
+
 def __start_match_between(client0, client1):
     match_uuid = str(uuid.uuid4())
     mutex_playing.acquire()
@@ -113,6 +123,7 @@ def __start_match_between(client0, client1):
     }
     send_msg_to(client1, msg1)
 
+
 def join_game_handler(msg, addr, conn):
     new_client = Client(conn, addr, msg['name'], -1, -1, -1)
     # game_type = msg["id"]
@@ -125,6 +136,7 @@ def join_game_handler(msg, addr, conn):
         # counterpart=get_counterpart_from(waiting_players[game_type])
         __start_match_between(new_client, counterpart)
 
+
 def quit_game_handler(msg):
     match_uuid = msg['game_id']
     if match_uuid is None:
@@ -150,6 +162,7 @@ def quit_game_handler(msg):
         }
         send_msg_to(to_notify, msg)
 
+
 def timer_thread():
     while True:
         time.sleep(1)
@@ -176,6 +189,7 @@ def timer_thread():
                 client.total -= 1
         mutex_playing.release()
 
+
 def transfer_message(msg):
     match_uuid = msg['game_id']
     pairs = playing_ones[match_uuid]
@@ -188,6 +202,7 @@ def transfer_message(msg):
     to_notify.time = Config.MAX_THNIKING_TIME
     send_msg_to(to_notify, msg)
 
+
 def client_thread(conn, addr):
     while True:
         try:
@@ -219,6 +234,8 @@ def client_thread(conn, addr):
             break
     # came out of loop
     conn.close()
+
+
 # print("conneection exit!")
 
 def main():
@@ -246,6 +263,6 @@ def main():
         start_new_thread(client_thread, (conn, addr))
     server.close()
 
+
 if __name__ == '__main__':
     main()
-	

src/main_an.py

@@ -1672,6 +1672,18 @@ def server_thread(conn,addr) :
     except:
         return
 
+def time_ShowAndCheck(player: player):
+    time.sleep(1)
+    clock = str(player.think_time) + '秒'
+    largeText = pygame.font.SysFont('comicsansms', 25)
+    TextSurf, TextRect = text_objects(clock, largeText)
+    if player.side == 1:
+        TextRect = init.tran(0,3)
+    else:
+        TextRect = init.tran(8,3)
+    gameDisplay.blit(TextSurf, TextRect)
+    pygame.display.update()
+
 
 mutex_playing = Lock()
 def time_thread():
@@ -1684,6 +1696,7 @@ def time_thread():
             break
         else:
             player.think_time -= 1
+            time_ShowAndCheck(player)
             player.total_time -= 1
     if is_over_time:
         return False
@@ -1691,7 +1704,7 @@ def time_thread():
         return True
 
 class Config:
-    SOCKET_HOST = '127.0.0.1'#Symbolic name meaning all available interfaces
+    SOCKET_HOST = '192.168.43.201'#Symbolic name meaning all available interfaces
     SOCKET_PORT = 50005#Arbitrary non-privileged port
     MAX_WAITING_TIME = 180
     MAX_THNIKING_TIME = 60
@@ -1747,6 +1760,7 @@ def main():
             run = False
         if demo == 1:
             C.start_new_thread(server_thread, (client,Address))
+            C.server_thread(time_thread,())
             Right_win = player.Right_win
             Left_win = player.Left_win
         for event in pygame.event.get():

src/time_diplay.py

@@ -0,0 +1,32 @@
+import pygame
+import time
+
+
+pygame.init()
+black = (0, 0, 0)
+white = (255, 255, 255)
+display_width = 800
+display_height = 600
+gameDisplay = pygame.display.set_mode((display_width, display_height))
+
+def text_objects(text, font):
+    textSurface = font.render(text, True, black)
+    return textSurface, textSurface.get_rect()
+
+
+
+def time_ShowAndCheck(client_time):
+    time.sleep(1)
+    gameDisplay.fill(white)
+    count = client_time
+    clock = str(count)
+    largeText = pygame.font.SysFont('comicsansms', 25)
+    TextSurf, TextRect = text_objects(clock, largeText)
+    TextRect.center = (750, (display_height / 10))
+    gameDisplay.blit(TextSurf, TextRect)
+    pygame.display.update()
+
+flag = 300
+while flag:
+    time_ShowAndCheck(flag)
+    flag -= 1