diff --git a/.gitignore b/.gitignore index 2538b1d..34e00ad 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,9 @@ sysinfo.txt # Builds *.apk *.unitypackage +WebGL Builds/ # Crashlytics generated file crashlytics-build.properties + + diff --git a/Assets/Prefabs/FallingPlatform.prefab b/Assets/Prefabs/FallingPlatform.prefab index a9c9b89..416891d 100644 --- a/Assets/Prefabs/FallingPlatform.prefab +++ b/Assets/Prefabs/FallingPlatform.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 1833814130600389804} - component: {fileID: 1833814130600389805} - component: {fileID: 1833814130600389778} - m_Layer: 0 + m_Layer: 7 m_Name: FallingPlatform m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 222eb3c..607a50c 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -831,11 +831,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5190581337139155727, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} propertyPath: m_LocalPosition.y - value: 7.68 + value: 6.41 objectReference: {fileID: 0} - target: {fileID: 7864960021336866433, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} propertyPath: m_LocalPosition.y - value: -2.83 + value: -0.6799998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} @@ -7843,11 +7843,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5190581337139155727, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} propertyPath: m_LocalPosition.y - value: 7.68 + value: 6.41 objectReference: {fileID: 0} - target: {fileID: 7864960021336866433, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} propertyPath: m_LocalPosition.y - value: -2.83 + value: -0.68 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} @@ -11398,7 +11398,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: -5, y: 15, z: 0} second: serializedVersion: 2 @@ -11408,7 +11408,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 0, y: 15, z: 0} second: serializedVersion: 2 @@ -11418,7 +11418,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 1, y: 15, z: 0} second: serializedVersion: 2 @@ -11428,7 +11428,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 6, y: 15, z: 0} second: serializedVersion: 2 @@ -11438,7 +11438,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 7, y: 15, z: 0} second: serializedVersion: 2 @@ -11448,7 +11448,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 12, y: 15, z: 0} second: serializedVersion: 2 @@ -11458,7 +11458,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 13, y: 15, z: 0} second: serializedVersion: 2 @@ -11468,7 +11468,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 22, y: 15, z: 0} second: serializedVersion: 2 @@ -11498,7 +11498,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: -5, y: 16, z: 0} second: serializedVersion: 2 @@ -11508,7 +11508,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 0, y: 16, z: 0} second: serializedVersion: 2 @@ -11518,7 +11518,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 1, y: 16, z: 0} second: serializedVersion: 2 @@ -11528,7 +11528,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 6, y: 16, z: 0} second: serializedVersion: 2 @@ -11538,7 +11538,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 7, y: 16, z: 0} second: serializedVersion: 2 @@ -11548,7 +11548,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 12, y: 16, z: 0} second: serializedVersion: 2 @@ -11558,7 +11558,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 13, y: 16, z: 0} second: serializedVersion: 2 @@ -11568,7 +11568,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 1073741825 + m_AllTileFlags: 1 - first: {x: 22, y: 16, z: 0} second: serializedVersion: 2 @@ -13069,7 +13069,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 730012354306633943, guid: 837ba174af76b294bb44e419fdc55f47, type: 3} propertyPath: m_LocalPosition.x - value: 0.02 + value: 0.47 objectReference: {fileID: 0} - target: {fileID: 730012354306633943, guid: 837ba174af76b294bb44e419fdc55f47, type: 3} propertyPath: m_LocalPosition.y @@ -13170,11 +13170,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5190581337139155727, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} propertyPath: m_LocalPosition.y - value: 7.68 + value: 6.41 objectReference: {fileID: 0} - target: {fileID: 7864960021336866433, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} propertyPath: m_LocalPosition.y - value: -2.83 + value: -0.6799998 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a4d8d8e95ab87e247876822d754f0892, type: 3} @@ -13188,6 +13188,16 @@ Transform: m_CorrespondingSourceObject: {fileID: 730012354306633943, guid: 837ba174af76b294bb44e419fdc55f47, type: 3} m_PrefabInstance: {fileID: 1117275017} m_PrefabAsset: {fileID: 0} +--- !u!82 &1741420061 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 6575364946134080236, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} + m_PrefabInstance: {fileID: 8094648611497874216} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1741420062 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2878640595401550240, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} + m_PrefabInstance: {fileID: 8094648611497874216} + m_PrefabAsset: {fileID: 0} --- !u!4 &1749527435 stripped Transform: m_CorrespondingSourceObject: {fileID: 1833814130600389779, guid: 7623c8bcb28544145a3356c33415605a, type: 3} @@ -14260,7 +14270,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5652149614979273052, guid: af0b43c953433044ca5be0274eba0d4d, type: 3} propertyPath: m_LocalPosition.x - value: 19.52 + value: 19.97 objectReference: {fileID: 0} - target: {fileID: 5652149614979273052, guid: af0b43c953433044ca5be0274eba0d4d, type: 3} propertyPath: m_LocalPosition.y @@ -14604,6 +14614,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1681788726100815102, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} + propertyPath: hitSE + value: + objectReference: {fileID: 1741420061} + - target: {fileID: 1681788726100815102, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} + propertyPath: collectSE + value: + objectReference: {fileID: 1741420062} - target: {fileID: 2073490410276711899, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} propertyPath: endOfWorld value: @@ -14620,6 +14638,10 @@ PrefabInstance: propertyPath: lives.Array.data[2] value: objectReference: {fileID: 2928630} + - target: {fileID: 3358975323325292055, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8094648611850820017, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} propertyPath: m_Enabled value: 1 @@ -14634,7 +14656,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8094648611850820018, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} propertyPath: m_LocalPosition.y - value: -3.61 + value: -3.595 objectReference: {fileID: 0} - target: {fileID: 8094648611850820018, guid: 0cd7c20f246cfdb4babde40327268371, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index de5244c..9c06f92 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -163,7 +163,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x @@ -525,87 +525,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 108117647178914482, guid: 623352c5cf04cd54fbbbe93f7f7c9f22, type: 3} m_PrefabInstance: {fileID: 263045180} m_PrefabAsset: {fileID: 0} ---- !u!1001 &268714581 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1835323645} - m_Modifications: - - target: {fileID: 8016446885505399386, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.x - value: 27.19 - objectReference: {fileID: 0} - - target: {fileID: 8016446885505399386, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.y - value: 4.1 - objectReference: {fileID: 0} - - target: {fileID: 8016446885571835932, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.x - value: 27.15 - objectReference: {fileID: 0} - - target: {fileID: 8016446885571835932, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.y - value: 2.33 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200704, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_Name - value: MovingPlatform (5) - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.x - value: -25.82 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.y - value: -3.6633775 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.z - value: 0.13773136 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8016446886771707066, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.x - value: 27.08 - objectReference: {fileID: 0} - - target: {fileID: 8016446886771707066, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - propertyPath: m_LocalPosition.y - value: -1.79 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} --- !u!114 &294101516 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 518844327089167873, guid: af9e5e301096f0c43a5a1c03c7d30727, type: 3} @@ -800,6 +719,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 2.33 objectReference: {fileID: 0} + - target: {fileID: 8016446885571835935, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8016446886412200704, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_Name value: MovingPlatform (4) @@ -850,11 +773,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8016446886771707066, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x - value: 21.09 + value: 21.18 objectReference: {fileID: 0} - target: {fileID: 8016446886771707066, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.y - value: 2.37 + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} @@ -7718,7 +7641,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x @@ -8094,7 +8017,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8016446885505399386, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x - value: 9.07 + value: 9.16 objectReference: {fileID: 0} - target: {fileID: 8016446885505399386, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.y @@ -8102,7 +8025,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8016446885571835932, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x - value: 9.21 + value: 9.15 objectReference: {fileID: 0} - target: {fileID: 8016446885571835932, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.y @@ -8114,7 +8037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x @@ -8158,7 +8081,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8016446886771707066, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.x - value: 9.1 + value: 9.16 objectReference: {fileID: 0} - target: {fileID: 8016446886771707066, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} propertyPath: m_LocalPosition.y @@ -8166,11 +8089,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} ---- !u!4 &1634820894 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8016446886412200705, guid: 2a8d58dc18d76704bb3b30f9e535b654, type: 3} - m_PrefabInstance: {fileID: 268714581} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1804090649 PrefabInstance: m_ObjectHideFlags: 0 @@ -8389,7 +8307,6 @@ Transform: - {fileID: 440039347} - {fileID: 506360149} - {fileID: 892152371} - - {fileID: 1634820894} - {fileID: 498021584} - {fileID: 1920547048} - {fileID: 488881537} diff --git a/Assets/Script/Menu/Data.cs b/Assets/Script/Menu/Data.cs index f5bf415..f3940f8 100644 --- a/Assets/Script/Menu/Data.cs +++ b/Assets/Script/Menu/Data.cs @@ -7,13 +7,13 @@ public class Data : MonoBehaviour { private static int totalCollectDiamond = 0; private static int totalDiamond = 0; - private static float totalTime = 0; + private static int totalTime = 0; private static int totalScore = 0; private static int level = 0; private static int collectDiamond = 0; private static int allDiamond = 0; - private static float time = 0; + private static int time = 0; private static int score = 0; public static void AddData() @@ -21,18 +21,20 @@ public static void AddData() level = SceneManager.GetActiveScene().buildIndex - 2; allDiamond = Scoring.GetTotalDiamond(); collectDiamond = Scoring.GetDiamond(); - time = Time.timeSinceLevelLoad; + time = (int) Time.timeSinceLevelLoad; score = CalcScore(); totalCollectDiamond += collectDiamond; totalDiamond += allDiamond; totalTime += time; - totalScore += score; + totalScore += score; + + Scoring.ResetDiamond(); } - public static float[] GetLevelData() + public static int[] GetLevelData() { - float[] data = new float[5]; + int[] data = new int[5]; data[0] = level; data[1] = time; data[2] = collectDiamond; @@ -41,9 +43,9 @@ public static float[] GetLevelData() return data; } - public static float[] GetGameData() + public static int[] GetGameData() { - float[] data = new float[4]; + int[] data = new int[4]; data[0] = totalTime; data[1] = totalCollectDiamond; data[2] = totalDiamond; diff --git a/Assets/Script/Menu/EndGame.cs b/Assets/Script/Menu/EndGame.cs index f0c160e..1c2e5dc 100644 --- a/Assets/Script/Menu/EndGame.cs +++ b/Assets/Script/Menu/EndGame.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using System; using UnityEngine; using UnityEngine.UI; @@ -14,9 +13,9 @@ public class EndGame : MonoBehaviour void Start() { endSE.Play(); - float[] data = Data.GetGameData(); + int[] data = Data.GetGameData(); - time.text = "TIME: " + (int) (data[0] / 60) + ":" + Math.Round(data[0] % 60, 2); + time.text = "TIME: " + (int) (data[0] / 60) + ":" + data[0] % 60; diamond.text = "DIAMOND: " + data[1] + "/" + data[2]; score.text = "SCORE: " + data[3]; } diff --git a/Assets/Script/Menu/EndLevel.cs b/Assets/Script/Menu/EndLevel.cs index 59d5863..5e3776b 100644 --- a/Assets/Script/Menu/EndLevel.cs +++ b/Assets/Script/Menu/EndLevel.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using System; using UnityEngine; using UnityEngine.UI; @@ -21,10 +20,10 @@ void Start() { endLvSE.Play(); - float[] data = Data.GetLevelData(); + int[] data = Data.GetLevelData(); level.text = "YOU HAVE COMPLETED LEVEL " + data[0]; //[(int) fields.level]; - time.text = "TIME: " + (int) (data[1] / 60) + ":" + Math.Round(data[1] % 60, 2); + time.text = "TIME: " + (int) (data[1] / 60) + ":" + data[1] % 60; diamond.text = "DIAMOND: " + data[2] + "/" + data[3]; score.text = "SCORE: " + data[4]; } diff --git a/Assets/Script/Player/Scoring.cs b/Assets/Script/Player/Scoring.cs index d923028..7025348 100644 --- a/Assets/Script/Player/Scoring.cs +++ b/Assets/Script/Player/Scoring.cs @@ -4,8 +4,8 @@ public class Scoring : MonoBehaviour { - private static int diamondCount; - private static int totalDiamond; + private static int diamondCount = 0; + private static int totalDiamond = 0; [SerializeField] private AudioSource collectSE; @@ -20,17 +20,12 @@ private void OnTriggerEnter2D(Collider2D collider) { collectSE.Play(); diamondCount++; - Debug.Log("Diamonds: " + diamondCount); + //Debug.Log("Diamonds: " + diamondCount); Destroy(collider.gameObject); - Debug.Log("Time: " + Time.timeSinceLevelLoad); + //Debug.Log("Time: " + Time.timeSinceLevelLoad); } } - private int CalcScore() - { - return 100 + diamondCount * 10 + (int) Time.timeSinceLevelLoad / 100; - } - public static int GetDiamond() { return diamondCount; @@ -40,4 +35,9 @@ public static int GetTotalDiamond() { return totalDiamond; } + + public static void ResetDiamond() + { + diamondCount = 0; + } } diff --git a/Assets/Sprites/Pink Man/Idle (32x32).png.meta b/Assets/Sprites/Pink Man/Idle (32x32).png.meta index 599c3b0..7ea10b1 100644 --- a/Assets/Sprites/Pink Man/Idle (32x32).png.meta +++ b/Assets/Sprites/Pink Man/Idle (32x32).png.meta @@ -101,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + 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: @@ -113,7 +125,7 @@ TextureImporter: width: 21 height: 25 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -134,7 +146,7 @@ TextureImporter: width: 21 height: 25 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -155,7 +167,7 @@ TextureImporter: width: 21 height: 25 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -176,7 +188,7 @@ TextureImporter: width: 21 height: 26 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -197,7 +209,7 @@ TextureImporter: width: 21 height: 26 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -218,7 +230,7 @@ TextureImporter: width: 21 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -239,7 +251,7 @@ TextureImporter: width: 21 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -260,7 +272,7 @@ TextureImporter: width: 21 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -281,7 +293,7 @@ TextureImporter: width: 21 height: 27 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -302,7 +314,7 @@ TextureImporter: width: 21 height: 26 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -323,7 +335,7 @@ TextureImporter: width: 21 height: 26 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Sprites/Thumbnail.png b/Assets/Sprites/Thumbnail.png new file mode 100644 index 0000000..fa9272c Binary files /dev/null and b/Assets/Sprites/Thumbnail.png differ diff --git a/Assets/Sprites/Thumbnail.png.meta b/Assets/Sprites/Thumbnail.png.meta new file mode 100644 index 0000000..3050190 --- /dev/null +++ b/Assets/Sprites/Thumbnail.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 240a3198543bf414f8f29fde0b7509c1 +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 + - serializedVersion: 3 + buildTarget: WebGL + 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: + assetBundleVariant: diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_11.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_11.asset index 8a81f50..888d207 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_11.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_11.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_12.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_12.asset index 9054ea8..3b1f1d3 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_12.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_12.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_13.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_13.asset index a1d52b1..e399fa1 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_13.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_13.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_14.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_14.asset index d017636..660c4f7 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_14.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_14.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_16.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_16.asset index 3e7ff80..c34b8ff 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_16.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_16.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_17.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_17.asset index d4aca29..a2e416a 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_17.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_17.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_18.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_18.asset index 84cd921..2db8d90 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_18.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_18.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Assets/TilePaletes/Decor/Decorations (32x32)_19.asset b/Assets/TilePaletes/Decor/Decorations (32x32)_19.asset index acc73ad..da7c220 100644 --- a/Assets/TilePaletes/Decor/Decorations (32x32)_19.asset +++ b/Assets/TilePaletes/Decor/Decorations (32x32)_19.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index b2f01d0..44eba2c 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.unity.collab-proxy": "1.17.2", + "com.unity.connect.share": "4.2.3", "com.unity.feature.2d": "1.0.0", "com.unity.ide.rider": "3.0.15", "com.unity.ide.visualstudio": "2.0.16", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3f21d79..32ee91e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -103,6 +103,23 @@ }, "url": "https://packages.unity.com" }, + "com.unity.connect.share": { + "version": "4.2.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.editorcoroutines": "1.0.0", + "com.unity.settings-manager": "1.0.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.editorcoroutines": { + "version": "1.0.0", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { "version": "1.0.6", "depth": 1, @@ -174,6 +191,13 @@ }, "url": "https://packages.unity.com" }, + "com.unity.settings-manager": { + "version": "1.0.3", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, diff --git a/ProjectSettings/BurstAotSettings_WebGL.json b/ProjectSettings/BurstAotSettings_WebGL.json new file mode 100644 index 0000000..771d37b --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WebGL.json @@ -0,0 +1,14 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..0293daf --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/Packages/com.unity.connect.share/Settings.json b/ProjectSettings/Packages/com.unity.connect.share/Settings.json new file mode 100644 index 0000000..c501334 --- /dev/null +++ b/ProjectSettings/Packages/com.unity.connect.share/Settings.json @@ -0,0 +1,28 @@ +{ + "m_Name": "Settings", + "m_Path": "ProjectSettings/Packages/com.unity.connect.share/Settings.json", + "m_Dictionary": { + "m_DictionaryValues": [ + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "buildOutputDirList", + "value": "{\"m_Value\":\"E:/Microsoft Visual Studio/Repositories/2DPlatformer/Builds/v1.0.1;E:/Microsoft Visual Studio/Repositories/2DPlatformer/Builds;E:/Microsoft Visual Studio/Repositories/2DPlatformer/Build/ExplorePlatformer;;;;;;;\"}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "firstTime", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "autoPublish", + "value": "{\"m_Value\":false}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "createDefaultBuildsFolder", + "value": "{\"m_Value\":true}" + } + ] + } +} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 183c969..7c81533 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: 2DPlatformer + companyName: Qwekem482 + productName: Explore Platformer defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -269,7 +269,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: b33c608ce5244e34d8844c34749a7782, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 31ee339..433b283 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,19 +9,19 @@ EditorUserSettings: value: 5b0005525c06590f5e5a087616200744414e4b792d2c72317e794460b4b1323d flags: 0 RecentlyUsedSceneGuid-1: - value: 5603050551015a0354585e7b46770e444e161a297f2c70322e704e60e0e2613c + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-2: - value: 0000515057560b5e5e5959764021064417151b28282d24602e2d4c31bbe2353a + value: 5603050551015a0354585e7b46770e444e161a297f2c70322e704e60e0e2613c flags: 0 RecentlyUsedSceneGuid-3: value: 0103060752045b0d5c0f0f7b49250a4442161a73297c2561797c4a6be6e26668 flags: 0 RecentlyUsedSceneGuid-4: - value: 0700560453000a0e555f087b46215a44404f4b2c2d797232747e1e30b3e5326c + value: 0000515057560b5e5e5959764021064417151b28282d24602e2d4c31bbe2353a flags: 0 RecentlyUsedSceneGuid-5: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 0700560453000a0e555f087b46215a44404f4b2c2d797232747e1e30b3e5326c flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index c2cb7eb..8ecd2f2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -120,7 +120,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 99 + controlID: 21 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 100 + controlID: 22 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -237,7 +237,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GridPaintPaletteWindow + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -246,14 +246,14 @@ MonoBehaviour: y: 0 width: 281.59998 height: 722.8 - m_MinSize: {x: 241, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 18} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -295,22 +295,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: E:\Microsoft Visual Studio\Repositories\2DPlatformer m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: f0640000 - m_LastClickedID: 25840 - m_ExpandedIDs: 00000000b4640000b6640000b8640000ba640000bc640000be640000c0640000c2640000c4640000c6640000c8640000ca640000cc640000ce640000d0640000d2640000d4640000d6640000d8640000da640000dc640000de640000e0640000e2640000e4640000f06400002a6700004867000068b5000000ca9a3b + scrollPos: {x: 0, y: 123.80002} + m_SelectedIDs: 12660000 + m_LastClickedID: 26130 + m_ExpandedIDs: 00000000426500004465000046650000486500004a6500004c6500004e65000050650000526500005465000056650000586500005a6500005c6500005e65000060650000626500006465000066650000686500006a6500006c6500006e6500007065000072650000746500007665000078650000f265000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -338,7 +338,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b4640000b6640000b8640000ba640000bc640000be640000c0640000c2640000c4640000c6640000c8640000ca640000cc640000ce640000d0640000d2640000d4640000d6640000d8640000da640000dc640000de640000e0640000e2640000e4640000 + m_ExpandedIDs: 00000000426500004465000046650000486500004a6500004c6500004e65000050650000526500005465000056650000586500005a6500005c6500005e65000060650000626500006465000066650000686500006a6500006c6500006e6500007065000072650000746500007665000078650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -366,7 +366,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c62300000a850000088900000e89000040600000aa620000f6680000de70000046630000d2600000ee610000be600000226400002865000044650000f667000038640000a66500004c610000f86400004c650000486500004464000020710000d26c000086760000867e00009e62000010660000126600002c660000a4620000086800006c620000a6620000 + m_ExpandedInstanceIDs: c62300000a850000088900000e89000040600000aa620000f6680000de70000046630000d2600000ee610000be600000226400002865000044650000f667000038640000a66500004c610000f86400004c650000486500004464000020710000d26c000086760000867e00009e62000010660000126600002c660000a4620000086800006c620000a6620000646300002a630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -425,9 +425,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0e650000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 94a3faff66a4faffe8a5faffcca6faffc0a7faffdeacfaffdab0faffa8b2faff22b3faff7cb4faff5ce6faff08f6faffd6f9fafff0fcfaffea03fbff6c0ffbff5a16fbff901afbff6e1ffbff7e22fbff8429fbff0c38fbff1e3efbffd4f2fbfff6fafbffa6fdfbff1e6efcffe628fffff028ffff5229ffff66f4ffff28f5ffff32f5ffffacf5ffff2cfbffff007c00000a7c0000aa7c0000cc7c0000b67d0000c07d0000dc7d0000ca8b0000888e0000ae8e0000409f00009ea50000c4a5000034ac0000daac000060ad0000ecb3000016b40000c0dc000092dd0000fadd000086eb0000b2eb0000 + m_ExpandedIDs: 5ac0ffffa4c0ffffdac3ffffdac6ffffe4c6ffffeec6fffff6c6ffffbccdffff86cfffff12d0ffff8ad6ffff7edbffffc8dbffff1ae2ffff2ae5ffff98e6ffff7cf8ffff40f9ffff4afaffffc8faffff2cfbffff4e60000056600000886000008c600000b4600000fa6000003e610000546100005a6100001aa9000036a900007aa90000a8a9000058b3000084b30000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -714,7 +714,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -731,9 +731,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 7.1329823, y: 8.811684, z: -0.17434768} + m_Target: {x: -4.463712, y: 0.83170784, z: -0.11391944} speed: 2 - m_Value: {x: 7.734233, y: 8.783052, z: -0.18309796} + m_Value: {x: -4.463712, y: 0.83170784, z: -0.11391944} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -784,9 +784,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 18.570171 + m_Target: 12.527206 speed: 2 - m_Value: 19.445206 + m_Value: 12.527206 m_Ortho: m_Target: 1 speed: 2 diff --git a/connectwebgl.zip b/connectwebgl.zip new file mode 100644 index 0000000..71e5c38 Binary files /dev/null and b/connectwebgl.zip differ diff --git a/webgl_sharing b/webgl_sharing new file mode 100644 index 0000000..5f8271a --- /dev/null +++ b/webgl_sharing @@ -0,0 +1 @@ +63837e6b14e80700aa68e95e \ No newline at end of file