Unityサーバービルド

ARCHITECTURE.en.md

@@ -260,7 +260,7 @@ A shared foundation library used by both the REST API server (Game.Server) and r
 |---------|-------------|
 | JWT Authentication | Common auth middleware configuration (token validation, userId extraction) |
 | Health Check | Shared `/health` endpoint implementation |
-| Configuration | Common configuration classes such as GameServerConfiguration |
+| Configuration | Common configuration classes such as UnityServerConfiguration |
 | Extensions | Utilities like userId extraction from ClaimsPrincipal |
 
 ### 3.4 Inter-Project Dependencies

ARCHITECTURE.md

@@ -257,7 +257,7 @@ REST APIサーバー（Game.Server）とリアルタイムサーバー（Game.Re
 |-----|------|
 | JWT認証 | 共通の認証ミドルウェア設定（トークン検証、userId抽出） |
 | ヘルスチェック | `/health` エンドポイント共通実装 |
-| 設定クラス | GameServerConfiguration 等の共通設定 |
+| 設定クラス | UnityServerConfiguration 等の共通設定 |
 | 拡張メソッド | ClaimsPrincipal からの userId 取得など |
 
 ### 3.4 プロジェクト間依存関係

docker/game-realtime/prod/deploy.ps1

@@ -120,6 +120,10 @@ if (-not $BuildOnly) {
     if ($env:Jwt__Issuer) { $EnvVars += "Jwt__Issuer=$env:Jwt__Issuer" }
     if ($env:Jwt__Audience) { $EnvVars += "Jwt__Audience=$env:Jwt__Audience" }
 
+    # Add Unity Server settings if configured
+    if ($env:UNITY_SERVER_ADDRESS) { $EnvVars += "UnityServer__ServerAddress=$env:UNITY_SERVER_ADDRESS" }
+    if ($env:UNITY_SERVER_PORT) { $EnvVars += "UnityServer__ServerPort=$env:UNITY_SERVER_PORT" }
+
     # Add Valkey settings if configured
     if ($ValkeyEnabled) {
         $ValkeyPort = if ($env:VALKEY_PORT) { $env:VALKEY_PORT } else { "6379" }

docker/game-realtime/prod/deploy.sh

@@ -119,6 +119,10 @@ if [[ "$BUILD_ONLY" != "true" ]]; then
     [[ -n "$Jwt__Issuer" ]] && ENV_VARS="$ENV_VARS,Jwt__Issuer=$Jwt__Issuer"
     [[ -n "$Jwt__Audience" ]] && ENV_VARS="$ENV_VARS,Jwt__Audience=$Jwt__Audience"
 
+    # Unity Server 接続設定
+    [[ -n "$UNITY_SERVER_ADDRESS" ]] && ENV_VARS="$ENV_VARS,UnityServer__ServerAddress=$UNITY_SERVER_ADDRESS"
+    [[ -n "$UNITY_SERVER_PORT" ]] && ENV_VARS="$ENV_VARS,UnityServer__ServerPort=$UNITY_SERVER_PORT"
+
     # Valkey 設定を追加
     if [[ "$VALKEY_ENABLED" == "true" ]]; then
         VALKEY_PORT="${VALKEY_PORT:-6379}"

docker/game-server/docker-compose.yml

@@ -45,6 +45,7 @@ services:
       - Jwt__Secret=${JWT_SECRET:?Set JWT_SECRET in .env}
       - Jwt__Issuer=Game.Server
       - Jwt__Audience=Game.Client
+      - UnityServerAuth__SecretKey=${UNITY_SERVER_AUTH_SESSION_SECRET:?Set UNITY_SERVER_AUTH_SESSION_SECRET in .env}
     depends_on:
       db:
         condition: service_healthy
@@ -71,8 +72,10 @@ services:
       - Jwt__Secret=${JWT_SECRET:?Set JWT_SECRET in .env}
       - Jwt__Issuer=Game.Server
       - Jwt__Audience=Game.Client
-      - UnityServerAuth__SecretKey=${UNITY_SERVER_AUTH_SESSION_SECRET:?Set UNITY_SERVER_AUTH_SESSION_SECRET in .env}
+      - GameServer__BaseUrl=http://server:8080
     depends_on:
+      server:
+        condition: service_healthy
       valkey:
         condition: service_healthy
     healthcheck:
@@ -84,18 +87,22 @@ services:
 
 #  unity-server:
 #    image: unity-server-linux
-#    container_name: game-server-unity-server
+#    container_name: game-server-unity
 #    build:
 #      context: ../../src/Game.Client/Builds/Server/Linux
-#      dockerfile: ../../docker/unity-server/Dockerfile
+#      dockerfile: ../../../../../docker/unity-server/Dockerfile
 #    ports:
 #      - "7777:7777/udp"
 #      - "7778:7778/tcp"
 #    environment:
 #      - UNITY_SERVER_AUTH_SESSION_SECRET=${UNITY_SERVER_AUTH_SESSION_SECRET:?Set UNITY_SERVER_AUTH_SESSION_SECRET in .env}
-#    command: ["--port", "7777", "--health-port", "7778", "--players", "4", "--secret", "${UNITY_SERVER_AUTH_SESSION_SECRET}"]
+#      - GAME_SERVER_URL=http://server:8080
+#    command: ["--port", "7777", "--health-port", "7778", "--players", "4"]
+#    depends_on:
+#      server:
+#        condition: service_healthy
 #    healthcheck:
-#      test: ["CMD-SHELL", "bash -c 'echo > /dev/tcp/localhost/7778' || exit 1"]
+#      test: ["CMD-SHELL", "bash -c 'exec 3<>/dev/tcp/localhost/7778 && echo -e \"GET /health HTTP/1.1\\r\\nHost: localhost\\r\\n\\r\\n\" >&3 && cat <&3 | head -1 | grep -q \"200 OK\"' || exit 1"]
 #      interval: 10s
 #      timeout: 3s
 #      retries: 3

docker/game-server/prod/deploy.ps1

@@ -34,7 +34,7 @@ if (Test-Path $EnvFile) {
 }
 
 # Check required variables
-$RequiredVars = @("PROJECT_ID", "REGION", "REPO_NAME", "SERVICE_NAME", "INSTANCE_NAME", "SECRET_DB_CONNECTION", "SECRET_JWT", "SECRET_REQUEST_SIGNING", "SECRET_VALKEY_CONNECTION")
+$RequiredVars = @("PROJECT_ID", "REGION", "REPO_NAME", "SERVICE_NAME", "INSTANCE_NAME", "SECRET_DB_CONNECTION", "SECRET_JWT", "SECRET_REQUEST_SIGNING", "SECRET_VALKEY_CONNECTION", "SECRET_UNITY_SERVER_AUTH")
 foreach ($var in $RequiredVars) {
     if (-not (Get-Item -Path "Env:$var" -ErrorAction SilentlyContinue)) {
         Write-Host "[ERROR] Required variable $var is not set in .env" -ForegroundColor Red
@@ -114,7 +114,8 @@ if (-not $BuildOnly) {
         "ConnectionStrings__Default=$env:SECRET_DB_CONNECTION`:latest",
         "Jwt__Secret=$env:SECRET_JWT`:latest",
         "RequestSigning__SecretKey=$env:SECRET_REQUEST_SIGNING`:latest",
-        "ConnectionStrings__Valkey=$env:SECRET_VALKEY_CONNECTION`:latest"
+        "ConnectionStrings__Valkey=$env:SECRET_VALKEY_CONNECTION`:latest",
+        "UnityServerAuth__SecretKey=$env:SECRET_UNITY_SERVER_AUTH`:latest"
     )
     if ($env:SECRET_RESEND) { $Secrets += "Resend__ApiKey=$env:SECRET_RESEND`:latest" }
     $SecretsString = $Secrets -join ","

docker/game-server/prod/deploy.sh

@@ -39,7 +39,7 @@ else
 fi
 
 # 必須変数の確認
-REQUIRED_VARS=("PROJECT_ID" "REGION" "REPO_NAME" "SERVICE_NAME" "INSTANCE_NAME" "SECRET_DB_CONNECTION" "SECRET_JWT" "SECRET_REQUEST_SIGNING" "SECRET_VALKEY_CONNECTION")
+REQUIRED_VARS=("PROJECT_ID" "REGION" "REPO_NAME" "SERVICE_NAME" "INSTANCE_NAME" "SECRET_DB_CONNECTION" "SECRET_JWT" "SECRET_REQUEST_SIGNING" "SECRET_VALKEY_CONNECTION" "SECRET_UNITY_SERVER_AUTH")
 for var in "${REQUIRED_VARS[@]}"; do
     if [[ -z "${!var}" ]]; then
         echo "[ERROR] Required variable $var is not set in .env"
@@ -110,6 +110,7 @@ if [[ "$BUILD_ONLY" != "true" ]]; then
     SECRETS="$SECRETS,Jwt__Secret=${SECRET_JWT}:latest"
     SECRETS="$SECRETS,RequestSigning__SecretKey=${SECRET_REQUEST_SIGNING}:latest"
     SECRETS="$SECRETS,ConnectionStrings__Valkey=${SECRET_VALKEY_CONNECTION}:latest"
+    SECRETS="$SECRETS,UnityServerAuth__SecretKey=${SECRET_UNITY_SERVER_AUTH}:latest"
     [[ -n "$SECRET_RESEND" ]] && SECRETS="$SECRETS,Resend__ApiKey=${SECRET_RESEND}:latest"
 
     # デプロイコマンドを構築

docker/game-server/prod/docker-compose.yml

@@ -61,6 +61,7 @@ services:
       - Jwt__Secret=${JWT_SECRET:?Set JWT_SECRET in .env}
       - Jwt__Issuer=GameServer
       - Jwt__Audience=GameClient
+      - UnityServerAuth__SecretKey=${UNITY_SERVER_AUTH_SESSION_SECRET:?Set UNITY_SERVER_AUTH_SESSION_SECRET in .env}
     depends_on:
       db:
         condition: service_healthy

docker/unity-server/Dockerfile

@@ -26,7 +26,7 @@ COPY . .
 # ビルド時の不要ファイルを除去 + 実行権限付与
 RUN rm -rf *_BackUpThisFolder_ButDontShipItWithYourGame \
            *_BurstDebugInformation_DoNotShip \
-    && chmod +x Unity6GameServer \
+    && chmod +x Unity6GameServer* \
     && chown -R gameserver:gameserver /app
 
 USER gameserver
@@ -35,9 +35,9 @@ USER gameserver
 EXPOSE 7777/udp
 EXPOSE 7778/tcp
 
-# TCP ヘルスチェック（bash の /dev/tcp を使用、追加パッケージ不要）
+# HTTP ヘルスチェック（ServerHttpListener の GET /health）
 HEALTHCHECK --interval=10s --timeout=3s --start-period=15s --retries=3 \
-    CMD bash -c 'echo > /dev/tcp/localhost/7778' || exit 1
+    CMD bash -c 'exec 3<>/dev/tcp/localhost/7778 && echo -e "GET /health HTTP/1.1\r\nHost: localhost\r\n\r\n" >&3 && cat <&3 | head -1 | grep -q "200 OK"' || exit 1
 
-ENTRYPOINT ["./Unity6GameServer", "-batchmode", "-nographics"]
+ENTRYPOINT ["./Unity6GameServer.x86_64", "-batchmode", "-nographics"]
 CMD ["--port", "7777", "--health-port", "7778", "--players", "4"]

src/Game.Client/Assets/Photon/Fusion/Resources/PhotonAppSettings.asset

@@ -18,7 +18,7 @@ MonoBehaviour:
     AppIdVoice: 
     AppVersion: 
     UseNameServer: 1
-    FixedRegion: 
+    FixedRegion: jp
     Server: 
     Port: 0
     ProxyServer: