Minor changes + bux fix

- fixed the exit door bug
letartap-studios · May 17, 2019 · 7ef98a3 · 7ef98a3
1 parent 7cb88e2
commit 7ef98a3
Show file tree

Hide file tree

Showing 11 changed files with 215 additions and 269 deletions.
diff --git a/Awkna/.vs/Awkna/v16/Server/sqlite3/storage.ide b/Awkna/.vs/Awkna/v16/Server/sqlite3/storage.ide
diff --git a/Awkna/Assets/Prefabs/Enemies/FlyingEnemy.prefab b/Awkna/Assets/Prefabs/Enemies/FlyingEnemy.prefab
@@ -228,7 +228,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   knockDuration: 0.5
-  knockbackPwr: 5
+  knockbackPwr: 2
 --- !u!61 &192898524676946209
 BoxCollider2D:
   m_ObjectHideFlags: 0
@@ -399,16 +399,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8000636305140983321}
     m_Modifications:
-    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
-        type: 3}
-      propertyPath: m_Name
-      value: Point Light (2)
-      objectReference: {fileID: 0}
-    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7036417900694863385, guid: 8e0341b224a2f714382be454b2e8a95a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -464,6 +454,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
+        type: 3}
+      propertyPath: m_Name
+      value: Point Light (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7036417900694863382, guid: 8e0341b224a2f714382be454b2e8a95a,
         type: 3}
       propertyPath: m_Range
@@ -504,16 +504,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8000636305140983321}
     m_Modifications:
-    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
-        type: 3}
-      propertyPath: m_Name
-      value: Point Light
-      objectReference: {fileID: 0}
-    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7036417900694863385, guid: 8e0341b224a2f714382be454b2e8a95a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -569,6 +559,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
+        type: 3}
+      propertyPath: m_Name
+      value: Point Light
+      objectReference: {fileID: 0}
+    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7036417900694863382, guid: 8e0341b224a2f714382be454b2e8a95a,
         type: 3}
       propertyPath: m_Intensity
@@ -609,16 +609,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 8000636305140983321}
     m_Modifications:
-    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
-        type: 3}
-      propertyPath: m_Name
-      value: Point Light (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7036417900694863385, guid: 8e0341b224a2f714382be454b2e8a95a,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -674,6 +664,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
+        type: 3}
+      propertyPath: m_Name
+      value: Point Light (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7036417900694863383, guid: 8e0341b224a2f714382be454b2e8a95a,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7036417900694863382, guid: 8e0341b224a2f714382be454b2e8a95a,
         type: 3}
       propertyPath: m_Range

diff --git a/Awkna/Assets/Prefabs/Player.prefab b/Awkna/Assets/Prefabs/Player.prefab
@@ -428,8 +428,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5995f97ad1170e044b3c9303a50cd5a2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  movementSpeed: 7
-  jumpForce: 15
+  movementSpeed: 4
+  jumpForce: 10
   horizontalMovementSmoothing: 0.05
   climbingSmoothing: 0.05
   facingRight: 0
@@ -439,7 +439,7 @@ MonoBehaviour:
   groundCheckRadiusVertical: -0.24
   whatIsGround:
     serializedVersion: 2
-    m_Bits: 215808
+    m_Bits: 740096
   isJumping: 0
   jumpTime: 0.15
   whatIsLadder:
@@ -491,7 +491,7 @@ Rigidbody2D:
   m_Mass: 0.78539795
   m_LinearDrag: 0
   m_AngularDrag: 0.05
-  m_GravityScale: 11
+  m_GravityScale: 5
   m_Material: {fileID: 0}
   m_Interpolate: 0
   m_SleepingMode: 0
@@ -702,7 +702,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2115697294458431863
 Transform:
   m_ObjectHideFlags: 0

diff --git a/Awkna/Assets/Prefabs/PlayerHolder.prefab b/Awkna/Assets/Prefabs/PlayerHolder.prefab
@@ -123,4 +123,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   health: 3
   maxHealth: 3
-  maxTotalHealth: 5
+  maxTotalHealth: 6
diff --git a/Awkna/Assets/Prefabs/Projectiles/Bomb.prefab b/Awkna/Assets/Prefabs/Projectiles/Bomb.prefab
@@ -72,7 +72,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 2
+  m_SortingOrder: 10
   m_Sprite: {fileID: 21300000, guid: 7eac88b3252b7da4c9d931db2b293d31, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -104,7 +104,8 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 692480
   effect: {fileID: 139366, guid: b185c1a9cf067374586d095111b15bd1, type: 3}
-  audioData: {fileID: 1653390615527740967}
+  obj: []
+  crate: {fileID: 0}
 --- !u!50 &-881391477293951908
 Rigidbody2D:
   serializedVersion: 4
@@ -139,7 +140,7 @@ CircleCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0, y: -0.025}
   serializedVersion: 2
   m_Radius: 0.47574934
 --- !u!111 &-3175712452251276426

diff --git a/Awkna/Assets/Prefabs/Tiles/DoorExit.prefab b/Awkna/Assets/Prefabs/Tiles/DoorExit.prefab
@@ -141,7 +141,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3d4cda7e8d681b145ba461a4da42fb7a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  waitTime: 0
+  radius: 0
+  offset: {x: 0, y: 0}
+  player:
+    serializedVersion: 2
+    m_Bits: 0
 --- !u!50 &8732714801212001268
 Rigidbody2D:
   serializedVersion: 4
@@ -258,6 +262,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 91c9812cd06d30e4f9c224b61bebf317, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  offset: {x: 0, y: 0, z: 0}
+  range: 0.5
   waitTime: 1.5
 --- !u!61 &328132848142556693
 BoxCollider2D: