diff --git a/Assets/PipeOut/Scenes/GameScene.unity b/Assets/PipeOut/Scenes/GameScene.unity index 2f129bb9..d467a79e 100644 --- a/Assets/PipeOut/Scenes/GameScene.unity +++ b/Assets/PipeOut/Scenes/GameScene.unity @@ -5183,11 +5183,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 834928116} + - {fileID: 6478038345936381209} + - {fileID: 1953711052075367253} m_Father: {fileID: 1790415148045805089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.120000005} m_AnchorMax: {x: 1, y: 0.901} - m_AnchoredPosition: {x: 0, y: -0.28997803} + m_AnchoredPosition: {x: 0, y: -0.29003906} m_SizeDelta: {x: 0, y: 0.1800003} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1323667008 @@ -5210,7 +5212,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: decb2f9229d5a6d41a6daa15c4470487, type: 3} + m_Sprite: {fileID: 21300000, guid: fdc62eed4926a7949aafdfab5ab293d3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5627,6 +5629,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1370581833} m_CullTransparentMesh: 1 +--- !u!1 &1382163228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1382163229} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1382163229 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382163228} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1790415148045805106} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1405148875 GameObject: m_ObjectHideFlags: 0 @@ -9129,8 +9166,23 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1323667007} m_Modifications: + - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, + type: 3} + propertyPath: m_LocalScale.x + value: 192 + objectReference: {fileID: 0} + - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, + type: 3} + propertyPath: m_LocalScale.y + value: 192 + objectReference: {fileID: 0} + - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, + type: 3} + propertyPath: m_LocalScale.z + value: 192 + objectReference: {fileID: 0} - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} propertyPath: m_LocalPosition.x @@ -9139,12 +9191,12 @@ PrefabInstance: - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} propertyPath: m_LocalPosition.y - value: -5.67 + value: -1108.51 objectReference: {fileID: 0} - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -17280 objectReference: {fileID: 0} - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} @@ -9154,17 +9206,17 @@ PrefabInstance: - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, type: 3} @@ -16887,13 +16939,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1382163229} m_Father: {fileID: 1790415148045805089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 55} - m_SizeDelta: {x: 650, y: 850} + m_SizeDelta: {x: 658, y: 844} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1790415148045805107 RectTransform: @@ -19229,14 +19282,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.24705882} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: decb2f9229d5a6d41a6daa15c4470487, type: 3} + m_Sprite: {fileID: 21300000, guid: ecc225411c44d814bbb5d4a97e19eeb0, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -19324,7 +19377,8 @@ MonoBehaviour: nextBtn: {fileID: 1790415148045805238} closeBtn: {fileID: 0} fillBar: {fileID: 1790415148045805259} - _levelContainer: {fileID: 1790415148045805106} + _levelContainer: {fileID: 1382163229} + _levelContainerBG: {fileID: 1790415148045805106} _space: 0 levelGroups: - {fileID: 11400000, guid: 3cdd9d8df70f43d5ae2246b73451a8bf, type: 2} @@ -21450,6 +21504,12 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Red + Blue + Yellow = Brown +--- !u!4 &1953711052075367253 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5412593845924519996, guid: 42c597428e933b6459d47d1d9ac7d933, + type: 3} + m_PrefabInstance: {fileID: 467508691553497673} + m_PrefabAsset: {fileID: 0} --- !u!198 &2515549542382150864 ParticleSystem: m_ObjectHideFlags: 0 @@ -40975,6 +41035,12 @@ Transform: - {fileID: 867399617953754666} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &6478038345936381209 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, + type: 3} + m_PrefabInstance: {fileID: 6825969688944082722} + m_PrefabAsset: {fileID: 0} --- !u!199 &6717151402963816951 ParticleSystemRenderer: serializedVersion: 6 @@ -41055,7 +41121,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1323667007} m_Modifications: - target: {fileID: 399311634534860263, guid: 3627893f9a824364e96f6e199e719418, type: 3} @@ -41067,6 +41133,21 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, + type: 3} + propertyPath: m_LocalScale.x + value: 192 + objectReference: {fileID: 0} + - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, + type: 3} + propertyPath: m_LocalScale.y + value: 192 + objectReference: {fileID: 0} + - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, + type: 3} + propertyPath: m_LocalScale.z + value: 192 + objectReference: {fileID: 0} - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} propertyPath: m_LocalPosition.x @@ -41075,12 +41156,12 @@ PrefabInstance: - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} propertyPath: m_LocalPosition.y - value: -5.11 + value: -1000.99005 objectReference: {fileID: 0} - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -17280 objectReference: {fileID: 0} - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} @@ -41090,17 +41171,17 @@ PrefabInstance: - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7541856265273969928, guid: 3627893f9a824364e96f6e199e719418, type: 3} @@ -65689,5 +65770,3 @@ SceneRoots: - {fileID: 1790415148045805089} - {fileID: 1792444503} - {fileID: 8043470881097534659} - - {fileID: 6825969688944082722} - - {fileID: 467508691553497673} diff --git a/Assets/Scripts/GamePlayManager.cs b/Assets/Scripts/GamePlayManager.cs index 23a0b7c0..cd76147c 100644 --- a/Assets/Scripts/GamePlayManager.cs +++ b/Assets/Scripts/GamePlayManager.cs @@ -32,6 +32,7 @@ public class GamePlayManager : MonoBehaviour [Header("Layout Setting")] public RectTransform _levelContainer; + public RectTransform _levelContainerBG; public float _space; @@ -91,8 +92,8 @@ public class GamePlayManager : MonoBehaviour private void Start() { rootCanvas = base.transform.parent.GetComponent(); - _levelContainerMaxHeight = _levelContainer.rect.height; - _levelContainerPosition = _levelContainer.localPosition; + _levelContainerMaxHeight = _levelContainerBG.rect.height; + _levelContainerPosition = _levelContainerBG.localPosition; SetupLevel(); } @@ -123,11 +124,11 @@ public class GamePlayManager : MonoBehaviour float maxCellSize = GameManager.currentLevel.maxCellSize; startTime = Time.time; undoList = new List(); - _levelContainer.sizeDelta = new Vector2(rootCanvas.rect.width, _levelContainerMaxHeight); - float a = Mathf.Min(_levelContainer.rect.width / (float)column, _levelContainer.rect.height / (float)row); + _levelContainerBG.sizeDelta = new Vector2(rootCanvas.rect.width, _levelContainerMaxHeight); + float a = Mathf.Min(_levelContainerBG.rect.width / (float)column, _levelContainerBG.rect.height / (float)row); a = Mathf.Min(a, maxCellSize); - _levelContainer.sizeDelta = new Vector2((float)column * a, (float)row * a); - _levelContainer.transform.localPosition = _levelContainerPosition + GameManager.currentLevel.levelContainerDelta * a; + _levelContainerBG.sizeDelta = new Vector2((float)column * a, (float)row * a); + _levelContainerBG.transform.localPosition = _levelContainerPosition + GameManager.currentLevel.levelContainerDelta * a; for (int num = _levelContainer.childCount - 1; num >= 0; num--) { UnityEngine.Object.Destroy(_levelContainer.GetChild(num).gameObject); diff --git a/Assets/bg 3.meta b/Assets/bg 3.meta new file mode 100644 index 00000000..74421fc1 --- /dev/null +++ b/Assets/bg 3.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bcfaccbad73a9fc40ace15e2a5d904e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/bg 3/Boxx.png b/Assets/bg 3/Boxx.png new file mode 100644 index 00000000..b176dadb Binary files /dev/null and b/Assets/bg 3/Boxx.png differ diff --git a/Assets/bg 3/Boxx.png.meta b/Assets/bg 3/Boxx.png.meta new file mode 100644 index 00000000..bd55228d --- /dev/null +++ b/Assets/bg 3/Boxx.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 853b549040032464d9d8af6b6438ba75 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/bg 3/OBJECTS.png b/Assets/bg 3/OBJECTS.png new file mode 100644 index 00000000..10681f1c Binary files /dev/null and b/Assets/bg 3/OBJECTS.png differ diff --git a/Assets/bg 3/OBJECTS.png.meta b/Assets/bg 3/OBJECTS.png.meta new file mode 100644 index 00000000..e6a6756d --- /dev/null +++ b/Assets/bg 3/OBJECTS.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 774acd93f8b53524bbad2bdae37757b1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/bg 3/Rounded box.png b/Assets/bg 3/Rounded box.png new file mode 100644 index 00000000..86ded397 Binary files /dev/null and b/Assets/bg 3/Rounded box.png differ diff --git a/Assets/bg 3/Rounded box.png.meta b/Assets/bg 3/Rounded box.png.meta new file mode 100644 index 00000000..a42f57e7 --- /dev/null +++ b/Assets/bg 3/Rounded box.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: c49b0ed857e31d04cbe1d9f90fd9ccc6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/bg 3/bg 7.png b/Assets/bg 3/bg 7.png new file mode 100644 index 00000000..d191e3c3 Binary files /dev/null and b/Assets/bg 3/bg 7.png differ diff --git a/Assets/bg 3/bg 7.png.meta b/Assets/bg 3/bg 7.png.meta new file mode 100644 index 00000000..2fa96a4f --- /dev/null +++ b/Assets/bg 3/bg 7.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: fdc62eed4926a7949aafdfab5ab293d3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/bg 3/bg box.png b/Assets/bg 3/bg box.png new file mode 100644 index 00000000..df4e0a4f Binary files /dev/null and b/Assets/bg 3/bg box.png differ diff --git a/Assets/bg 3/bg box.png.meta b/Assets/bg 3/bg box.png.meta new file mode 100644 index 00000000..a82aa9aa --- /dev/null +++ b/Assets/bg 3/bg box.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 131ee19ed424def4797d7c340e30e394 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/bg 3/square box.png b/Assets/bg 3/square box.png new file mode 100644 index 00000000..8c1228bd Binary files /dev/null and b/Assets/bg 3/square box.png differ diff --git a/Assets/bg 3/square box.png.meta b/Assets/bg 3/square box.png.meta new file mode 100644 index 00000000..f994726e --- /dev/null +++ b/Assets/bg 3/square box.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: ecc225411c44d814bbb5d4a97e19eeb0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index f46f893f..69e611e0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,6 +6,7 @@ "com.unity.ide.vscode": "1.2.5", "com.unity.mobile.android-logcat": "1.4.3", "com.unity.purchasing": "4.12.2", + "com.unity.recorder": "4.0.3", "com.unity.textmeshpro": "3.0.9", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index cd887aec..f2e283c4 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -65,6 +65,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.recorder": { + "version": "4.0.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.timeline": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.services.core": { "version": "1.12.5", "depth": 1, @@ -96,6 +105,18 @@ }, "url": "https://packages.unity.com" }, + "com.unity.timeline": { + "version": "1.7.6", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 1,