Upgrade Unity editor to 6000.4.10f1 (#7013)

This commit is contained in:
2026-06-10 06:49:54 -07:00
committed by GitHub
parent de04afc47f
commit 21b56b8098
6 changed files with 276 additions and 274 deletions
+1 -1
View File
@@ -253,7 +253,7 @@ to be used for different players or game situations within the same server proce
**C# (Unity Client):** **C# (Unity Client):**
- Located in `/src/main/csharp/net/eagle0/clients/unity/eagle0/` - Located in `/src/main/csharp/net/eagle0/clients/unity/eagle0/`
- Uses Unity 6 (6000.4.9f1) with comprehensive protobuf integration (100+ .proto files) - Uses Unity 6 (6000.4.10f1) with comprehensive protobuf integration (100+ .proto files)
- Key components: `EagleConnection.cs` (gRPC client), `EagleGameController.cs` (main game logic) - Key components: `EagleConnection.cs` (gRPC client), `EagleGameController.cs` (main game logic)
- Real-time bidirectional streaming with server via `PersistentClientConnection.cs` - Real-time bidirectional streaming with server via `PersistentClientConnection.cs`
- Strategic map UI in `Assets/Eagle/`, tactical battle UI in `Assets/Shardok/` - Strategic map UI in `Assets/Eagle/`, tactical battle UI in `Assets/Shardok/`
+1 -1
View File
@@ -228,7 +228,7 @@ to be used for different players or game situations within the same server proce
**C# (Unity Client):** **C# (Unity Client):**
- Located in `/src/main/csharp/net/eagle0/clients/unity/eagle0/` - Located in `/src/main/csharp/net/eagle0/clients/unity/eagle0/`
- Uses Unity 6 (6000.4.9f1) with comprehensive protobuf integration (100+ .proto files) - Uses Unity 6 (6000.4.10f1) with comprehensive protobuf integration (100+ .proto files)
- Key components: `EagleConnection.cs` (gRPC client), `EagleGameController.cs` (main game logic) - Key components: `EagleConnection.cs` (gRPC client), `EagleGameController.cs` (main game logic)
- Real-time bidirectional streaming with server via `PersistentClientConnection.cs` - Real-time bidirectional streaming with server via `PersistentClientConnection.cs`
- Strategic map UI in `Assets/Eagle/`, tactical battle UI in `Assets/Shardok/` - Strategic map UI in `Assets/Eagle/`, tactical battle UI in `Assets/Shardok/`
+7 -5
View File
@@ -191,8 +191,10 @@ echo "Running: ${INSTALL_CMD[*]}"
echo "" echo ""
# Capture output to check for "already installed" messages # Capture output to check for "already installed" messages
OUTPUT=$("${INSTALL_CMD[@]}" 2>&1) || true set +e
OUTPUT=$("${INSTALL_CMD[@]}" 2>&1)
EXIT_CODE=$? EXIT_CODE=$?
set -e
echo "$OUTPUT" echo "$OUTPUT"
# Check if modules are already installed (Unity Hub returns error but modules are present) # Check if modules are already installed (Unity Hub returns error but modules are present)
@@ -219,13 +221,13 @@ else
exit 1 exit 1
fi fi
# Verify installation # Verify installation and requested modules
echo "" echo ""
if [ -d "${UNITY_INSTALL_PATH}/${UNITY_VERSION}" ]; then if check_modules_installed; then
echo "✓ Verified: Unity ${UNITY_VERSION} is now installed" echo "✓ Verified: Unity ${UNITY_VERSION} is now installed with ${PLATFORM} support"
exit 0 exit 0
else else
echo "✗ Unity ${UNITY_VERSION} installation could not be verified" echo "✗ Unity ${UNITY_VERSION} installation with ${PLATFORM} support could not be verified"
echo " Expected path: ${UNITY_INSTALL_PATH}/${UNITY_VERSION}" echo " Expected path: ${UNITY_INSTALL_PATH}/${UNITY_VERSION}"
echo "" echo ""
echo "The installation may still be in progress, or may require manual intervention." echo "The installation may still be in progress, or may require manual intervention."
File diff suppressed because it is too large Load Diff
@@ -217,12 +217,12 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.services.core": { "com.unity.services.core": {
"version": "1.16.0", "version": "1.17.0",
"depth": 2, "depth": 2,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.2.1", "com.unity.nuget.newtonsoft-json": "3.2.2",
"com.unity.modules.unitywebrequest": "1.0.0" "com.unity.modules.unitywebrequest": "1.0.0"
}, },
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
@@ -1,2 +1,2 @@
m_EditorVersion: 6000.4.9f1 m_EditorVersion: 6000.4.10f1
m_EditorVersionWithRevision: 6000.4.9f1 (f7258d6eebbe) m_EditorVersionWithRevision: 6000.4.10f1 (feeafc12a938)