From 33aa13d2220f1fa9cfc0d8031aea84bf1e42ac86 Mon Sep 17 00:00:00 2001
From: huangjielun <2872405629@qq.com>
Date: Sat, 15 Oct 2022 22:54:54 +0800
Subject: [PATCH] =?UTF-8?q?AI=E7=89=88=E4=BF=AE=E6=94=B9=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Client_connection.py                      |   5 +++++
 .../Client_connection.cpython-39.pyc          | Bin 4029 -> 4078 bytes
 src/main.py                                   |   8 ++++----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Client_connection.py b/src/Client_connection.py
index 34aba80..e53400e 100644
--- a/src/Client_connection.py
+++ b/src/Client_connection.py
@@ -57,6 +57,11 @@ def conn_to_server(conn,name):
     return
 #TODO：无法发送src与dst的坐标
 def move(conn,game_id,side,id,old_x,old_y,x,y):
+    if id == 0:
+        id = 14
+    if side == 1:
+        id = id - 7
+    #print("side,id:",side,id)
     data = {
         "type" : 1,
         "msg" :
diff --git a/src/__pycache__/Client_connection.cpython-39.pyc b/src/__pycache__/Client_connection.cpython-39.pyc
index dfae994fe0e4244ed791beb43e9b396ca2655383..cea4dee3c90715ec5a9e63027c62ee3a7c714186 100644
GIT binary patch
delta 852
zcmZ8fL2DC16yBNL>`u1XZCDA`rZG~|Xi%_PEj6YV+iII2)hJTx!6kM=8)_9MMJnCs
zK|P4acg;lvp+`}~OF{4lcn_ZRAYS?pEWWo}o6s5NoA=%~@0)p#*~#u^-J0Xr8V<f)
zS*~~=+>@M@V4P<^F7h+R>MdjfU9vT<5|X#{fJ+_iA&eOVT1%IDzygk*KA;6g5R<Vs
z56r-#U7GEfwA#ESHnczs#0$<esol{EVnH#~{o^7igDeZan$zj?<c}eActdt#j~_~Z
zGuocQ4=W2L%XV`}YfLZ$m(bycm1ad)weIE*l2w6ZP9qdzYJ}_(LBzu^YdF1#elv-n
zaU2ZiUt`Y{HdB*uLX<svLL{I^0%Ncx@~LG?i+Y7Ad!~U2Q}9{5&R(E|?gK88J4$el
zU>xqp2Xlw$31TjVG(mJ4+VMhW4gIEvKxIbL!`;J@)eQWMKR5SFS+P$IPE+zVg0B8`
za_3;%9$`=5yM2_+!*9DfI!oc6R**~AV3+b_hf+N}xQX=f`etLpU#YFvpW%_H_=8ue
zGQ91Z%ZIw%+e1mCM>3*NEqCM<i3o)MrKt)wJOd9B?~<X6ft0#Ta0OCME;&QyJVBYD
z0%fPj-oQ)eEUUsN=SzPT!yW6Yl&aors++Lo4(H!vZ2zeyOEQlqxmu!g!uQu}jYqy;
z$f(=!&GjdWq&i73MR52!iqQ?qAqc-K{T;Og_xcx7Ln0xB=)+|RQyfch5f|(qn(>$!

delta 807
zcmZ8e&ubG=5Z?E)*?rl~rrRyGwQX3bZ8TVHQ%jAlk)~=A5B({jH<!?j5+sT*K~%OV
z2!ePJoQpy(;z{VGh~ULP!HY*vUPL_DlUIu~o79B9$9`{SzL{_4z1?>|yNQZr8451;
zKEM6Fe=l*0vr90~U4CNrLzz#hxj7_#7O;Q^5uXh!ff_`8-r|84=ydv#R@7Hpd`C2u
zKncWC&J<s{uB4-@QiWgIvNnSXG6Na?n0A)TX;{(6wJ|gm4m<iN%fcJI?6%V=Ax&@w
zAsv;IWG^5<L3d$F7^9o$G;9Qg<6^k~st1}dm|TPnam~sg)2@!lNhs;blU8N>wpV>n
zYkIdT_390(5ARIX2bzkNIru4_yR%f;9pfCi?TN{ngO{<9i6itpG3P_Nn+;!L>EuoH
z8xDfPL}xpAI!t9U4+F;I!*_XYoE}-iG<lhztAB;utFR{q;J4whd#}tPR)Ar1V`iBc
zdXt`P>V(ggqUaJq4<Bmmn*D<hk!WB2|4gz7U(I4Fl<f8n)zlufHq{XlW6fH<>fOCx
zl}|`fAROLOmhdMe0pjoMP*X)pULd##1#802lUX1r5|rSPwZNXiM{Am`!4K<G-x`L$
z>3QFm)kZ_Ez;0qZ^%i5Dxiw}phud6kQJ(O;dZl*9^U_JV4u29}HcP6D1UZ7E?I=ba
fq(zV*C=+bKi@w#tArTisnE2^J6UXCR#02{XpGc9h

diff --git a/src/main.py b/src/main.py
index 8332f5e..128dfbb 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1745,9 +1745,9 @@ def server_thread(conn, addr):
             if not 'status' in msg:
                 status_2, game_id, side, old_x, old_y, x, y, num = C.handle_move(msg)
                 id = num + 1
-                id = (id + 7) % 14
-                if id == 0:
-                    id = 14
+                if side == 0:
+                    id = id + 7
+                print("turn,id:",side , id)
                 player.game_id = game_id
                 player.status_2 = status_2
                 Axis.axis[id]['old_x'] = old_x
@@ -1825,7 +1825,7 @@ def time_thread():
 
 
 class Config:
-    SOCKET_HOST = '127.0.0.1'  # Symbolic name meaning all available interfaces
+    SOCKET_HOST = '192.168.43.108'  # Symbolic name meaning all available interfaces
     SOCKET_PORT = 50005  # Arbitrary non-privileged port
     MAX_WAITING_TIME = 180
     MAX_THNIKING_TIME = 60