From cb032171d84501d429f829c3788836bb28f68f90 Mon Sep 17 00:00:00 2001 From: huangjielun <2872405629@qq.com> Date: Sat, 17 Sep 2022 10:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E9=9C=80=E8=A6=81=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AF=B9=E6=96=B9=E7=9A=84=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=90=88=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/config.txt | 2 +- src/main.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/config.txt b/server/config.txt index 1ead9da..594c877 100644 --- a/server/config.txt +++ b/server/config.txt @@ -1,5 +1,5 @@ SOCKET_HOST=127.0.0.1 SOCKET_PORT=50005 MAX_WAITING_TIME=600 -MAX_THNIKING_TIME=15 +MAX_THNIKING_TIME=30 MAX_TOTAL_TIME=1000 diff --git a/src/main.py b/src/main.py index 74614c8..0848147 100644 --- a/src/main.py +++ b/src/main.py @@ -1689,7 +1689,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 @@ -2133,10 +2133,12 @@ def main(): draw_window(l_elephant, l_eagle, l_wolf, l_lion, l_leopard, l_mouse, l_fox, r_elephant, r_eagle, r_wolf, r_lion, r_leopard, r_mouse, r_fox, id, x, y, status, MAP, MAP1, turn) - if left_win(x, y, MAP, MAP1) or (demo == 1 and Left_win == 1): + if left_win(x, y, MAP, MAP1) or (demo == 1 and Left_win == 1) or (demo == 1 and player.status_2 == -1 and player.invalid == 0 and left_win(counterpart_x,counterpart_y,MAP,MAP1)): run = False - if right_win(x, y, MAP, MAP1) or (demo == 1 and Right_win == 1): + Left_win = 1 + if right_win(x, y, MAP, MAP1) or (demo == 1 and Right_win == 1) or (demo == 1 and player.status_2 == -1 and player.invalid == 0 and right_win(counterpart_x,counterpart_y,MAP,MAP1)): run = False + Right_win = 1 if left_win(x, y, MAP, MAP1) or (demo == 1 and Left_win == 1): if demo == 1 and player.side == 0: if pause == 1: @@ -2159,7 +2161,7 @@ def main(): C.ack_exit_game(client,player.side) - time.sleep(2) + time.sleep(10) #os.system("pause") return start_game.starting_screen()