From 2ae2bc3ac5b4e86b43b7e9af1be40f5fb3fe0d30 Mon Sep 17 00:00:00 2001 From: AlexanderT Date: Mon, 22 Sep 2025 15:40:41 +0200 Subject: [PATCH] Updates to make sure the build goes through --- Assets/Editor/AppleHillsEditor.asmdef | 20 ++++++ Assets/Editor/AppleHillsEditor.asmdef.meta | 7 ++ .../Script/Editor/OptimizedRopeEditor.asmdef | 18 +++++ .../Editor/OptimizedRopeEditor.asmdef.meta | 7 ++ .../Scenes/MiniGames/DivingForPictures.unity | 4 +- ProjectSettings/ProjectSettings.asset | 70 ++++++++++--------- 6 files changed, 92 insertions(+), 34 deletions(-) create mode 100644 Assets/Editor/AppleHillsEditor.asmdef create mode 100644 Assets/Editor/AppleHillsEditor.asmdef.meta create mode 100644 Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef create mode 100644 Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef.meta diff --git a/Assets/Editor/AppleHillsEditor.asmdef b/Assets/Editor/AppleHillsEditor.asmdef new file mode 100644 index 00000000..393e2869 --- /dev/null +++ b/Assets/Editor/AppleHillsEditor.asmdef @@ -0,0 +1,20 @@ +{ + "name": "AppleHillsEditor", + "rootNamespace": "", + "references": [ + "GUID:d91d3f46515a6954caa674697afbf416", + "GUID:69448af7b92c7f342b298e06a37122aa", + "GUID:9e24947de15b9834991c9d8411ea37cf" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Editor/AppleHillsEditor.asmdef.meta b/Assets/Editor/AppleHillsEditor.asmdef.meta new file mode 100644 index 00000000..26981141 --- /dev/null +++ b/Assets/Editor/AppleHillsEditor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1ab90989592ecff489d33348d53a0d25 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef b/Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef new file mode 100644 index 00000000..0f46b8ba --- /dev/null +++ b/Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef @@ -0,0 +1,18 @@ +{ + "name": "OptimizedRopeEditor", + "rootNamespace": "", + "references": [ + "GUID:f7c43f01316c63c43a8b70a1dd6bdfac" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef.meta b/Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef.meta new file mode 100644 index 00000000..319726fc --- /dev/null +++ b/Assets/External/OptimizedRopesAndCables/Script/Editor/OptimizedRopeEditor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 57319c21dd728f548b8d33eeb404eb44 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MiniGames/DivingForPictures.unity b/Assets/Scenes/MiniGames/DivingForPictures.unity index b56248fe..47b91859 100644 --- a/Assets/Scenes/MiniGames/DivingForPictures.unity +++ b/Assets/Scenes/MiniGames/DivingForPictures.unity @@ -569,7 +569,7 @@ MonoBehaviour: m_EditorClassIdentifier: obstaclePrefabs: - {fileID: 4743746373562280435, guid: 315a624eb99600444a51bb1d37c51742, type: 3} - spawnInterval: 3 + spawnInterval: 2 spawnIntervalVariation: 1 maxSpawnAttempts: 10 spawnCollisionRadius: 1 @@ -2075,7 +2075,7 @@ MonoBehaviour: - {fileID: 2956826569642009690, guid: 7f7f10ca24a5afe46be797daea64111a, type: 3} initialTileCount: 3 tileSpawnBuffer: 1 - moveSpeed: 1 + moveSpeed: 5 speedUpFactor: 0 speedUpInterval: 0 maxMoveSpeed: 12 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 784f7c8a..23ff320e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -295,16 +295,52 @@ PlayerSettings: - m_BuildTarget: Android m_Icons: - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: + - m_Textures: + - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3} + - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3} m_Width: 432 m_Height: 432 m_Kind: 2 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3} + - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3} m_Width: 324 m_Height: 324 m_Kind: 2 m_SubKind: - - m_Textures: [] + - m_Textures: + - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3} + - {fileID: 2800000, guid: 00354ded9d8f8d643acc14837a229544, type: 3} m_Width: 216 m_Height: 216 m_Kind: 2 @@ -354,36 +390,6 @@ PlayerSettings: m_Height: 36 m_Kind: 1 m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: - m_BuildTarget: iPhone m_Icons: - m_Textures: []