Merge pull request #11 from HarmlessEvil/develop

Itch.io release
HarmlessEvil · Oct 30, 2019 · a37bbb6 · a37bbb6
2 parents b8032cd + 092b040
commit a37bbb6
Show file tree

Hide file tree

Showing 15 changed files with 735 additions and 189 deletions.
diff --git a/StealthGame/Assets/Prefabs/Coin.prefab b/StealthGame/Assets/Prefabs/Coin.prefab
@@ -11,8 +11,8 @@ GameObject:
   - component: {fileID: 4929423210515643258}
   - component: {fileID: 3692888779983514533}
   - component: {fileID: 1709458922202782771}
-  - component: {fileID: 7331910818062327124}
   - component: {fileID: 2714362638229372850}
+  - component: {fileID: 733366555129406928}
   m_Layer: 0
   m_Name: Coin
   m_TagString: Untagged
@@ -103,8 +103,20 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
---- !u!58 &7331910818062327124
-CircleCollider2D:
+--- !u!114 &2714362638229372850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8288404738248471494}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9cb498a674ea0784ea2319e77e41a16c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!61 &733366555129406928
+BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -117,17 +129,15 @@ CircleCollider2D:
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1.7, y: 1.7}
+    newSize: {x: 1.7, y: 1.7}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
   serializedVersion: 2
-  m_Radius: 0.85000014
---- !u!114 &2714362638229372850
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8288404738248471494}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9cb498a674ea0784ea2319e77e41a16c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Size: {x: 2.5, y: 2.5}
+  m_EdgeRadius: 0
diff --git a/StealthGame/Assets/Prefabs/GameOver.prefab b/StealthGame/Assets/Prefabs/GameOver.prefab
@@ -1,5 +1,82 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1201741091
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1201741092}
+  - component: {fileID: 1201741094}
+  - component: {fileID: 1201741093}
+  m_Layer: 5
+  m_Name: Press R to restart
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1201741092
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1201741091}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.031023787, y: 0.06010548, z: 0.06010548}
+  m_Children: []
+  m_Father: {fileID: 1927868360954978482}
+  m_RootOrder: 2
+  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.21, y: -5.93}
+  m_SizeDelta: {x: 270.378, y: 73.951}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1201741094
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1201741091}
+  m_CullTransparentMesh: 0
+--- !u!114 &1201741093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1201741091}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 0.78431374}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 8a2b9e2a607dd2143b58c44bc32410b4, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Press 'r' to restart
 --- !u!1 &1927868359492105958
 GameObject:
   m_ObjectHideFlags: 0
@@ -111,8 +188,8 @@ RectTransform:
   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.58, y: -3.6}
-  m_SizeDelta: {x: 270.378, y: 73.951}
+  m_AnchoredPosition: {x: 0.621, y: -3.68}
+  m_SizeDelta: {x: 351.019, y: 71.35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1927868360824217451
 CanvasRenderer:
@@ -186,6 +263,7 @@ RectTransform:
   m_Children:
   - {fileID: 1927868359492105959}
   - {fileID: 1927868360824217364}
+  - {fileID: 1201741092}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -245,3 +323,4 @@ MonoBehaviour:
   manager: {fileID: 0}
   text: {fileID: 1927868360824217450}
   mainText: {fileID: 1927868359492105956}
+  restartText: {fileID: 1201741093}
diff --git a/StealthGame/Assets/Prefabs/Phrase1.prefab b/StealthGame/Assets/Prefabs/Phrase1.prefab
@@ -27,7 +27,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8796924578022187820}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -5.02, y: -3.77, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
@@ -174,7 +174,7 @@ TilemapRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: -1
   m_ChunkSize: {x: 32, y: 32, z: 32}
   m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
   m_MaxChunkCount: 16
@@ -197,7 +197,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   player: {fileID: 0}
   dialogText: {fileID: 0}
-  phrase: 
+  phrase: "- \u041C\u0430\u043C\u0430 \u0432\u0441\u0435\u0433\u0434\u0430 \u0433\u043E\u0432\u043E\u0440\u0438\u043B\u0430,
+    \u0447\u0442\u043E \u0435\u0441\u043B\u0438 \u044F \u0431\u0443\u0434\u0443 \u043D\u0435\u0443\u043A\u043B\u044E\u0436\u0435\u0439
+    \u0438 \u0440\u0430\u0441\u0442\u044F\u043F\u043E\u0439, \u043E\u043D\u0430 \u043C\u0435\u043D\u044F
+    \u0442\u0435\u0442\u0435 \u043E\u0442\u0434\u0430\u0441\u0442..."
 --- !u!19719996 &8796924578022187811
 TilemapCollider2D:
   m_ObjectHideFlags: 0

diff --git a/StealthGame/Assets/Prefabs/key.prefab b/StealthGame/Assets/Prefabs/key.prefab
@@ -11,8 +11,8 @@ GameObject:
   - component: {fileID: 8120743259961051194}
   - component: {fileID: 8120743259961051195}
   - component: {fileID: 8120743259961051196}
-  - component: {fileID: 8120743259961051193}
   - component: {fileID: 8120743259961051192}
+  - component: {fileID: 41069484750582636}
   m_Layer: 10
   m_Name: key
   m_TagString: Untagged
@@ -95,9 +95,28 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 12c2d6dcb9b6dc9459b3548dd7f0f0d9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ID: 0
---- !u!60 &8120743259961051193
-PolygonCollider2D:
+  ID: 4
+--- !u!95 &8120743259961051192
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8120743259961051197}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 2582283e55e86404dbbe6ea13a5045eb, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!61 &41069484750582636
+BoxCollider2D:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -119,53 +138,6 @@ PolygonCollider2D:
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: 0.28, y: 0.03}
-      - {x: 0.28, y: -0.25}
-      - {x: 0.29999998, y: -0.26999998}
-      - {x: 0.61, y: -0.29999998}
-      - {x: 1.01, y: -0.29999998}
-      - {x: 1.12, y: -0.03}
-      - {x: 1.12, y: 0.35}
-      - {x: 1.1, y: 0.37}
-      - {x: 0.02, y: 0.59999996}
-      - {x: -0.16, y: 0.84}
-      - {x: -0.39999998, y: 0.87}
-      - {x: -0.79999995, y: 0.87}
-      - {x: -0.96, y: 0.77}
-      - {x: -1.18, y: 0.59}
-      - {x: -1.22, y: 0.35}
-      - {x: -1.22, y: 0}
-      - {x: -1.17, y: -0.02}
-      - {x: -1.0699999, y: -0.29999998}
-      - {x: -0.71999997, y: -0.47}
-      - {x: -0.35, y: -0.47}
-      - {x: -0.07, y: -0.29}
-      - {x: 0.02, y: -0.19}
-      - {x: 0.04, y: 0.01}
-    - - {x: -0.74, y: 0.02}
-      - {x: -0.74, y: 0.39}
-      - {x: -0.51, y: 0.39}
-      - {x: -0.32999998, y: 0.42}
-      - {x: -0.35999998, y: 0.16}
-      - {x: -0.51, y: 0.02}
---- !u!95 &8120743259961051192
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8120743259961051197}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 2582283e55e86404dbbe6ea13a5045eb, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  serializedVersion: 2
+  m_Size: {x: 4, y: 3.1}
+  m_EdgeRadius: 0