diff --git a/Assets/art/Resources/runic_a.png b/Assets/art/Resources/runic_a.png index 70b4a65..a3e1c12 100644 Binary files a/Assets/art/Resources/runic_a.png and b/Assets/art/Resources/runic_a.png differ diff --git a/Assets/art/Resources/runic_a.png.meta b/Assets/art/Resources/runic_a.png.meta index 42cb5ca..7c7d08e 100644 --- a/Assets/art/Resources/runic_a.png.meta +++ b/Assets/art/Resources/runic_a.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: bd4033904c00e7e459e6c2b5b6885440 -timeCreated: 1454180206 +guid: 485886a11f3706b4b97fb3c13388f4da +timeCreated: 1454206151 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -29,8 +29,8 @@ TextureImporter: textureFormat: -1 maxTextureSize: 2048 textureSettings: - filterMode: 1 - aniso: 16 + filterMode: -1 + aniso: -1 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_b.png b/Assets/art/Resources/runic_b.png index 4786d86..49def3d 100644 Binary files a/Assets/art/Resources/runic_b.png and b/Assets/art/Resources/runic_b.png differ diff --git a/Assets/art/Resources/runic_b.png.meta b/Assets/art/Resources/runic_b.png.meta index 97c56ed..e4d2bd1 100644 --- a/Assets/art/Resources/runic_b.png.meta +++ b/Assets/art/Resources/runic_b.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: aeda58a65759efc4aae4ec7475572a36 -timeCreated: 1454150347 +guid: e1eb1c73c201c9446b0c7cf45d31815d +timeCreated: 1454206152 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -29,8 +29,8 @@ TextureImporter: textureFormat: -1 maxTextureSize: 2048 textureSettings: - filterMode: 1 - aniso: 16 + filterMode: -1 + aniso: -1 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_c.png b/Assets/art/Resources/runic_c.png index 46af6ab..eb45656 100644 Binary files a/Assets/art/Resources/runic_c.png and b/Assets/art/Resources/runic_c.png differ diff --git a/Assets/art/Resources/runic_c.png.meta b/Assets/art/Resources/runic_c.png.meta index 77be859..8daff89 100644 --- a/Assets/art/Resources/runic_c.png.meta +++ b/Assets/art/Resources/runic_c.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 7ad1669ebee00d744b1302b566208c5d -timeCreated: 1454150346 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_d.png b/Assets/art/Resources/runic_d.png index 83d1e3e..4c60177 100644 Binary files a/Assets/art/Resources/runic_d.png and b/Assets/art/Resources/runic_d.png differ diff --git a/Assets/art/Resources/runic_d.png.meta b/Assets/art/Resources/runic_d.png.meta index ef2ce79..baf9087 100644 --- a/Assets/art/Resources/runic_d.png.meta +++ b/Assets/art/Resources/runic_d.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 919a6f75650ee17488045972bd44774c -timeCreated: 1454150347 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_e.png b/Assets/art/Resources/runic_e.png index c645905..1cd538a 100644 Binary files a/Assets/art/Resources/runic_e.png and b/Assets/art/Resources/runic_e.png differ diff --git a/Assets/art/Resources/runic_e.png.meta b/Assets/art/Resources/runic_e.png.meta index 5c24a42..53abd95 100644 --- a/Assets/art/Resources/runic_e.png.meta +++ b/Assets/art/Resources/runic_e.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: a2720f1ecf436ad4081ce96b4ac81a7c -timeCreated: 1454150347 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_f.png b/Assets/art/Resources/runic_f.png index 9951f9b..62520d2 100644 Binary files a/Assets/art/Resources/runic_f.png and b/Assets/art/Resources/runic_f.png differ diff --git a/Assets/art/Resources/runic_f.png.meta b/Assets/art/Resources/runic_f.png.meta index b0224ef..2e1ce59 100644 --- a/Assets/art/Resources/runic_f.png.meta +++ b/Assets/art/Resources/runic_f.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 2b6503893219c874f9c8028455fd064e -timeCreated: 1454150345 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_g.png b/Assets/art/Resources/runic_g.png index 468df2a..f95b31e 100644 Binary files a/Assets/art/Resources/runic_g.png and b/Assets/art/Resources/runic_g.png differ diff --git a/Assets/art/Resources/runic_g.png.meta b/Assets/art/Resources/runic_g.png.meta index 101357f..2fd93f4 100644 --- a/Assets/art/Resources/runic_g.png.meta +++ b/Assets/art/Resources/runic_g.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 6dc0f016a798ffc4586a8105474737f2 -timeCreated: 1454150346 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_h.png b/Assets/art/Resources/runic_h.png index 6b24ec7..78867b3 100644 Binary files a/Assets/art/Resources/runic_h.png and b/Assets/art/Resources/runic_h.png differ diff --git a/Assets/art/Resources/runic_h.png.meta b/Assets/art/Resources/runic_h.png.meta index fa9b280..cd455fa 100644 --- a/Assets/art/Resources/runic_h.png.meta +++ b/Assets/art/Resources/runic_h.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 8b9c9ed309b764c49bc89c8f950d1ce3 -timeCreated: 1454150347 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_i.png b/Assets/art/Resources/runic_i.png index bf127ad..2260cc2 100644 Binary files a/Assets/art/Resources/runic_i.png and b/Assets/art/Resources/runic_i.png differ diff --git a/Assets/art/Resources/runic_i.png.meta b/Assets/art/Resources/runic_i.png.meta index 5031901..855b2ef 100644 --- a/Assets/art/Resources/runic_i.png.meta +++ b/Assets/art/Resources/runic_i.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e0801334152b699499889b044a09f6d9 -timeCreated: 1454150524 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_j.png b/Assets/art/Resources/runic_j.png index 567f46e..d5e8ed5 100644 Binary files a/Assets/art/Resources/runic_j.png and b/Assets/art/Resources/runic_j.png differ diff --git a/Assets/art/Resources/runic_j.png.meta b/Assets/art/Resources/runic_j.png.meta index 56c3cd3..bcc7685 100644 --- a/Assets/art/Resources/runic_j.png.meta +++ b/Assets/art/Resources/runic_j.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e10016986243b3240a461e7e1e00cd82 -timeCreated: 1454150348 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_k.png b/Assets/art/Resources/runic_k.png index 283e152..637a661 100644 Binary files a/Assets/art/Resources/runic_k.png and b/Assets/art/Resources/runic_k.png differ diff --git a/Assets/art/Resources/runic_k.png.meta b/Assets/art/Resources/runic_k.png.meta index 9981fb7..e9b69c4 100644 --- a/Assets/art/Resources/runic_k.png.meta +++ b/Assets/art/Resources/runic_k.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 04a91da37e2c51d4b83dcf540737953b -timeCreated: 1454150344 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_l.png b/Assets/art/Resources/runic_l.png index d025b9a..03e5b2f 100644 Binary files a/Assets/art/Resources/runic_l.png and b/Assets/art/Resources/runic_l.png differ diff --git a/Assets/art/Resources/runic_l.png.meta b/Assets/art/Resources/runic_l.png.meta index bc1c4a6..1002114 100644 --- a/Assets/art/Resources/runic_l.png.meta +++ b/Assets/art/Resources/runic_l.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5aa85fc290b86c14b9026f258ba2b401 -timeCreated: 1454150346 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_m.png b/Assets/art/Resources/runic_m.png index 5362049..c038ebf 100644 Binary files a/Assets/art/Resources/runic_m.png and b/Assets/art/Resources/runic_m.png differ diff --git a/Assets/art/Resources/runic_m.png.meta b/Assets/art/Resources/runic_m.png.meta index 87bfdcc..a6ea568 100644 --- a/Assets/art/Resources/runic_m.png.meta +++ b/Assets/art/Resources/runic_m.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 89ffff4842cb58d42ab6e8e4fed318cd -timeCreated: 1454150347 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_n.png b/Assets/art/Resources/runic_n.png index 44aa50a..97160ff 100644 Binary files a/Assets/art/Resources/runic_n.png and b/Assets/art/Resources/runic_n.png differ diff --git a/Assets/art/Resources/runic_n.png.meta b/Assets/art/Resources/runic_n.png.meta index f5f5d48..1db6bd2 100644 --- a/Assets/art/Resources/runic_n.png.meta +++ b/Assets/art/Resources/runic_n.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 161e1d211bfeaa244972371555887e86 -timeCreated: 1454150345 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_o.png b/Assets/art/Resources/runic_o.png index c06371c..5530138 100644 Binary files a/Assets/art/Resources/runic_o.png and b/Assets/art/Resources/runic_o.png differ diff --git a/Assets/art/Resources/runic_o.png.meta b/Assets/art/Resources/runic_o.png.meta index 8a14707..7f78b45 100644 --- a/Assets/art/Resources/runic_o.png.meta +++ b/Assets/art/Resources/runic_o.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b590e2d865d1ab54c8d5da34b6cdbdf5 -timeCreated: 1454150348 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_p.png b/Assets/art/Resources/runic_p.png index d94fbd0..12cce72 100644 Binary files a/Assets/art/Resources/runic_p.png and b/Assets/art/Resources/runic_p.png differ diff --git a/Assets/art/Resources/runic_p.png.meta b/Assets/art/Resources/runic_p.png.meta index cc28529..8996452 100644 --- a/Assets/art/Resources/runic_p.png.meta +++ b/Assets/art/Resources/runic_p.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f1e6ab4333b156a439c7c6cad73ace58 -timeCreated: 1454150348 +timeCreated: 1454211290 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_q.png b/Assets/art/Resources/runic_q.png index a23f7e6..fb6348b 100644 Binary files a/Assets/art/Resources/runic_q.png and b/Assets/art/Resources/runic_q.png differ diff --git a/Assets/art/Resources/runic_q.png.meta b/Assets/art/Resources/runic_q.png.meta index fd42505..f4976a4 100644 --- a/Assets/art/Resources/runic_q.png.meta +++ b/Assets/art/Resources/runic_q.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: fbd303d243c0dc341a647933f14eff27 -timeCreated: 1454150348 +timeCreated: 1454211290 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_r.png b/Assets/art/Resources/runic_r.png index 0a9257e..40e46f9 100644 Binary files a/Assets/art/Resources/runic_r.png and b/Assets/art/Resources/runic_r.png differ diff --git a/Assets/art/Resources/runic_r.png.meta b/Assets/art/Resources/runic_r.png.meta index 77b7167..34a3ddb 100644 --- a/Assets/art/Resources/runic_r.png.meta +++ b/Assets/art/Resources/runic_r.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 873afe4a1a97a484b8d177e3cc6ebfd5 -timeCreated: 1454150347 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_s.png b/Assets/art/Resources/runic_s.png index c0c0d24..5a9be4b 100644 Binary files a/Assets/art/Resources/runic_s.png and b/Assets/art/Resources/runic_s.png differ diff --git a/Assets/art/Resources/runic_s.png.meta b/Assets/art/Resources/runic_s.png.meta index 09ae0dc..ea525de 100644 --- a/Assets/art/Resources/runic_s.png.meta +++ b/Assets/art/Resources/runic_s.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 53b1559eb09e3124cba03468f215269c -timeCreated: 1454150345 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_t.png b/Assets/art/Resources/runic_t.png index 7a429af..8670104 100644 Binary files a/Assets/art/Resources/runic_t.png and b/Assets/art/Resources/runic_t.png differ diff --git a/Assets/art/Resources/runic_t.png.meta b/Assets/art/Resources/runic_t.png.meta index 3efa094..5554559 100644 --- a/Assets/art/Resources/runic_t.png.meta +++ b/Assets/art/Resources/runic_t.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 4c630df4caf0ff24f80fccd2e7350267 -timeCreated: 1454150345 +timeCreated: 1454211288 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_u.png b/Assets/art/Resources/runic_u.png index a8e8c5f..d5ac472 100644 Binary files a/Assets/art/Resources/runic_u.png and b/Assets/art/Resources/runic_u.png differ diff --git a/Assets/art/Resources/runic_u.png.meta b/Assets/art/Resources/runic_u.png.meta index fde4b2f..72a8288 100644 --- a/Assets/art/Resources/runic_u.png.meta +++ b/Assets/art/Resources/runic_u.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f0b2462c126d2db4eac0057e052d03f0 -timeCreated: 1454150348 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_v.png b/Assets/art/Resources/runic_v.png index 86d5071..2a929c3 100644 Binary files a/Assets/art/Resources/runic_v.png and b/Assets/art/Resources/runic_v.png differ diff --git a/Assets/art/Resources/runic_v.png.meta b/Assets/art/Resources/runic_v.png.meta index 97e809d..3c92f14 100644 --- a/Assets/art/Resources/runic_v.png.meta +++ b/Assets/art/Resources/runic_v.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9ed289a3741d80547a3597890377fd27 -timeCreated: 1454150347 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_w.png b/Assets/art/Resources/runic_w.png index 7f9ce5f..9140cff 100644 Binary files a/Assets/art/Resources/runic_w.png and b/Assets/art/Resources/runic_w.png differ diff --git a/Assets/art/Resources/runic_w.png.meta b/Assets/art/Resources/runic_w.png.meta index 3d15ae1..de7754f 100644 --- a/Assets/art/Resources/runic_w.png.meta +++ b/Assets/art/Resources/runic_w.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: deaa858bd5a4f4f478e17b742c2e538b -timeCreated: 1454150348 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_x.png b/Assets/art/Resources/runic_x.png index df8ea38..64d0298 100644 Binary files a/Assets/art/Resources/runic_x.png and b/Assets/art/Resources/runic_x.png differ diff --git a/Assets/art/Resources/runic_x.png.meta b/Assets/art/Resources/runic_x.png.meta index 79c5298..24f6beb 100644 --- a/Assets/art/Resources/runic_x.png.meta +++ b/Assets/art/Resources/runic_x.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: c5362a9f32d439f49b827596620cd35f -timeCreated: 1454150348 +timeCreated: 1454211289 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_z.png b/Assets/art/runic_a_old.png similarity index 72% rename from Assets/art/Resources/runic_z.png rename to Assets/art/runic_a_old.png index cf12013..70b4a65 100644 Binary files a/Assets/art/Resources/runic_z.png and b/Assets/art/runic_a_old.png differ diff --git a/Assets/art/Resources/runic_y.png.meta b/Assets/art/runic_a_old.png.meta similarity index 93% rename from Assets/art/Resources/runic_y.png.meta rename to Assets/art/runic_a_old.png.meta index 9f5eacf..42cb5ca 100644 --- a/Assets/art/Resources/runic_y.png.meta +++ b/Assets/art/runic_a_old.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: ccb79002fc6082b47a3c4a599c9a0550 -timeCreated: 1454150348 +guid: bd4033904c00e7e459e6c2b5b6885440 +timeCreated: 1454180206 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -29,7 +29,7 @@ TextureImporter: textureFormat: -1 maxTextureSize: 2048 textureSettings: - filterMode: -1 + filterMode: 1 aniso: 16 mipBias: -1 wrapMode: 1 diff --git a/Assets/art/Resources/runic_y.png b/Assets/art/runic_b_old.png similarity index 74% rename from Assets/art/Resources/runic_y.png rename to Assets/art/runic_b_old.png index f80e3cf..4786d86 100644 Binary files a/Assets/art/Resources/runic_y.png and b/Assets/art/runic_b_old.png differ diff --git a/Assets/art/Resources/runic_z.png.meta b/Assets/art/runic_b_old.png.meta similarity index 93% rename from Assets/art/Resources/runic_z.png.meta rename to Assets/art/runic_b_old.png.meta index a89466d..97c56ed 100644 --- a/Assets/art/Resources/runic_z.png.meta +++ b/Assets/art/runic_b_old.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 68f365531dc0d6a4bafdcf72143a57d0 -timeCreated: 1454150346 +guid: aeda58a65759efc4aae4ec7475572a36 +timeCreated: 1454150347 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -29,7 +29,7 @@ TextureImporter: textureFormat: -1 maxTextureSize: 2048 textureSettings: - filterMode: -1 + filterMode: 1 aniso: 16 mipBias: -1 wrapMode: 1 diff --git a/Assets/materials/basic_room.mat b/Assets/materials/basic_room.mat new file mode 100644 index 0000000..3e4512c --- /dev/null +++ b/Assets/materials/basic_room.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: basic_room + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + data: + first: + name: _Cutoff + second: .5 + data: + first: + name: _ZWrite + second: 1 + data: + first: + name: _Glossiness + second: .5 + data: + first: + name: _Metallic + second: 0 + data: + first: + name: _BumpScale + second: 1 + data: + first: + name: _Parallax + second: .0199999996 + data: + first: + name: _OcclusionStrength + second: 1 + data: + first: + name: _DetailNormalMapScale + second: 1 + data: + first: + name: _UVSec + second: 0 + data: + first: + name: _Mode + second: 0 + m_Colors: + data: + first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/materials/basic_room.mat.meta b/Assets/materials/basic_room.mat.meta new file mode 100644 index 0000000..67c6ac9 --- /dev/null +++ b/Assets/materials/basic_room.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fde9315c536b1e4b828c246cd94c2d9 +timeCreated: 1454207822 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/SelectorWithBolts.prefab b/Assets/prefabs/SelectorWithBolts.prefab index a2ec2af..3cdb760 100644 --- a/Assets/prefabs/SelectorWithBolts.prefab +++ b/Assets/prefabs/SelectorWithBolts.prefab @@ -1396,7 +1396,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 11 + m_RootOrder: 18 --- !u!4 &400652 Transform: m_ObjectHideFlags: 1 @@ -1441,16 +1441,16 @@ Transform: - {fileID: 400652} - {fileID: 423508} - {fileID: 488088} - - {fileID: 462892} - - {fileID: 493324} - - {fileID: 482356} - - {fileID: 495944} - - {fileID: 407074} - - {fileID: 494418} - - {fileID: 450300} - - {fileID: 494274} - - {fileID: 448830} - {fileID: 408942} + - {fileID: 448830} + - {fileID: 494274} + - {fileID: 450300} + - {fileID: 494418} + - {fileID: 407074} + - {fileID: 495944} + - {fileID: 482356} + - {fileID: 493324} + - {fileID: 462892} m_Father: {fileID: 447650} m_RootOrder: 2 --- !u!4 &404086 @@ -1476,7 +1476,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 14 + m_RootOrder: 15 --- !u!4 &408108 Transform: m_ObjectHideFlags: 1 @@ -1512,7 +1512,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 19 + m_RootOrder: 10 --- !u!4 &409088 Transform: m_ObjectHideFlags: 1 @@ -1545,16 +1545,16 @@ Transform: - {fileID: 460350} - {fileID: 439350} - {fileID: 419506} - - {fileID: 412108} - - {fileID: 400542} - - {fileID: 434000} - - {fileID: 428220} - - {fileID: 488850} - - {fileID: 461272} - - {fileID: 481558} - - {fileID: 429644} - - {fileID: 471674} - {fileID: 422390} + - {fileID: 471674} + - {fileID: 429644} + - {fileID: 481558} + - {fileID: 461272} + - {fileID: 488850} + - {fileID: 428220} + - {fileID: 434000} + - {fileID: 400542} + - {fileID: 412108} m_Father: {fileID: 447650} m_RootOrder: 1 --- !u!4 &412108 @@ -1568,7 +1568,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 10 + m_RootOrder: 19 --- !u!4 &417354 Transform: m_ObjectHideFlags: 1 @@ -1628,7 +1628,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 10 + m_RootOrder: 19 --- !u!4 &422390 Transform: m_ObjectHideFlags: 1 @@ -1640,7 +1640,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 19 + m_RootOrder: 10 --- !u!4 &423508 Transform: m_ObjectHideFlags: 1 @@ -1700,7 +1700,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 13 + m_RootOrder: 16 --- !u!4 &429644 Transform: m_ObjectHideFlags: 1 @@ -1712,7 +1712,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 17 + m_RootOrder: 12 --- !u!4 &432700 Transform: m_ObjectHideFlags: 1 @@ -1724,7 +1724,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 17 + m_RootOrder: 12 --- !u!4 &433450 Transform: m_ObjectHideFlags: 1 @@ -1736,7 +1736,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 11 + m_RootOrder: 18 --- !u!4 &434000 Transform: m_ObjectHideFlags: 1 @@ -1748,7 +1748,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 12 + m_RootOrder: 17 --- !u!4 &434218 Transform: m_ObjectHideFlags: 1 @@ -1796,7 +1796,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 12 + m_RootOrder: 17 --- !u!4 &439350 Transform: m_ObjectHideFlags: 1 @@ -1840,7 +1840,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 135156} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1.08000004, z: 11.108305} m_LocalScale: {x: 5, y: 5, z: 5} m_Children: - {fileID: 417354} @@ -1865,7 +1865,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 18 + m_RootOrder: 11 --- !u!4 &450300 Transform: m_ObjectHideFlags: 1 @@ -1877,7 +1877,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 16 + m_RootOrder: 13 --- !u!4 &455894 Transform: m_ObjectHideFlags: 1 @@ -1889,7 +1889,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 19 + m_RootOrder: 10 --- !u!4 &458382 Transform: m_ObjectHideFlags: 1 @@ -1937,7 +1937,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 15 + m_RootOrder: 14 --- !u!4 &462766 Transform: m_ObjectHideFlags: 1 @@ -1961,7 +1961,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 13 + m_RootOrder: 16 --- !u!4 &462892 Transform: m_ObjectHideFlags: 1 @@ -1973,7 +1973,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 10 + m_RootOrder: 19 --- !u!4 &463954 Transform: m_ObjectHideFlags: 1 @@ -2018,16 +2018,16 @@ Transform: - {fileID: 468196} - {fileID: 436984} - {fileID: 479146} - - {fileID: 420244} - - {fileID: 433450} - - {fileID: 438654} - - {fileID: 462824} - - {fileID: 493478} - - {fileID: 467880} - - {fileID: 469136} - - {fileID: 432700} - - {fileID: 485006} - {fileID: 455894} + - {fileID: 485006} + - {fileID: 432700} + - {fileID: 469136} + - {fileID: 467880} + - {fileID: 493478} + - {fileID: 462824} + - {fileID: 438654} + - {fileID: 433450} + - {fileID: 420244} m_Father: {fileID: 447650} m_RootOrder: 3 --- !u!4 &467880 @@ -2041,7 +2041,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 15 + m_RootOrder: 14 --- !u!4 &468196 Transform: m_ObjectHideFlags: 1 @@ -2065,7 +2065,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 16 + m_RootOrder: 13 --- !u!4 &470420 Transform: m_ObjectHideFlags: 1 @@ -2101,7 +2101,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 18 + m_RootOrder: 11 --- !u!4 &479146 Transform: m_ObjectHideFlags: 1 @@ -2137,7 +2137,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 16 + m_RootOrder: 13 --- !u!4 &482356 Transform: m_ObjectHideFlags: 1 @@ -2149,7 +2149,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 12 + m_RootOrder: 17 --- !u!4 &485006 Transform: m_ObjectHideFlags: 1 @@ -2161,7 +2161,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 18 + m_RootOrder: 11 --- !u!4 &486730 Transform: m_ObjectHideFlags: 1 @@ -2197,7 +2197,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 410852} - m_RootOrder: 14 + m_RootOrder: 15 --- !u!4 &489060 Transform: m_ObjectHideFlags: 1 @@ -2221,7 +2221,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 11 + m_RootOrder: 18 --- !u!4 &493478 Transform: m_ObjectHideFlags: 1 @@ -2233,7 +2233,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466070} - m_RootOrder: 14 + m_RootOrder: 15 --- !u!4 &494274 Transform: m_ObjectHideFlags: 1 @@ -2245,7 +2245,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 17 + m_RootOrder: 12 --- !u!4 &494418 Transform: m_ObjectHideFlags: 1 @@ -2257,7 +2257,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 15 + m_RootOrder: 14 --- !u!4 &495602 Transform: m_ObjectHideFlags: 1 @@ -2281,7 +2281,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 402326} - m_RootOrder: 13 + m_RootOrder: 16 --- !u!23 &2302328 MeshRenderer: m_ObjectHideFlags: 1 @@ -5243,7 +5243,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000596, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 4.77571575e-06, y: -1.31999588, z: 6.89843409e-06} + m_ConnectedAnchor: {x: 4.43704994e-06, y: -1.31999588, z: 1.23170385e-05} m_UseSpring: 0 m_Spring: spring: 0 @@ -5307,7 +5307,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 8.92963953e-07, y: -1.23998833, z: 6.77325602e-07} + m_ConnectedAnchor: {x: 8.92962021e-07, y: -1.23999214, z: 4.74127864e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5371,7 +5371,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 4.04334514e-06, y: -1.35999298, z: 5.53324389e-06} + m_ConnectedAnchor: {x: 4.38200641e-06, y: -1.36000061, z: 1.09518487e-05} m_UseSpring: 0 m_Spring: spring: 0 @@ -5403,7 +5403,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000215, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 5.68865858e-07, y: -1.29999447, z: 8.27999997e-07} + m_ConnectedAnchor: {x: 5.68864493e-07, y: -1.29999542, z: 3.19863921e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5467,7 +5467,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 5.11949452e-07, y: -1.35999823, z: 6.77325716e-07} + m_ConnectedAnchor: {x: 5.11948315e-07, y: -1.36000013, z: 4.23328493e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5499,7 +5499,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 4.70264752e-07, y: -1.35999203, z: 1.57628406e-07} + m_ConnectedAnchor: {x: -2.07062143e-07, y: -1.35999298, z: 2.52826771e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5563,7 +5563,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: .00856007636, y: .499998868, z: -.227323085} + m_ConnectedAnchor: {x: .00856049359, y: 1.57999897, z: -.227322847} m_UseSpring: 0 m_Spring: spring: 0 @@ -5627,7 +5627,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -1.10999807e-07, y: -1.24000549, z: -6.32203552e-08} + m_ConnectedAnchor: {x: 5.66325525e-07, y: -1.24000549, z: -6.3220277e-08} m_UseSpring: 0 m_Spring: spring: 0 @@ -5659,7 +5659,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.2807377e-06, y: -1.35999489, z: 1.44063142e-06} + m_ConnectedAnchor: {x: 2.9420753e-06, y: -1.35999107, z: -1.2686711e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5691,7 +5691,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.50727217e-07, y: -1.36000443, z: 1.38663623e-07} + m_ConnectedAnchor: {x: -1.87935484e-07, y: -1.36000443, z: 1.38663466e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -5723,7 +5723,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -3.84870518e-08, y: -1.3299942, z: 8.40825507e-08} + m_ConnectedAnchor: {x: 3.00175685e-07, y: -1.3299942, z: 8.40826715e-08} m_UseSpring: 0 m_Spring: spring: 0 @@ -5755,7 +5755,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000596, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -2.31337637e-07, y: -1.32000732, z: 1.88397308e-07} + m_ConnectedAnchor: {x: 4.45987951e-07, y: -1.32000732, z: 1.88397706e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -5787,7 +5787,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.71805768e-08, y: -1.26999593, z: -6.32203339e-08} + m_ConnectedAnchor: {x: -3.01482146e-07, y: -1.26999593, z: -6.32203765e-08} m_UseSpring: 0 m_Spring: spring: 0 @@ -5819,7 +5819,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 4.50367497e-06, y: -1.35999298, z: 4.14993383e-06} + m_ConnectedAnchor: {x: 4.84233897e-06, y: -1.35999298, z: 1.44063222e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5851,7 +5851,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -1.76745552e-08, y: -1.36000061, z: 2.30543705e-07} + m_ConnectedAnchor: {x: 3.20988192e-07, y: -1.36000061, z: 2.30543833e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -5915,7 +5915,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1, z: 0} m_Axis: {x: 0, y: 0, z: -1} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.48051174e-07, y: -1.55531323, z: .0121517265} + m_ConnectedAnchor: {x: 3.48051316e-07, y: -1.55531251, z: .0121505409} m_UseSpring: 0 m_Spring: spring: 0 @@ -5947,7 +5947,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.25125609e-06, y: -1.35999107, z: 1.44063051e-06} + m_ConnectedAnchor: {x: 1.2512578e-06, y: -1.35999107, z: -1.26867167e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -5979,7 +5979,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.44949661e-06, y: -1.35998917, z: -3.97797294e-06} + m_ConnectedAnchor: {x: 1.11083534e-06, y: -1.35998535, z: -6.68727535e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6011,7 +6011,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 9.51090499e-07, y: -1.44999123, z: -6.1875985e-06} + m_ConnectedAnchor: {x: 1.28975489e-06, y: -1.44999123, z: -8.8969e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6043,7 +6043,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1, z: 0} m_Axis: {x: 0, y: 0, z: 1} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -7.47663023e-07, y: -1.56878722, z: -.000873580517} + m_ConnectedAnchor: {x: -7.47662568e-07, y: -1.5687865, z: -.000874765799} m_UseSpring: 0 m_Spring: spring: 0 @@ -6075,7 +6075,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.64406822e-07, y: -1.33000183, z: 2.17372872e-07} + m_ConnectedAnchor: {x: -7.42559081e-08, y: -1.33000183, z: 2.17372758e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -6139,7 +6139,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.29757575e-07, y: -1.32999182, z: 1.10007079e-06} + m_ConnectedAnchor: {x: 9.07085962e-07, y: -1.32998896, z: -3.6412082e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6203,7 +6203,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 9.11483994e-07, y: -1.32999325, z: 1.77739685e-06} + m_ConnectedAnchor: {x: 2.34158421e-07, y: -1.32999325, z: 1.77739651e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6235,7 +6235,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.44501053e-06, y: -1.35999298, z: -2.59466265e-06} + m_ConnectedAnchor: {x: 2.12233681e-06, y: -1.35999298, z: -2.59466242e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6267,7 +6267,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.35498999e-06, y: -1.32999229, z: 4.21810546e-06} + m_ConnectedAnchor: {x: 3.69365398e-06, y: -1.32999229, z: 1.50880339e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6299,7 +6299,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 6.64227073e-08, y: -1.27000427, z: 1.09002993e-14} + m_ConnectedAnchor: {x: 4.05085473e-07, y: -1.27000427, z: 1.32015533e-13} m_UseSpring: 0 m_Spring: spring: 0 @@ -6363,7 +6363,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 7.65333652e-07, y: -1.38999653, z: -1.23748282e-06} + m_ConnectedAnchor: {x: 4.26669345e-07, y: -1.38999748, z: 1.47181913e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6395,7 +6395,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -.000426378101, y: .499998868, z: -.114238188} + m_ConnectedAnchor: {x: -.00042655319, y: 1.57999897, z: -.114237532} m_UseSpring: 0 m_Spring: spring: 0 @@ -6427,7 +6427,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 7.44652411e-08, y: -1.35998917, z: 2.73532208e-07} + m_ConnectedAnchor: {x: -2.64197496e-07, y: -1.35998917, z: 2.73532095e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -6459,7 +6459,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: -1.22578157e-07, y: -1.35999918, z: -5.77284192e-14} + m_ConnectedAnchor: {x: -4.61240887e-07, y: -1.35999918, z: -1.78843648e-13} m_UseSpring: 0 m_Spring: spring: 0 @@ -6491,7 +6491,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.86389786e-06, y: -1.26999474, z: 1.35465211e-06} + m_ConnectedAnchor: {x: 2.18657078e-06, y: -1.26999855, z: 6.09593098e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6555,7 +6555,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.67167755e-08, y: -1.26999807, z: -5.07994116e-07} + m_ConnectedAnchor: {x: -3.21945805e-07, y: -1.26999736, z: -1.69331372e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6619,7 +6619,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.43039506e-06, y: -1.38998413, z: -2.63607194e-06} + m_ConnectedAnchor: {x: 1.43039142e-06, y: -1.38998413, z: 1.42788122e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6651,7 +6651,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.72055479e-06, y: -1.35998917, z: 6.16758007e-06} + m_ConnectedAnchor: {x: 1.38188921e-06, y: -1.35999107, z: 1.09088587e-05} m_UseSpring: 0 m_Spring: spring: 0 @@ -6683,7 +6683,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 9.35337823e-07, y: -1.26999092, z: -5.41860391e-06} + m_ConnectedAnchor: {x: 1.61266485e-06, y: -1.26999092, z: -7.45058105e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6715,7 +6715,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.26087673e-06, y: -1.32999229, z: -6.61910326e-06} + m_ConnectedAnchor: {x: 9.22215236e-07, y: -1.32998848, z: -9.32840612e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6747,7 +6747,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000215, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.33533762e-06, y: -1.29999924, z: 2.85997794e-06} + m_ConnectedAnchor: {x: 3.33533785e-06, y: -1.29999542, z: 1.50532651e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6875,7 +6875,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.77869936e-07, y: -1.26999855, z: -7.61991146e-07} + m_ConnectedAnchor: {x: 5.16534669e-07, y: -1.26999593, z: -5.41860391e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -6907,7 +6907,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.18729133e-07, y: -1.38999367, z: 2.33071987e-07} + m_ConnectedAnchor: {x: -5.58596298e-07, y: -1.38999367, z: 2.33071731e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -6939,7 +6939,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000596, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 7.65185064e-07, y: -1.31999016, z: -3.30317675e-06} + m_ConnectedAnchor: {x: 7.65183245e-07, y: -1.31999207, z: -5.93874859e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -6971,7 +6971,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.33324641e-07, y: -1.44999886, z: -2.84487403e-08} + m_ConnectedAnchor: {x: 9.10650044e-07, y: -1.44999886, z: -2.84484987e-08} m_UseSpring: 0 m_Spring: spring: 0 @@ -7003,7 +7003,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.56750078e-08, y: .499999404, z: -.141499519} + m_ConnectedAnchor: {x: 3.56750078e-08, y: 1.57999945, z: -.141499519} m_UseSpring: 0 m_Spring: spring: 0 @@ -7035,7 +7035,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.06095478e-06, y: -1.44999123, z: -9.16680989e-08} + m_ConnectedAnchor: {x: 2.73827891e-06, y: -1.44999504, z: 3.97228541e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -7131,7 +7131,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 1.31754814e-06, y: -1.35999584, z: 1.17361742e-06} + m_ConnectedAnchor: {x: 1.99487386e-06, y: -1.35999584, z: 1.17361765e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -7163,7 +7163,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000215, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.67676114e-07, y: -1.30000305, z: 2.66579463e-07} + m_ConnectedAnchor: {x: 6.06338858e-07, y: -1.30000305, z: 2.66579576e-07} m_UseSpring: 0 m_Spring: spring: 0 @@ -7195,7 +7195,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000405, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 7.56093073e-07, y: -1.35999489, z: 7.16497937e-08} + m_ConnectedAnchor: {x: 1.09475764e-06, y: -1.35999298, z: -1.9603267e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -7227,7 +7227,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.36985125e-06, y: -1.23999977, z: 2.70930218e-06} + m_ConnectedAnchor: {x: 2.36985147e-06, y: -1.23999786, z: 2.86535769e-13} m_UseSpring: 0 m_Spring: spring: 0 @@ -7259,7 +7259,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.33522655e-07, y: -1.35999584, z: -8.46656917e-07} + m_ConnectedAnchor: {x: 2.33521206e-07, y: -1.3599968, z: 1.52398263e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -7291,7 +7291,7 @@ HingeJoint: m_Anchor: {x: 0, y: 1.00000119, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 2.06477111e-08, y: -1.23999691, z: -1.14729744e-06} + m_ConnectedAnchor: {x: 2.06468709e-08, y: -1.23999822, z: 1.20217567e-06} m_UseSpring: 0 m_Spring: spring: 0 @@ -8099,7 +8099,7 @@ ConfigurableJoint: m_Anchor: {x: 0, y: 1, z: 0} m_Axis: {x: 0, y: 0, z: -1} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 3.3812077e-07, y: -1.67636263, z: 4.03071402e-14} + m_ConnectedAnchor: {x: 3.38120429e-07, y: -1.67636001, z: 4.03070996e-14} serializedVersion: 2 m_SecondaryAxis: {x: 0, y: 1, z: 0} m_XMotion: 0 diff --git a/Assets/scenes/PatScene.unity b/Assets/scenes/GameplayScene.unity similarity index 80% rename from Assets/scenes/PatScene.unity rename to Assets/scenes/GameplayScene.unity index a9a57fb..fffea18 100644 --- a/Assets/scenes/PatScene.unity +++ b/Assets/scenes/GameplayScene.unity @@ -145,6 +145,156 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1229110618} m_Script: {fileID: 11500000, guid: 0f36f7c8f7d8e03418efcbf2c3645cd8, type: 3} +--- !u!1 &503598920 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 503598921} + - 33: {fileID: 503598924} + - 64: {fileID: 503598923} + - 23: {fileID: 503598922} + m_Layer: 0 + m_Name: Wall1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &503598921 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503598920} + m_LocalRotation: {x: -1.15202326e-07, y: .707106709, z: -.707106829, w: -1.15202312e-07} + m_LocalPosition: {x: 6.44496918, y: 8.67438602, z: 81.0783768} + m_LocalScale: {x: 20, y: 1, z: 100} + m_Children: [] + m_Father: {fileID: 980006083} + m_RootOrder: 3 +--- !u!23 &503598922 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503598920} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: 5fde9315c536b1e4b828c246cd94c2d9, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!64 &503598923 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503598920} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &503598924 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 503598920} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &677278604 stripped +GameObject: + m_PrefabParentObject: {fileID: 119668, guid: 435740a68d38e76438007304b084ccf7, type: 2} + m_PrefabInternal: {fileID: 2031148190} +--- !u!1 &696605479 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 696605480} + - 33: {fileID: 696605483} + - 64: {fileID: 696605482} + - 23: {fileID: 696605481} + m_Layer: 0 + m_Name: Wall4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &696605480 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 696605479} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: 6.44496918, y: 8.67438602, z: -5.37162209} + m_LocalScale: {x: 20, y: 1, z: 100} + m_Children: [] + m_Father: {fileID: 980006083} + m_RootOrder: 0 +--- !u!23 &696605481 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 696605479} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!64 &696605482 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 696605479} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &696605483 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 696605479} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &867116874 GameObject: m_ObjectHideFlags: 0 @@ -169,9 +319,9 @@ BoxCollider: m_GameObject: {fileID: 867116874} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 - m_Size: {x: 100, y: 1, z: 100} + m_Size: {x: 1000, y: 1, z: 1000} m_Center: {x: 0, y: 0, z: 0} --- !u!4 &867116876 Transform: @@ -184,7 +334,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 8 --- !u!54 &939277556 stripped Rigidbody: m_PrefabParentObject: {fileID: 5463890, guid: d9aa98efb3480c8438047a4565cd1893, @@ -196,6 +346,37 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1778514724} m_Script: {fileID: 11500000, guid: 0f36f7c8f7d8e03418efcbf2c3645cd8, type: 3} +--- !u!1 &980006082 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 980006083} + m_Layer: 0 + m_Name: Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &980006083 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 980006082} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 55.5550308, y: 5.12561417, z: -12.0783787} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 696605480} + - {fileID: 1379849936} + - {fileID: 1589454194} + - {fileID: 503598921} + m_Father: {fileID: 0} + m_RootOrder: 1 --- !u!1 &1008797114 GameObject: m_ObjectHideFlags: 0 @@ -208,6 +389,7 @@ GameObject: - 92: {fileID: 1008797117} - 124: {fileID: 1008797116} - 81: {fileID: 1008797115} + - 114: {fileID: 1008797120} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -276,12 +458,27 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1008797114} - m_LocalRotation: {x: .484580696, y: 0, z: 0, w: .874746561} - m_LocalPosition: {x: 0, y: 13.8000002, z: -8.89999962} + m_LocalRotation: {x: .360729486, y: 7.61585568e-08, z: 7.61585568e-08, w: .932670474} + m_LocalPosition: {x: .449999988, y: 15.1800003, z: -3.75} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 +--- !u!114 &1008797120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1008797114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ff49a309510a6849bd5534bae4657b1, type: 3} + m_Name: + m_EditorClassIdentifier: + targetTransform: {fileID: 1296647346} + y: 2.5 + offsetZ: -2.20000005 + smooth: 1.5 --- !u!1 &1018231122 GameObject: m_ObjectHideFlags: 0 @@ -377,12 +574,12 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1052409465} - m_LocalRotation: {x: .167316198, y: -.254906625, z: .0448322445, w: .951324344} + m_LocalRotation: {x: .517266095, y: -.437676072, z: .350017846, w: .646809816} m_LocalPosition: {x: 15.0299997, y: -.0199999809, z: 8.30000019} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 6 --- !u!1 &1173224166 GameObject: m_ObjectHideFlags: 0 @@ -425,7 +622,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 7 --- !u!1001 &1229110618 Prefab: m_ObjectHideFlags: 0 @@ -435,7 +632,7 @@ Prefab: m_Modifications: - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.x - value: 7.96999979 + value: 8.48280144 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.y @@ -443,7 +640,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.z - value: 4.5999999 + value: 7.12815189 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.x @@ -451,7 +648,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.y - value: .50000006 + value: .865151525 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.z @@ -459,11 +656,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.w - value: .866025388 + value: .50151068 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_RootOrder - value: 9 + value: 13 objectReference: {fileID: 0} - target: {fileID: 198936, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_Name @@ -483,7 +680,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: MoveSpeed - value: 50 + value: 70 objectReference: {fileID: 0} - target: {fileID: 5463890, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_UseGravity @@ -803,11 +1000,23 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: DashForce - value: 200 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} + propertyPath: m_LocalScale.z + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1296647346 stripped +Transform: + m_PrefabParentObject: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} + m_PrefabInternal: {fileID: 2031148190} --- !u!1001 &1344668562 Prefab: m_ObjectHideFlags: 0 @@ -862,6 +1071,83 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0a3031db8d5701f47984a4267336a83f, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1379849935 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1379849936} + - 33: {fileID: 1379849939} + - 64: {fileID: 1379849938} + - 23: {fileID: 1379849937} + m_Layer: 0 + m_Name: Wall3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1379849936 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379849935} + m_LocalRotation: {x: .5, y: .5, z: -.500000119, w: .49999994} + m_LocalPosition: {x: -82.8550262, y: 8.87438583, z: 81.0783768} + m_LocalScale: {x: 20, y: 1, z: 100} + m_Children: [] + m_Father: {fileID: 980006083} + m_RootOrder: 1 +--- !u!23 &1379849937 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379849935} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!64 &1379849938 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379849935} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1379849939 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1379849935} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1409712406 stripped +GameObject: + m_PrefabParentObject: {fileID: 122180, guid: 435740a68d38e76438007304b084ccf7, type: 2} + m_PrefabInternal: {fileID: 2031148190} --- !u!114 &1454034002 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, @@ -873,6 +1159,79 @@ Rigidbody: m_PrefabParentObject: {fileID: 5463890, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} m_PrefabInternal: {fileID: 1682839029} +--- !u!1 &1589454193 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1589454194} + - 33: {fileID: 1589454197} + - 64: {fileID: 1589454196} + - 23: {fileID: 1589454195} + m_Layer: 0 + m_Name: Wall2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1589454194 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1589454193} + m_LocalRotation: {x: .5, y: -.5, z: .500000119, w: .49999994} + m_LocalPosition: {x: 97.6949692, y: 8.87438583, z: 81.0783768} + m_LocalScale: {x: 20, y: 1, z: 100} + m_Children: [] + m_Father: {fileID: 980006083} + m_RootOrder: 2 +--- !u!23 &1589454195 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1589454193} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!64 &1589454196 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1589454193} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1589454197 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1589454193} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1682839029 Prefab: m_ObjectHideFlags: 0 @@ -882,7 +1241,7 @@ Prefab: m_Modifications: - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.x - value: -8.06999969 + value: .457580566 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.y @@ -890,7 +1249,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.z - value: 4.6500001 + value: 21.0162735 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.x @@ -898,7 +1257,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.y - value: .499999821 + value: .00174507499 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.z @@ -906,11 +1265,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.w - value: -.866025507 + value: -.99999851 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_RootOrder - value: 8 + value: 12 objectReference: {fileID: 0} - target: {fileID: 198936, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_Name @@ -926,7 +1285,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: MoveSpeed - value: 50 + value: 70 objectReference: {fileID: 0} - target: {fileID: 5463890, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_UseGravity @@ -1246,7 +1605,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: DashForce - value: 200 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} + propertyPath: m_LocalScale.z + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} @@ -1311,7 +1678,7 @@ Prefab: m_Modifications: - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.x - value: -0 + value: -7.48783016 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.y @@ -1319,7 +1686,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalPosition.z - value: -9.23999977 + value: 7.05462933 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.x @@ -1327,7 +1694,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.y - value: 1 + value: .866896689 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.z @@ -1335,11 +1702,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_LocalRotation.w - value: -1.62920685e-07 + value: -.498487949 objectReference: {fileID: 0} - target: {fileID: 473846, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_RootOrder - value: 7 + value: 11 objectReference: {fileID: 0} - target: {fileID: 198936, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_Name @@ -1363,7 +1730,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: MoveSpeed - value: 50 + value: 70 objectReference: {fileID: 0} - target: {fileID: 5463890, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: m_UseGravity @@ -1683,11 +2050,88 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 11431374, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} propertyPath: DashForce - value: 200 + value: 300 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: d9aa98efb3480c8438047a4565cd1893, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1863264374 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1863264378} + - 33: {fileID: 1863264377} + - 64: {fileID: 1863264376} + - 23: {fileID: 1863264375} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1863264375 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1863264374} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!64 &1863264376 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1863264374} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1863264377 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1863264374} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1863264378 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1863264374} + m_LocalRotation: {x: -1.15202326e-07, y: .707106709, z: -.707106829, w: -1.15202312e-07} + m_LocalPosition: {x: 0, y: 13.8000002, z: 143.5} + m_LocalScale: {x: 100, y: 1, z: 100} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 +--- !u!1 &1874270281 stripped +GameObject: + m_PrefabParentObject: {fileID: 149060, guid: 435740a68d38e76438007304b084ccf7, type: 2} + m_PrefabInternal: {fileID: 2031148190} --- !u!1001 &2031148190 Prefab: m_ObjectHideFlags: 0 @@ -1695,17 +2139,25 @@ Prefab: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: Ropes.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.size + value: 3 + objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: .498067856 objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 1.07999992 objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 11.7025318 objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalRotation.x @@ -1713,7 +2165,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: .4984878 objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalRotation.z @@ -1721,11 +2173,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_LocalRotation.w - value: 1 + value: .866896749 objectReference: {fileID: 0} - target: {fileID: 447650, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_RootOrder - value: 2 + value: 10 objectReference: {fileID: 0} - target: {fileID: 2308356, guid: 435740a68d38e76438007304b084ccf7, type: 2} propertyPath: m_Materials.Array.data[0] @@ -1751,6 +2203,42 @@ Prefab: propertyPath: m_ConnectedBody value: objectReference: {fileID: 939277556} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: Ropes.Array.data[0] + value: + objectReference: {fileID: 1409712406} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: Ropes.Array.data[1] + value: + objectReference: {fileID: 677278604} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: Ropes.Array.data[2] + value: + objectReference: {fileID: 1874270281} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.data[0].r + value: .448275924 + objectReference: {fileID: 0} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.data[0].g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.data[0].b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.data[1].r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.data[1].g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11404228, guid: 435740a68d38e76438007304b084ccf7, type: 2} + propertyPath: DashColors.Array.data[1].b + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 435740a68d38e76438007304b084ccf7, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/scenes/PatScene.unity.meta b/Assets/scenes/GameplayScene.unity.meta similarity index 100% rename from Assets/scenes/PatScene.unity.meta rename to Assets/scenes/GameplayScene.unity.meta diff --git a/Assets/scripts/Character.cs b/Assets/scripts/Character.cs index 1458a5d..281ca22 100644 --- a/Assets/scripts/Character.cs +++ b/Assets/scripts/Character.cs @@ -15,7 +15,7 @@ public class Character : MonoBehaviour private Rigidbody rb; private Quaternion targetRot; - private float dashRemainingTime = 0f; + private float dashRemainingTime = 6f; private bool isDashing = false; private int playerId; @@ -41,8 +41,6 @@ public class Character : MonoBehaviour void Update() { - Debug.Log(rb.velocity.magnitude); - if (dashRemainingTime > 0) { dashRemainingTime = Mathf.Clamp(dashRemainingTime - Time.deltaTime, 0f, DashCooldown); @@ -89,6 +87,8 @@ public class Character : MonoBehaviour { if (dashRemainingTime > 0f) return false; + selector.ReplenishPlayerDashMeter(playerId); + dashRemainingTime = DashCooldown; StartCoroutine(DashCoroutine()); diff --git a/Assets/scripts/GameState.cs b/Assets/scripts/GameState.cs index 2741605..439859f 100644 --- a/Assets/scripts/GameState.cs +++ b/Assets/scripts/GameState.cs @@ -10,8 +10,8 @@ public class GameState { public int numPlayers = 3; public int wordLength = 5; - public int numRows = 13; - public int numColumns = 5; + public int numRows = 50; + public int numColumns = 30; public Player[] players; private GameState() diff --git a/Assets/scripts/Player.cs b/Assets/scripts/Player.cs index de426e1..c6f5b4a 100644 --- a/Assets/scripts/Player.cs +++ b/Assets/scripts/Player.cs @@ -33,6 +33,8 @@ public class Player { public bool hasNextLetter(int letterNum) { + if (index < 0 || index >= letters.Length) return false; + if (letters[index] == letterNum) { index++; @@ -48,5 +50,5 @@ public class Player { public bool hasWon() { return index >= letters.Length; - } -} + } +} diff --git a/Assets/scripts/RuneBehaviour.cs b/Assets/scripts/RuneBehaviour.cs index c16c438..1fedfe0 100644 --- a/Assets/scripts/RuneBehaviour.cs +++ b/Assets/scripts/RuneBehaviour.cs @@ -21,9 +21,10 @@ public class RuneBehaviour : MonoBehaviour { lightState -= Time.deltaTime / LightTime; if (lightState < 0) lightState = 0; - //symbol.color = new Color(1 - lightState, 1f, 1 - lightState); + symbol.color = new Color(1 - lightState, 1f, 1 - lightState); - symbol.color = new Color(1f - lightState * 0.5f, 1f - lightState * 0.8f, 1f); + //Mauve cool + //symbol.color = new Color(1f - lightState * 0.5f, 1f - lightState * 0.8f, 1f); //symbol.color = new Color(1f - lightState * 0.4f, 1f - lightState * 0.4f, 1f); diff --git a/Assets/scripts/SelectorWithBolts.cs b/Assets/scripts/SelectorWithBolts.cs index 514ff43..ac1292a 100644 --- a/Assets/scripts/SelectorWithBolts.cs +++ b/Assets/scripts/SelectorWithBolts.cs @@ -6,12 +6,32 @@ public class SelectorWithBolts : MonoBehaviour { public Transform[] Bolts; public Transform[] RootCylinders; + public GameObject[] Ropes; + public Color[] DashColors; + + private const float DASH_COOLDOWN = 6f; private Rigidbody rb; + private MeshRenderer[][] playerCylinders; void Awake() { rb = GetComponent(); + + playerCylinders = new MeshRenderer[Ropes.Length][]; + + for (int i = 0; i < Ropes.Length; i++) + { + playerCylinders[i] = Ropes[i].GetComponent().GetComponentsInChildren(); + } + } + + void Start() + { + for (int i = 0; i < Ropes.Length; i++) + { + ReplenishPlayerDashMeter(i); + } } void Update() @@ -23,8 +43,36 @@ public class SelectorWithBolts : MonoBehaviour } } - public void ApplyForce(int playerID, Vector3 force) + public void ReplenishPlayerDashMeter(int playerId) { - rb.AddForceAtPosition(force, Bolts[playerID].position); + ResetRope(playerId); + + StartCoroutine(ReplenishPlayerDashMeterCoroutine(playerId)); + } + + private void ResetRope(int playerId) + { + foreach (MeshRenderer renderer in playerCylinders[playerId]) + { + renderer.material.color = Color.gray; + } + } + + private IEnumerator ReplenishPlayerDashMeterCoroutine(int playerId) + { + float elapsedTime = 0f; + + int cylindersCount = playerCylinders[playerId].Length; + + while (elapsedTime < DASH_COOLDOWN) + { + + elapsedTime += Time.deltaTime; + int cylinderIndex = (int)(elapsedTime * cylindersCount / DASH_COOLDOWN - 1); + Debug.Log(cylinderIndex); + playerCylinders[playerId][cylinderIndex].material.color = DashColors[playerId]; + + yield return null; + } } }