From ce6205cf2cbea5587d627cb9fbcf5cc14f36b92b Mon Sep 17 00:00:00 2001 From: Ben Calegari Date: Tue, 30 Jun 2026 20:04:54 -0700 Subject: [PATCH 1/2] Update rider integration --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 6060bba..97b2681 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,7 +4,7 @@ "com.unity.cinemachine": "3.1.6", "com.unity.collab-proxy": "2.12.4", "com.unity.entities.graphics": "6.4.0", - "com.unity.ide.rider": "3.0.39", + "com.unity.ide.rider": "3.0.40", "com.unity.ide.visualstudio": "2.0.27", "com.unity.inputsystem": "1.19.0", "com.unity.multiplayer.center": "1.0.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 02f3359..9394995 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -86,7 +86,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.39", + "version": "3.0.40", "depth": 0, "source": "registry", "dependencies": { From fc4d2adfe6795cdcd3a6ef940d6c3c414bee12b7 Mon Sep 17 00:00:00 2001 From: Ben Calegari Date: Tue, 30 Jun 2026 20:36:13 -0700 Subject: [PATCH 2/2] Rename firerate > attacks per second --- Assets/_Project/Definitions/Towers/BasicArrowTower.asset | 2 +- Assets/_Project/Definitions/Towers/SiegeCannonTower.asset | 2 +- Assets/_Project/Definitions/Towers/TeslaCoilTower.asset | 2 +- Assets/_Project/Definitions/Towers/Wall.asset | 2 +- Assets/_Recovery.meta | 8 ++++++++ .../Packages/com.unity.probuilder/Settings.json | 5 ----- 6 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 Assets/_Recovery.meta diff --git a/Assets/_Project/Definitions/Towers/BasicArrowTower.asset b/Assets/_Project/Definitions/Towers/BasicArrowTower.asset index 7709fe3..3a1c5c4 100644 --- a/Assets/_Project/Definitions/Towers/BasicArrowTower.asset +++ b/Assets/_Project/Definitions/Towers/BasicArrowTower.asset @@ -25,7 +25,7 @@ MonoBehaviour: GroundedOnly: 0 Damage: 10 Range: 20 - FireRate: 5 + AttacksPerSecond: 5 SplashRadius: 0 ChainCount: 0 ChainRange: 0 diff --git a/Assets/_Project/Definitions/Towers/SiegeCannonTower.asset b/Assets/_Project/Definitions/Towers/SiegeCannonTower.asset index 54d91dd..1712099 100644 --- a/Assets/_Project/Definitions/Towers/SiegeCannonTower.asset +++ b/Assets/_Project/Definitions/Towers/SiegeCannonTower.asset @@ -25,7 +25,7 @@ MonoBehaviour: GroundedOnly: 1 Damage: 25 Range: 16 - FireRate: 0.8 + AttacksPerSecond: 0.8 SplashRadius: 3 ChainCount: 0 ChainRange: 0 diff --git a/Assets/_Project/Definitions/Towers/TeslaCoilTower.asset b/Assets/_Project/Definitions/Towers/TeslaCoilTower.asset index 5ee484e..e969989 100644 --- a/Assets/_Project/Definitions/Towers/TeslaCoilTower.asset +++ b/Assets/_Project/Definitions/Towers/TeslaCoilTower.asset @@ -27,7 +27,7 @@ MonoBehaviour: GroundedOnly: 0 Damage: 5 Range: 10 - FireRate: 2 + AttacksPerSecond: 2 SplashRadius: 0 ChainCount: 0 ChainRange: 0 diff --git a/Assets/_Project/Definitions/Towers/Wall.asset b/Assets/_Project/Definitions/Towers/Wall.asset index 8ee63b7..ead40ed 100644 --- a/Assets/_Project/Definitions/Towers/Wall.asset +++ b/Assets/_Project/Definitions/Towers/Wall.asset @@ -24,7 +24,7 @@ MonoBehaviour: GroundedOnly: 0 Damage: 0 Range: 0 - FireRate: 0 + AttacksPerSecond: 0 SplashRadius: 0 ChainCount: 0 ChainRange: 0 diff --git a/Assets/_Recovery.meta b/Assets/_Recovery.meta new file mode 100644 index 0000000..701aa9b --- /dev/null +++ b/Assets/_Recovery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4da4faa336600407eba8a8b842ddebe1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 9202690..ebf0b37 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -135,11 +135,6 @@ "type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.dragSelectRectMode", "value": "{\"m_Value\":0}" - }, - { - "type": "UnityEditor.ProBuilder.Actions.ExportAssetOptions, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "export.assetOptions", - "value": "{\"m_Value\":{\"makePrefab\":false,\"replaceOriginal\":false}}" } ] }