Merge pull request #135 from eesast/fix-run

Fix run

Author: konpoku

dependency/shell/run.sh

@@ -45,12 +45,14 @@ fi
 : "${PORT:=8888}"
 : "${TEAM_COUNT:=2}"
 : "${CHARACTER_NUM:=6}"
-: "${GAME_TIME:=600}"
+: "${GAME_TIME:=10}"
 : "${EXPOSED:=1}"
 : "${TEAM_SEQ_ID:=0}"
 : "${TEAM_LABEL:=TeamA}"
 : "${CONNECT_IP:=172.17.0.1}"
 
+GAME_TIME=$((GAME_TIME * 60))
+
 # ═══════════════════════════════════════════════════════════════════════════
 #  SERVER
 # ═══════════════════════════════════════════════════════════════════════════

interface/AvaloniaUI/THUAI9_Avalonia.csproj

@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="12.0.2" />
-    <PackageReference Include="Avalonia.Desktop" Version="12.0.2" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.2" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.2" />
+    <PackageReference Include="Avalonia" Version="12.0.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.0.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.3" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.3" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="Google.Protobuf" Version="3.34.1" />
     <PackageReference Include="Grpc.Core" Version="2.46.6" />

interface/Unity/Unity-Live/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.62f1c1
-m_EditorVersionWithRevision: 2022.3.62f1c1 (b0109b07edb8)
+m_EditorVersion: 2022.3.62f3
+m_EditorVersionWithRevision: 2022.3.62f3 (96770f904ca7)

interface/Unity/Unity-Playback/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.62f1c1
-m_EditorVersionWithRevision: 2022.3.62f1c1 (b0109b07edb8)
+m_EditorVersion: 2022.3.62f3
+m_EditorVersionWithRevision: 2022.3.62f3 (96770f904ca7)

interface/Unity/Unity-Trial/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.62f1c1
-m_EditorVersionWithRevision: 2022.3.62f1c1 (b0109b07edb8)
+m_EditorVersion: 2022.3.62f3
+m_EditorVersionWithRevision: 2022.3.62f3 (96770f904ca7)

logic/Gaming/Game.cs

@@ -26,8 +26,11 @@ public partial class Game
     {
         private readonly Map gameMap;
         public Map GameMap => gameMap;
+        private readonly int numOfTeam;
+        public int NumOfTeam => numOfTeam;
         public Game(MapStruct mapResource, int numOfTeam)
         {
+            this.numOfTeam = numOfTeam;
             gameMap = new(mapResource);
             characterManager = new(this, gameMap);
             actionManager = new(this, gameMap, characterManager);

logic/Gaming/Teams.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using static System.Formats.Asn1.AsnWriter;
 
 namespace Gaming
@@ -101,7 +102,7 @@ private void InitTeams(int numOfTeam)
             for (int i = 0; i < numOfTeam; i++)
             {
                 long teamId = i + 1;
-                var (cx, cy) = corners[i];
+                var (cx, cy) = corners[selected[i]];
                 XY pos = GameData.GetCellCenterPos(cx, cy);
                 var fac = new Factory(pos);
                 fac.TeamID.SetROri(teamId);