Beta Push

aps16104 · Apr 24, 2020 · 9461181 · 9461181
1 parent 1db3eb7
commit 9461181
Show file tree

Hide file tree

Showing 7 changed files with 164 additions and 41 deletions.
diff --git a/Platformer/Assets/_Scenes/Level1.unity b/Platformer/Assets/_Scenes/Level1.unity
@@ -29390,12 +29390,18 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 150613137}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 25.249998, y: 12.413751, z: 0.296875}
+  m_LocalPosition: {x: 42.121193, y: 10.485781, z: 0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 717023031}
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  - {fileID: 1314944962}
+  - {fileID: 523490372}
+  - {fileID: 633221479}
+  - {fileID: 997109491}
+  - {fileID: 1160195494}
+  - {fileID: 1932737961}
+  m_Father: {fileID: 853161814}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &155624896
 GameObject:
@@ -33318,11 +33324,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 523490370}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 22.929998, y: 5.0779696, z: 0.28108972}
+  m_LocalPosition: {x: -2.3199997, y: -7.335781, z: -0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_Father: {fileID: 150613138}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &530177640
 GameObject:
@@ -33368,7 +33374,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 17.272545, y: 2.591804}
+  m_Offset: {x: 12.293855, y: 2.591804}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -33379,7 +33385,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 40.165863, y: 1.1772137}
+  m_Size: {x: 50.123245, y: 1.1772137}
   m_EdgeRadius: 0
 --- !u!1 &541002905
 GameObject:
@@ -35006,11 +35012,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 633221477}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 22.929998, y: 5.0779696, z: 0.28108972}
+  m_LocalPosition: {x: -2.3199997, y: -7.335781, z: -0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_Father: {fileID: 150613138}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &636803780
 GameObject:
@@ -37052,7 +37058,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 828031802}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -37, y: 8.740001, z: -0.296875}
+  m_LocalPosition: {x: -34.81, y: 8.8, z: -0.296875}
   m_LocalScale: {x: 8.485129, y: 4.39641, z: 1}
   m_Children:
   - {fileID: 731693004}
@@ -37686,6 +37692,63 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &851398743
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 851398744}
+  - component: {fileID: 851398745}
+  m_Layer: 9
+  m_Name: Wall Left (1)
+  m_TagString: Wall
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &851398744
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 851398743}
+  m_LocalRotation: {x: 0, y: 0, z: 0.51136804, w: 0.8593619}
+  m_LocalPosition: {x: -3.1, y: -2.3, z: -0.015785277}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2110214022}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 61.51}
+--- !u!61 &851398745
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 851398743}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 4.9834676, y: 7.2576275}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.21729946, y: 4.8097687}
+  m_EdgeRadius: 0
 --- !u!1 &853161813
 GameObject:
   m_ObjectHideFlags: 0
@@ -37717,6 +37780,7 @@ Transform:
   - {fileID: 460839038}
   - {fileID: 1461942044}
   - {fileID: 183972208}
+  - {fileID: 150613138}
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -38850,11 +38914,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 997109489}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 22.929998, y: 5.0779696, z: 0.28108972}
+  m_LocalPosition: {x: -2.3199997, y: -7.335781, z: -0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_Father: {fileID: 150613138}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1000345396
 GameObject:
@@ -39158,7 +39222,7 @@ BoxCollider2D:
   m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0.030389547, y: 0.77646565}
+  m_Offset: {x: -0.4189734, y: 0.83063006}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -39169,7 +39233,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 2.69768, y: 1.695297}
+  m_Size: {x: 0.67554665, y: 1.8036258}
   m_EdgeRadius: 0
 --- !u!58 &1020019886
 CircleCollider2D:
@@ -61328,8 +61392,53 @@ Tilemap:
       m_ColliderType: 1
   - first: {x: 15, y: 17, z: 0}
     second:
-      m_TileIndex: 29
-      m_TileSpriteIndex: 25
+      m_TileIndex: 33
+      m_TileSpriteIndex: 24
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 16, y: 17, z: 0}
+    second:
+      m_TileIndex: 33
+      m_TileSpriteIndex: 24
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 17, y: 17, z: 0}
+    second:
+      m_TileIndex: 33
+      m_TileSpriteIndex: 24
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 18, y: 17, z: 0}
+    second:
+      m_TileIndex: 33
+      m_TileSpriteIndex: 24
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 19, y: 17, z: 0}
+    second:
+      m_TileIndex: 33
+      m_TileSpriteIndex: 24
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 20, y: 17, z: 0}
+    second:
+      m_TileIndex: 33
+      m_TileSpriteIndex: 24
       m_TileMatrixIndex: 0
       m_TileColorIndex: 0
       m_ObjectToInstantiate: {fileID: 0}
@@ -65580,15 +65689,15 @@ Tilemap:
     m_Data: {fileID: 0}
   - m_RefCount: 0
     m_Data: {fileID: 0}
-  - m_RefCount: 352
+  - m_RefCount: 351
     m_Data: {fileID: 11400000, guid: c63e84b168d360848849325a089170c1, type: 2}
   - m_RefCount: 2
     m_Data: {fileID: 11400000, guid: 0fadbc9d762f2094fb77eaa6d7602134, type: 2}
   - m_RefCount: 70
     m_Data: {fileID: 11400000, guid: 53bf6842f4cddb947ad1461e69ce9eac, type: 2}
   - m_RefCount: 445
     m_Data: {fileID: 11400000, guid: 2241d7c80c0c39041acd7163ef269991, type: 2}
-  - m_RefCount: 548
+  - m_RefCount: 554
     m_Data: {fileID: 11400000, guid: d51a21c25b37f0b43b83bff8c61c2f58, type: 2}
   m_TileSpriteArray:
   - m_RefCount: 61
@@ -65639,9 +65748,9 @@ Tilemap:
     m_Data: {fileID: 0}
   - m_RefCount: 445
     m_Data: {fileID: 21300200, guid: c76f269a5db22564b9bffd16ff3b9a0d, type: 3}
-  - m_RefCount: 548
+  - m_RefCount: 554
     m_Data: {fileID: 21300198, guid: c76f269a5db22564b9bffd16ff3b9a0d, type: 3}
-  - m_RefCount: 352
+  - m_RefCount: 351
     m_Data: {fileID: 21300256, guid: c76f269a5db22564b9bffd16ff3b9a0d, type: 3}
   - m_RefCount: 2
     m_Data: {fileID: 21300062, guid: c76f269a5db22564b9bffd16ff3b9a0d, type: 3}
@@ -65660,7 +65769,7 @@ Tilemap:
   - m_RefCount: 1
     m_Data: {fileID: 21300264, guid: c76f269a5db22564b9bffd16ff3b9a0d, type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 2907
+  - m_RefCount: 2912
     m_Data:
       e00: 1
       e01: 0
@@ -65679,7 +65788,7 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 2907
+  - m_RefCount: 2912
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -66608,11 +66717,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1160195492}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 22.929998, y: 14.11, z: 0.28108972}
+  m_LocalPosition: {x: -2.3199997, y: 1.696249, z: -0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_Father: {fileID: 150613138}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1167999033
 GameObject:
@@ -68586,11 +68695,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1314944960}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 22.929998, y: 5.0779696, z: 0.28108972}
+  m_LocalPosition: {x: -2.3199997, y: -7.335781, z: -0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_Father: {fileID: 150613138}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1316237811
 GameObject:
@@ -69690,7 +69799,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1443971752}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -28.57, y: 8.740001, z: -0.296875}
+  m_LocalPosition: {x: -26.38, y: 8.96, z: -0.296875}
   m_LocalScale: {x: 8.485129, y: 4.39641, z: 1}
   m_Children: []
   m_Father: {fileID: 717023031}
@@ -74771,7 +74880,7 @@ MonoBehaviour:
   health: 100
   death: {fileID: 1897260389}
   rb: {fileID: 1897260391}
-  speed: 1.5
+  speed: 1.75
 --- !u!212 &1897260393
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -74830,7 +74939,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1897260389}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 19.8, y: -12.2, z: 0}
+  m_LocalPosition: {x: 20, y: -11.8, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -75860,11 +75969,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1932737959}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 16.82, y: 5.0779696, z: 0.28108972}
+  m_LocalPosition: {x: -8.43, y: -7.335781, z: -0.015785277}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_Father: {fileID: 150613138}
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1935750959
 GameObject:
@@ -77880,6 +77989,7 @@ Transform:
   - {fileID: 1077283970}
   - {fileID: 1978489874}
   - {fileID: 515626633}
+  - {fileID: 851398744}
   m_Father: {fileID: 183972208}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -78318,12 +78428,12 @@ PrefabInstance:
     - target: {fileID: 1903869158916629446, guid: dc484af6ac804124fb36a33d2243bb68,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 19.8
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 1903869158916629446, guid: dc484af6ac804124fb36a33d2243bb68,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -12.2
+      value: -11.8
       objectReference: {fileID: 0}
     - target: {fileID: 1903869158916629446, guid: dc484af6ac804124fb36a33d2243bb68,
         type: 3}
@@ -78375,5 +78485,10 @@ PrefabInstance:
       propertyPath: player
       value: 
       objectReference: {fileID: 1919620928}
+    - target: {fileID: 3146354216572620248, guid: dc484af6ac804124fb36a33d2243bb68,
+        type: 3}
+      propertyPath: speed
+      value: 1.75
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dc484af6ac804124fb36a33d2243bb68, type: 3}
diff --git a/Platformer/Builds/Beta/Build/Beta.data.unityweb b/Platformer/Builds/Beta/Build/Beta.data.unityweb
diff --git a/Platformer/Builds/Beta/Build/Beta.wasm.code.unityweb b/Platformer/Builds/Beta/Build/Beta.wasm.code.unityweb
diff --git a/Platformer/Builds/Beta/Build/Beta.wasm.framework.unityweb b/Platformer/Builds/Beta/Build/Beta.wasm.framework.unityweb