diff --git a/Assets/Resources/Games/blueBear.prefab.meta b/Assets/Resources/Games/blueBear.prefab.meta index 5a2a78716..7fe8179db 100644 --- a/Assets/Resources/Games/blueBear.prefab.meta +++ b/Assets/Resources/Games/blueBear.prefab.meta @@ -3,5 +3,5 @@ guid: 5f112a878df4b2649ab1d49b2d1e4c29 PrefabImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/blueBear/cake.ogg.meta b/Assets/Resources/Sfx/games/blueBear/cake.ogg.meta index 4605ada0c..9b46f662c 100644 --- a/Assets/Resources/Sfx/games/blueBear/cake.ogg.meta +++ b/Assets/Resources/Sfx/games/blueBear/cake.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/blueBear/chompCake.ogg.meta b/Assets/Resources/Sfx/games/blueBear/chompCake.ogg.meta index 92ef168ac..b224b7064 100644 --- a/Assets/Resources/Sfx/games/blueBear/chompCake.ogg.meta +++ b/Assets/Resources/Sfx/games/blueBear/chompCake.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/blueBear/chompDonut.ogg.meta b/Assets/Resources/Sfx/games/blueBear/chompDonut.ogg.meta index 7f89ef545..ddb245c01 100644 --- a/Assets/Resources/Sfx/games/blueBear/chompDonut.ogg.meta +++ b/Assets/Resources/Sfx/games/blueBear/chompDonut.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/blueBear/donut.ogg.meta b/Assets/Resources/Sfx/games/blueBear/donut.ogg.meta index 83b77b61f..0c5ca3358 100644 --- a/Assets/Resources/Sfx/games/blueBear/donut.ogg.meta +++ b/Assets/Resources/Sfx/games/blueBear/donut.ogg.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/Animations.meta b/Assets/Resources/Sprites/Games/BlueBear/Animations.meta index 07dc442fe..1e5725ccf 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/Animations.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/Materials.meta b/Assets/Resources/Sprites/Games/BlueBear/Materials.meta index 752b5f7f8..4924430a4 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/Materials.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/Materials.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/bear.png.meta b/Assets/Resources/Sprites/Games/BlueBear/bear.png.meta index da42f1485..4dc65bc96 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/bear.png.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/bear.png.meta @@ -2356,5 +2356,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/crumb_16x16.png.meta b/Assets/Resources/Sprites/Games/BlueBear/crumb_16x16.png.meta index 0c8029873..d76b6d467 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/crumb_16x16.png.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/crumb_16x16.png.meta @@ -3,7 +3,7 @@ guid: dc806439d4308e1448932d7c3332c1be TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,30 @@ TextureImporter: 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: [] @@ -88,9 +114,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/crumb_32x32.png.meta b/Assets/Resources/Sprites/Games/BlueBear/crumb_32x32.png.meta index da20fd030..4a11b7ac9 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/crumb_32x32.png.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/crumb_32x32.png.meta @@ -3,7 +3,7 @@ guid: d687bebfacdf858459b003f0fe65b2d6 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,18 @@ TextureImporter: 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: [] @@ -100,9 +114,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/crumb_8x8.png.meta b/Assets/Resources/Sprites/Games/BlueBear/crumb_8x8.png.meta index 47b9d7432..525068f32 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/crumb_8x8.png.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/crumb_8x8.png.meta @@ -3,7 +3,7 @@ guid: 85b66facaeeedb54f94e941da1015edd TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,30 @@ TextureImporter: 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: [] @@ -88,9 +114,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/BlueBear/story.png.meta b/Assets/Resources/Sprites/Games/BlueBear/story.png.meta index 190cf4805..75e2fe8c6 100644 --- a/Assets/Resources/Sprites/Games/BlueBear/story.png.meta +++ b/Assets/Resources/Sprites/Games/BlueBear/story.png.meta @@ -869,5 +869,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ctrbear/common assetBundleVariant: diff --git a/Assets/Scripts/Games/BlueBear/BlueBear.cs b/Assets/Scripts/Games/BlueBear/BlueBear.cs index 0987098bd..f5e544a99 100644 --- a/Assets/Scripts/Games/BlueBear/BlueBear.cs +++ b/Assets/Scripts/Games/BlueBear/BlueBear.cs @@ -48,7 +48,11 @@ namespace HeavenStudio.Games.Loaders new Param("reset", false, "Reset Treats Eaten", "Should the numbers of treats eaten be reset?") } } - }); + }, + new List() {"ctr", "normal"}, + "ctrbear", "en", + new List() {} + ); } } } diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 01edfd5cb..f7cf5ca0b 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index a80dba55b..e92ade7e9 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1414304974 +CRC: 2931657449 AssetBundleManifest: AssetBundleInfos: Info_0: @@ -65,3 +65,6 @@ AssetBundleManifest: Info_20: Name: rvlbadminton/locale.en Dependencies: {} + Info_21: + Name: ctrbear/common + Dependencies: {} diff --git a/Assets/StreamingAssets/ctrbear/common b/Assets/StreamingAssets/ctrbear/common new file mode 100644 index 000000000..5ead48815 Binary files /dev/null and b/Assets/StreamingAssets/ctrbear/common differ diff --git a/Assets/StreamingAssets/ctrbear/common.manifest b/Assets/StreamingAssets/ctrbear/common.manifest new file mode 100644 index 000000000..e44c39ec2 --- /dev/null +++ b/Assets/StreamingAssets/ctrbear/common.manifest @@ -0,0 +1,101 @@ +ManifestFileVersion: 0 +CRC: 3248289930 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: 6510c8d33668744fc46c0f87797e55bf + TypeTreeHash: + serializedVersion: 2 + Hash: d644181980f918186081c0bac0c321f4 +HashAppended: 0 +ClassTypes: +- Class: 1 + Script: {instanceID: 0} +- Class: 4 + Script: {instanceID: 0} +- Class: 21 + Script: {instanceID: 0} +- Class: 28 + Script: {instanceID: 0} +- Class: 48 + Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 83 + Script: {instanceID: 0} +- Class: 91 + Script: {instanceID: 0} +- Class: 95 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: f7dae340f4a85ba44ab2f8cfd4429430, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: aed0e700f9c7b1a4ab7209b8117d78ce, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} +- Class: 115 + Script: {instanceID: 0} +- Class: 198 + Script: {instanceID: 0} +- Class: 199 + Script: {instanceID: 0} +- Class: 212 + Script: {instanceID: 0} +- Class: 213 + Script: {instanceID: 0} +SerializeReferenceClassIdentifiers: [] +Assets: +- Assets/Resources/Sprites/Games/BlueBear/Materials/BlueBearCrumb.shader +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/Smile.anim +- Assets/Resources/Games/blueBear.prefab +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/BiteR.anim +- Assets/Resources/Sfx/games/blueBear/chompDonut.ogg +- Assets/Resources/Sprites/Games/BlueBear/Animations/donutCrumb_0.controller +- Assets/Resources/Sfx/games/blueBear/chompCake.ogg +- Assets/Resources/Sprites/Games/BlueBear/Animations/BackgroundScene.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/Crumbs.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/ThoughtBubbleIdle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/CryIdle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Wind.controller +- Assets/Resources/Sprites/Games/BlueBear/Materials/BlueBearCrumb.mat +- Assets/Resources/Sfx/games/blueBear/donut.ogg +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/DonutIdle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/OpenEyes.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/BagHolder.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/BackgroundIdle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/StopSmile.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/NoCrumbs.anim +- Assets/Resources/Sprites/Games/BlueBear/crumb_8x8.png +- Assets/Resources/Sprites/Games/BlueBear/Animations/ThoughtBubble 1.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/NoWind.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/Squashing.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/HeadAndBody.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/CryBiteL.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/Open.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/ThoughtBubble.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/donutCrumb_1.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/Crumb0Idle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/CakeSquash.anim +- Assets/Resources/Sprites/Games/BlueBear/story.png +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/DonutBag.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/Sigh.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/Idle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/CakeIdle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Crumb1Idle.anim +- Assets/Resources/Sprites/Games/BlueBear/bear.png +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/CakeBag.controller +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/DonutSquash.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/EyesClosed.anim +- Assets/Resources/Sprites/Games/BlueBear/crumb_32x32.png +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/CryBiteR.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/Sad.anim +- Assets/Resources/Sprites/Games/BlueBear/crumb_16x16.png +- Assets/Resources/Sprites/Games/BlueBear/Animations/Wind.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/Bags/Idle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/BiteL.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/SmileIdle.anim +- Assets/Resources/Sprites/Games/BlueBear/Animations/HeadAndBody/CryOpen.anim +- Assets/Resources/Sfx/games/blueBear/cake.ogg +Dependencies: []