diff --git a/.vscode/settings.json b/.vscode/settings.json index d5d9a24c5..54d21e9c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -51,5 +51,5 @@ "temp/": true, "Temp/": true }, - "dotnet.defaultSolution": "HeavenStudio.sln" + "dotnet.defaultSolution": "HeavenStudio-AstrlJelly.sln" } \ No newline at end of file diff --git a/Assets/Resources/Games/rhythmCannery.prefab b/Assets/Resources/Games/cannery.prefab similarity index 99% rename from Assets/Resources/Games/rhythmCannery.prefab rename to Assets/Resources/Games/cannery.prefab index a92f3aae5..ce43dd6c6 100644 --- a/Assets/Resources/Games/rhythmCannery.prefab +++ b/Assets/Resources/Games/cannery.prefab @@ -716,7 +716,7 @@ GameObject: - component: {fileID: 5813499711186931250} - component: {fileID: 6610104882394386402} m_Layer: 0 - m_Name: rhythmCannery + m_Name: cannery m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Games/rhythmCannery.prefab.meta b/Assets/Resources/Games/cannery.prefab.meta similarity index 100% rename from Assets/Resources/Games/rhythmCannery.prefab.meta rename to Assets/Resources/Games/cannery.prefab.meta diff --git a/Assets/Resources/Sfx/games/cannery.meta b/Assets/Resources/Sfx/games/cannery.meta new file mode 100644 index 000000000..24b763ea1 --- /dev/null +++ b/Assets/Resources/Sfx/games/cannery.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b9869cd57d59b4c4688b951e4d851281 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rhythmCannery/can.ogg b/Assets/Resources/Sfx/games/cannery/can.ogg similarity index 100% rename from Assets/Resources/Sfx/games/rhythmCannery/can.ogg rename to Assets/Resources/Sfx/games/cannery/can.ogg diff --git a/Assets/Resources/Sfx/games/rhythmCannery/can.ogg.meta b/Assets/Resources/Sfx/games/cannery/can.ogg.meta similarity index 92% rename from Assets/Resources/Sfx/games/rhythmCannery/can.ogg.meta rename to Assets/Resources/Sfx/games/cannery/can.ogg.meta index 06f9be761..123c5e7a2 100644 --- a/Assets/Resources/Sfx/games/rhythmCannery/can.ogg.meta +++ b/Assets/Resources/Sfx/games/cannery/can.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/rhythmCannery/ding.ogg b/Assets/Resources/Sfx/games/cannery/ding.ogg similarity index 100% rename from Assets/Resources/Sfx/games/rhythmCannery/ding.ogg rename to Assets/Resources/Sfx/games/cannery/ding.ogg diff --git a/Assets/Resources/Sfx/games/rhythmCannery/ding.ogg.meta b/Assets/Resources/Sfx/games/cannery/ding.ogg.meta similarity index 92% rename from Assets/Resources/Sfx/games/rhythmCannery/ding.ogg.meta rename to Assets/Resources/Sfx/games/cannery/ding.ogg.meta index bf5cf3f49..1289e52c8 100644 --- a/Assets/Resources/Sfx/games/rhythmCannery/ding.ogg.meta +++ b/Assets/Resources/Sfx/games/cannery/ding.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery.meta b/Assets/Resources/Sprites/Games/Cannery.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery.meta rename to Assets/Resources/Sprites/Games/Cannery.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/AlarmMat.mat b/Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/AlarmMat.mat rename to Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/AlarmMat.mat.meta b/Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/AlarmMat.mat.meta rename to Assets/Resources/Sprites/Games/Cannery/AlarmMat.mat.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations.meta b/Assets/Resources/Sprites/Games/Cannery/Animations.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Alarm.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmAnim.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmAnim.controller rename to Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmAnim.controller.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta index 623adde7d..58b9f61e0 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmBop.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmBop.anim rename to Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmBop.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmBop.anim.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta index 30dad3d2d..70a9dcb4d 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Alarm/AlarmBop.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Alarm/AlarmBop.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlash.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlash.anim rename to Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlash.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlash.anim.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta index 1e6819c0d..e4fdbf190 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlash.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlash.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlashAnim.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlashAnim.controller rename to Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta index 26f39ff7e..f64a26d08 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/AlarmFlash/AlarmFlashAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Can.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanAnim.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanAnim.controller rename to Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanAnim.controller.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta index a674553fe..261decff5 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanMove.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanMove.anim rename to Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanMove.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanMove.anim.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta index 664b0be95..524c538a0 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Can/CanMove.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Can/CanMove.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Canner.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerAnim.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerAnim.controller rename to Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerAnim.controller.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta index d4516da5b..bcbbe284f 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerCan.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerCan.anim rename to Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerCan.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerCan.anim.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta index 202ee6236..06b700ea5 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/Canner/CannerCan.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/Canner/CannerCan.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller rename to Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta index 6b909ae60..0c06601a8 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltAnim.controller.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltMove.anim b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltMove.anim rename to Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta similarity index 81% rename from Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta rename to Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta index 89be2a1b9..32a7f0a63 100644 --- a/Assets/Resources/Sprites/Games/RhythmCannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta +++ b/Assets/Resources/Sprites/Games/Cannery/Animations/ConveyorBelt/ConveyorBeltMove.anim.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: mobcannery/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Cannery.png b/Assets/Resources/Sprites/Games/Cannery/Cannery.png similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Cannery.png rename to Assets/Resources/Sprites/Games/Cannery/Cannery.png diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/Cannery.png.meta b/Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta similarity index 100% rename from Assets/Resources/Sprites/Games/RhythmCannery/Cannery.png.meta rename to Assets/Resources/Sprites/Games/Cannery/Cannery.png.meta diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/chrislo27 - RhythmGame - The Cannery [Hjn_s6dLJm0 - 1138x640 - 0m53s].png b/Assets/Resources/Sprites/Games/RhythmCannery/chrislo27 - RhythmGame - The Cannery [Hjn_s6dLJm0 - 1138x640 - 0m53s].png deleted file mode 100644 index 68f81830e..000000000 Binary files a/Assets/Resources/Sprites/Games/RhythmCannery/chrislo27 - RhythmGame - The Cannery [Hjn_s6dLJm0 - 1138x640 - 0m53s].png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/RhythmCannery/chrislo27 - RhythmGame - The Cannery [Hjn_s6dLJm0 - 1138x640 - 0m53s].png.meta b/Assets/Resources/Sprites/Games/RhythmCannery/chrislo27 - RhythmGame - The Cannery [Hjn_s6dLJm0 - 1138x640 - 0m53s].png.meta deleted file mode 100644 index 0cb06e41f..000000000 --- a/Assets/Resources/Sprites/Games/RhythmCannery/chrislo27 - RhythmGame - The Cannery [Hjn_s6dLJm0 - 1138x640 - 0m53s].png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: aedadf3d50bf65142a6f9dea9db3c4e6 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: mobcannery/common - assetBundleVariant: diff --git a/Assets/Scripts/Games/RhythmCannery/Can.cs b/Assets/Scripts/Games/RhythmCannery/Can.cs index 7b36bb8ca..8a1cf2c73 100644 --- a/Assets/Scripts/Games/RhythmCannery/Can.cs +++ b/Assets/Scripts/Games/RhythmCannery/Can.cs @@ -5,7 +5,7 @@ using NaughtyBezierCurves; using HeavenStudio.Util; -namespace HeavenStudio.Games.Scripts_RhythmCannery +namespace HeavenStudio.Games.Scripts_Cannery { public class Can : MonoBehaviour { @@ -19,11 +19,11 @@ namespace HeavenStudio.Games.Scripts_RhythmCannery [SerializeField] Sprite[] canSprites; [SerializeField] Sprite cannedSprite; - RhythmCannery game; + Cannery game; private void Awake() { - game = RhythmCannery.instance; + game = Cannery.instance; int random = Random.Range(0, 2); Debug.Log(random); sr.sprite = canSprites[random]; @@ -42,7 +42,7 @@ namespace HeavenStudio.Games.Scripts_RhythmCannery private void Hit(PlayerActionEvent caller, float state) { game.cannerAnim.DoScaledAnimationAsync("Can", 0.5f); - SoundByte.PlayOneShotGame("rhythmCannery/can"); + SoundByte.PlayOneShotGame("cannery/can"); sr.sprite = cannedSprite; } } diff --git a/Assets/Scripts/Games/RhythmCannery/RhythmCannery.cs b/Assets/Scripts/Games/RhythmCannery/Cannery.cs similarity index 71% rename from Assets/Scripts/Games/RhythmCannery/RhythmCannery.cs rename to Assets/Scripts/Games/RhythmCannery/Cannery.cs index a5bdd8f07..5c7b83dce 100644 --- a/Assets/Scripts/Games/RhythmCannery/RhythmCannery.cs +++ b/Assets/Scripts/Games/RhythmCannery/Cannery.cs @@ -7,15 +7,15 @@ using UnityEngine; namespace HeavenStudio.Games.Loaders { using static Minigames; - public static class MobRhythmCanneryLoader + public static class MobCanneryLoader { public static Minigame AddGame(EventCaller eventCaller) { - return new Minigame("rhythmCannery", "Rhythm Cannery", "554899", false, false, new List() + return new Minigame("cannery", "The Cannery", "554899", false, false, new List() { new GameAction("bop", "Bop") { - function = delegate { RhythmCannery.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["auto"], eventCaller.currentEntity["toggle"]); }, + function = delegate { Cannery.instance.Bop(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["auto"], eventCaller.currentEntity["toggle"]); }, parameters = new List() { new Param("toggle", true, "Bop", "Toggle if the alarm should bop for the duration of this event."), @@ -25,16 +25,16 @@ namespace HeavenStudio.Games.Loaders new GameAction("can", "Can") { preFunction = delegate { - RhythmCannery.CanSFX(eventCaller.currentEntity.beat); - if (GameManager.instance.currentGame == "rhythmCannery") { - RhythmCannery.instance.SendCan(eventCaller.currentEntity.beat); + Cannery.CanSFX(eventCaller.currentEntity.beat); + if (GameManager.instance.currentGame == "cannery") { + Cannery.instance.SendCan(eventCaller.currentEntity.beat); } }, defaultLength = 2, }, new GameAction("blackout", "Blackout") { - function = delegate { RhythmCannery.instance.Blackout(); }, + function = delegate { Cannery.instance.Blackout(); }, defaultLength = 0.5f, }, } @@ -50,8 +50,8 @@ namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games { using Jukebox; - using Scripts_RhythmCannery; - public class RhythmCannery : Minigame + using Scripts_Cannery; + public class Cannery : Minigame { [Header("Objects")] [SerializeField] GameObject canGO; @@ -65,7 +65,7 @@ namespace HeavenStudio.Games private bool alarmBop = true; - public static RhythmCannery instance; + public static Cannery instance; void Awake() { @@ -80,7 +80,7 @@ namespace HeavenStudio.Games public override void OnGameSwitch(double beat) { - List cans = GameManager.instance.Beatmap.Entities.FindAll(e => e.datamodel == "rhythmCannery/can" && beat > e.beat && beat < e.beat + 1); + List cans = GameManager.instance.Beatmap.Entities.FindAll(e => e.datamodel == "cannery/can" && beat > e.beat && beat < e.beat + 1); foreach (var can in cans) { SendCan(can.beat); } @@ -101,27 +101,25 @@ namespace HeavenStudio.Games public void Bop(double beat, float length, bool auto, bool bop) { alarmBop = auto; - if (!bop) return; - List actions = new(); - - for (int i = 0; i < length; i++) - { - actions.Add(new(beat + i, delegate { alarmAnim.DoScaledAnimationAsync("Bop", 0.5f); })); + if (bop) { + List actions = new(); + for (int i = 0; i < length; i++) { + actions.Add(new(beat + i, delegate { alarmAnim.DoScaledAnimationAsync("Bop", 0.5f); })); + } + if (actions.Count > 0) BeatAction.New(this, actions); } - - if (actions.Count > 0) BeatAction.New(this, actions); } public static void CanSFX(double beat) { - SoundByte.PlayOneShotGame("rhythmCannery/ding", beat); + SoundByte.PlayOneShotGame("cannery/ding", beat); } public void SendCan(double beat) { // dingAnim.DoScaledAnimationFromBeatAsync("Ding", 0.5f, beat); // do the ding animation on the beat - BeatAction.New(this, new() { new(beat, delegate { dingAnim.DoScaledAnimationAsync("Ding", 0.5f); }) }); + BeatAction.New(this, new() { new(beat, delegate { dingAnim.DoScaledAnimationFromBeatAsync("Ding", 0.5f, beat); }) }); Can newCan = Instantiate(canGO, transform).GetComponent(); newCan.startBeat = beat; diff --git a/Assets/Scripts/Games/RhythmCannery/RhythmCannery.cs.meta b/Assets/Scripts/Games/RhythmCannery/Cannery.cs.meta similarity index 100% rename from Assets/Scripts/Games/RhythmCannery/RhythmCannery.cs.meta rename to Assets/Scripts/Games/RhythmCannery/Cannery.cs.meta diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index 4214fcb27..d9d939183 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -343,8 +343,8 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbQuizShowLoader failed!"); } - Debug.Log("Running game loader MobRhythmCanneryLoader"); - game = MobRhythmCanneryLoader.AddGame(eventCaller); + Debug.Log("Running game loader MobCanneryLoader"); + game = MobCanneryLoader.AddGame(eventCaller); if (game != null) { eventCaller.minigames.Add(game.name, game); diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 7fb767f5b..6fe15e0af 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -17,7 +17,6 @@ MonoBehaviour: DenseViewWidthThreshold: 512 _disableAutoReloadInBackground: 0 ImportedScriptPaths: - - Assets/Scripts/Games/RhythmCannery/RhythmCannery.cs - Assets/Scripts/Games/RhythmCannery/Can.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []