diff --git a/SurvivalIsland/Assets/Book Assets/Models/powerCell.fbx.meta b/SurvivalIsland/Assets/Book Assets/Models/powerCell.fbx.meta index 2334dbe..24948da 100644 --- a/SurvivalIsland/Assets/Book Assets/Models/powerCell.fbx.meta +++ b/SurvivalIsland/Assets/Book Assets/Models/powerCell.fbx.meta @@ -10,6 +10,7 @@ ModelImporter: 2300000: powerCell 3300000: powerCell 4300000: powerCell + 6400000: powerCell 7400000: Default Take 11100000: //RootNode materials: @@ -31,12 +32,12 @@ ModelImporter: isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 1.60000002 meshCompression: 0 - addColliders: 0 + addColliders: 1 importBlendShapes: 1 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 optimizeMeshForGPU: 1 weldVertices: 1 diff --git a/SurvivalIsland/Assets/Book Assets/Textures/hud_charge1.png.meta b/SurvivalIsland/Assets/Book Assets/Textures/hud_charge1.png.meta index 8881447..3aa3e51 100644 --- a/SurvivalIsland/Assets/Book Assets/Textures/hud_charge1.png.meta +++ b/SurvivalIsland/Assets/Book Assets/Textures/hud_charge1.png.meta @@ -5,8 +5,8 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 + enableMipMap: 0 + linearTexture: 1 correctGamma: 0 fadeOut: 0 borderMipMap: 0 @@ -25,10 +25,10 @@ TextureImporter: maxTextureSize: 1024 textureSettings: filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -38,8 +38,8 @@ TextureImporter: spritePivot: {x: .5, y: .5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 2 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/SurvivalIsland/Assets/Scenes.meta b/SurvivalIsland/Assets/Scenes.meta deleted file mode 100644 index 882a61a..0000000 --- a/SurvivalIsland/Assets/Scenes.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 09d1687f585b16a41a3c1e8fea4acbd7 -folderAsset: yes -DefaultImporter: - userData: diff --git a/SurvivalIsland/Assets/Scripts/Inventory.cs b/SurvivalIsland/Assets/Scripts/Inventory.cs new file mode 100644 index 0000000..0497d58 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/Inventory.cs @@ -0,0 +1,17 @@ +using UnityEngine; +using System.Collections; + +public class Inventory : MonoBehaviour { + public static int charge = 0; + public AudioClip collectSound; + + // Use this for initialization + void Start () { + charge = 0; + } + + // Update is called once per frame + void Update () { + AudioSource.PlayClipAtPoint (collectSound, transform.position); charge++; + } +} diff --git a/SurvivalIsland/Assets/Scripts/Inventory.cs.meta b/SurvivalIsland/Assets/Scripts/Inventory.cs.meta new file mode 100644 index 0000000..9006ac0 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/Inventory.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 633af9eff8317514cbc42b3dfa3ad8ca +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/PowerCell.cs b/SurvivalIsland/Assets/Scripts/PowerCell.cs new file mode 100644 index 0000000..794674e --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/PowerCell.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using System.Collections; + +public class PowerCell : MonoBehaviour { + public float rotationSpeed = 100.0f; + + // Update is called once per frame + void Update () { + transform.Rotate (new Vector3 (0, rotationSpeed * Time.deltaTime, 0)); + } + + void OnTriggerEnter(Collider col) { + if (col.gameObject.tag == "Player") { + col.gameObject.SendMessage ("CellPickup"); + Destroy(gameObject); + } + } +} diff --git a/SurvivalIsland/Assets/Scripts/PowerCell.cs.meta b/SurvivalIsland/Assets/Scripts/PowerCell.cs.meta new file mode 100644 index 0000000..44b0987 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/PowerCell.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0cce1119d2a80244884d4ac9ac4a7cf2 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat b/SurvivalIsland/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat index be2d51c..7964af2 100644 Binary files a/SurvivalIsland/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat and b/SurvivalIsland/Assets/Standard Assets/Water (Pro Only)/Sources/Materials/Daylight Water.mat differ diff --git a/SurvivalIsland/Assets/SurvivalIsland.unity b/SurvivalIsland/Assets/SurvivalIsland.unity index c6e5d24..a2d11e6 100644 Binary files a/SurvivalIsland/Assets/SurvivalIsland.unity and b/SurvivalIsland/Assets/SurvivalIsland.unity differ diff --git a/SurvivalIsland/Library/CurrentLayout.dwlt b/SurvivalIsland/Library/CurrentLayout.dwlt index 72634a7..832eba2 100644 Binary files a/SurvivalIsland/Library/CurrentLayout.dwlt and b/SurvivalIsland/Library/CurrentLayout.dwlt differ diff --git a/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt b/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt index 97d4314..4f74f3c 100644 Binary files a/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt and b/SurvivalIsland/Library/CurrentMaximizeLayout.dwlt differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 6732f8e..36c9fa9 100644 Binary files a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll index 7cbee26..bf1e603 100644 Binary files a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll index 7d0ec3f..69af5db 100644 Binary files a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll index ef3418c..e337425 100644 Binary files a/SurvivalIsland/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll differ diff --git a/SurvivalIsland/Library/assetDatabase3 b/SurvivalIsland/Library/assetDatabase3 index a808781..c47ce48 100644 Binary files a/SurvivalIsland/Library/assetDatabase3 and b/SurvivalIsland/Library/assetDatabase3 differ diff --git a/SurvivalIsland/Library/expandedItems b/SurvivalIsland/Library/expandedItems index ac537dc..49d6afc 100644 Binary files a/SurvivalIsland/Library/expandedItems and b/SurvivalIsland/Library/expandedItems differ diff --git a/SurvivalIsland/Library/guidmapper b/SurvivalIsland/Library/guidmapper index 2571826..46f8103 100644 Binary files a/SurvivalIsland/Library/guidmapper and b/SurvivalIsland/Library/guidmapper differ diff --git a/SurvivalIsland/Library/metadata/09/09d1687f585b16a41a3c1e8fea4acbd7 b/SurvivalIsland/Library/metadata/09/09d1687f585b16a41a3c1e8fea4acbd7 deleted file mode 100644 index d83e724..0000000 Binary files a/SurvivalIsland/Library/metadata/09/09d1687f585b16a41a3c1e8fea4acbd7 and /dev/null differ diff --git a/SurvivalIsland/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df b/SurvivalIsland/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df index 3b24022..46774db 100644 Binary files a/SurvivalIsland/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df and b/SurvivalIsland/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df differ diff --git a/SurvivalIsland/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b b/SurvivalIsland/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b index 0481804..985ccaf 100644 Binary files a/SurvivalIsland/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b and b/SurvivalIsland/Library/metadata/0b/0b167d00b3108411a8a963cba5ddde1b differ diff --git a/SurvivalIsland/Library/metadata/0c/0cce1119d2a80244884d4ac9ac4a7cf2 b/SurvivalIsland/Library/metadata/0c/0cce1119d2a80244884d4ac9ac4a7cf2 new file mode 100644 index 0000000..eb3fc74 Binary files /dev/null and b/SurvivalIsland/Library/metadata/0c/0cce1119d2a80244884d4ac9ac4a7cf2 differ diff --git a/SurvivalIsland/Library/metadata/1c/1cac2e0bcc34e4b3cbb4bd85982eba83 b/SurvivalIsland/Library/metadata/1c/1cac2e0bcc34e4b3cbb4bd85982eba83 index 1b06326..f3e1108 100644 Binary files a/SurvivalIsland/Library/metadata/1c/1cac2e0bcc34e4b3cbb4bd85982eba83 and b/SurvivalIsland/Library/metadata/1c/1cac2e0bcc34e4b3cbb4bd85982eba83 differ diff --git a/SurvivalIsland/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381 b/SurvivalIsland/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381 index 3f51dc0..64f8bd9 100644 Binary files a/SurvivalIsland/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381 and b/SurvivalIsland/Library/metadata/1d/1d5ac211a643e447ca78c2d794a16381 differ diff --git a/SurvivalIsland/Library/metadata/1d/1dfa22e5547fb4a4585ba225887d89dd b/SurvivalIsland/Library/metadata/1d/1dfa22e5547fb4a4585ba225887d89dd index b61b33c..08e066b 100644 Binary files a/SurvivalIsland/Library/metadata/1d/1dfa22e5547fb4a4585ba225887d89dd and b/SurvivalIsland/Library/metadata/1d/1dfa22e5547fb4a4585ba225887d89dd differ diff --git a/SurvivalIsland/Library/metadata/2a/2a91e8dd37cdd41efb4859b65aced7a2 b/SurvivalIsland/Library/metadata/2a/2a91e8dd37cdd41efb4859b65aced7a2 index 5ca74b4..4f4f22c 100644 Binary files a/SurvivalIsland/Library/metadata/2a/2a91e8dd37cdd41efb4859b65aced7a2 and b/SurvivalIsland/Library/metadata/2a/2a91e8dd37cdd41efb4859b65aced7a2 differ diff --git a/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a b/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a index 79464d1..99327b6 100644 Binary files a/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a and b/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a differ diff --git a/SurvivalIsland/Library/metadata/33/33f51eb21122c4ca6a199d561065ae30 b/SurvivalIsland/Library/metadata/33/33f51eb21122c4ca6a199d561065ae30 index cd97fb9..a93c9fd 100644 Binary files a/SurvivalIsland/Library/metadata/33/33f51eb21122c4ca6a199d561065ae30 and b/SurvivalIsland/Library/metadata/33/33f51eb21122c4ca6a199d561065ae30 differ diff --git a/SurvivalIsland/Library/metadata/41/4185bc77c7194462ca3b1097ef4a5de0 b/SurvivalIsland/Library/metadata/41/4185bc77c7194462ca3b1097ef4a5de0 index b6551f6..d910592 100644 Binary files a/SurvivalIsland/Library/metadata/41/4185bc77c7194462ca3b1097ef4a5de0 and b/SurvivalIsland/Library/metadata/41/4185bc77c7194462ca3b1097ef4a5de0 differ diff --git a/SurvivalIsland/Library/metadata/42/42e7f46d0e5a84171a3909479c1646ba b/SurvivalIsland/Library/metadata/42/42e7f46d0e5a84171a3909479c1646ba index ceedc26..b4b61f3 100644 Binary files a/SurvivalIsland/Library/metadata/42/42e7f46d0e5a84171a3909479c1646ba and b/SurvivalIsland/Library/metadata/42/42e7f46d0e5a84171a3909479c1646ba differ diff --git a/SurvivalIsland/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 b/SurvivalIsland/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 index dae04ef..bc128a3 100644 Binary files a/SurvivalIsland/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 and b/SurvivalIsland/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 differ diff --git a/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a b/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a index 5f8c74d..4edb77b 100644 Binary files a/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a and b/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a differ diff --git a/SurvivalIsland/Library/metadata/47/475c4a4e617a8401b84ca7b32c7cc460 b/SurvivalIsland/Library/metadata/47/475c4a4e617a8401b84ca7b32c7cc460 index 8ccc608..b01e6fd 100644 Binary files a/SurvivalIsland/Library/metadata/47/475c4a4e617a8401b84ca7b32c7cc460 and b/SurvivalIsland/Library/metadata/47/475c4a4e617a8401b84ca7b32c7cc460 differ diff --git a/SurvivalIsland/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc b/SurvivalIsland/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc index 0768891..d6a650a 100644 Binary files a/SurvivalIsland/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc and b/SurvivalIsland/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc differ diff --git a/SurvivalIsland/Library/metadata/4f/4faf268a5fe97410691cf2cf2c828b57 b/SurvivalIsland/Library/metadata/4f/4faf268a5fe97410691cf2cf2c828b57 index cbb9bd3..8b9463a 100644 Binary files a/SurvivalIsland/Library/metadata/4f/4faf268a5fe97410691cf2cf2c828b57 and b/SurvivalIsland/Library/metadata/4f/4faf268a5fe97410691cf2cf2c828b57 differ diff --git a/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b b/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b index 0e09043..2beb3f5 100644 Binary files a/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b and b/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b differ diff --git a/SurvivalIsland/Library/metadata/5b/5b5c5575fd4c74abd9f7b30862fb76a3 b/SurvivalIsland/Library/metadata/5b/5b5c5575fd4c74abd9f7b30862fb76a3 index 7a69c4c..1e9c6e6 100644 Binary files a/SurvivalIsland/Library/metadata/5b/5b5c5575fd4c74abd9f7b30862fb76a3 and b/SurvivalIsland/Library/metadata/5b/5b5c5575fd4c74abd9f7b30862fb76a3 differ diff --git a/SurvivalIsland/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29 b/SurvivalIsland/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29 index cd28324..b0ee683 100644 Binary files a/SurvivalIsland/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29 and b/SurvivalIsland/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29 differ diff --git a/SurvivalIsland/Library/metadata/63/633af9eff8317514cbc42b3dfa3ad8ca b/SurvivalIsland/Library/metadata/63/633af9eff8317514cbc42b3dfa3ad8ca new file mode 100644 index 0000000..6b23752 Binary files /dev/null and b/SurvivalIsland/Library/metadata/63/633af9eff8317514cbc42b3dfa3ad8ca differ diff --git a/SurvivalIsland/Library/metadata/68/681e41ee1260343b395ca58745c94870 b/SurvivalIsland/Library/metadata/68/681e41ee1260343b395ca58745c94870 index a03b89d..95d63b9 100644 Binary files a/SurvivalIsland/Library/metadata/68/681e41ee1260343b395ca58745c94870 and b/SurvivalIsland/Library/metadata/68/681e41ee1260343b395ca58745c94870 differ diff --git a/SurvivalIsland/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639 b/SurvivalIsland/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639 index a49d395..f1925a1 100644 Binary files a/SurvivalIsland/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639 and b/SurvivalIsland/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639 differ diff --git a/SurvivalIsland/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e b/SurvivalIsland/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e index 3ce2525..9dbe669 100644 Binary files a/SurvivalIsland/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e and b/SurvivalIsland/Library/metadata/6d/6d4fd495600cd4cf0b8ad2caf025f94e differ diff --git a/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 b/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 index f779878..8386364 100644 Binary files a/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 and b/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 differ diff --git a/SurvivalIsland/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f b/SurvivalIsland/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f index 3178133..9cca7e6 100644 Binary files a/SurvivalIsland/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f and b/SurvivalIsland/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f differ diff --git a/SurvivalIsland/Library/metadata/8a/8aaff0751054e4a9cb4642d01eaf5be9 b/SurvivalIsland/Library/metadata/8a/8aaff0751054e4a9cb4642d01eaf5be9 index bda5fc4..9165323 100644 Binary files a/SurvivalIsland/Library/metadata/8a/8aaff0751054e4a9cb4642d01eaf5be9 and b/SurvivalIsland/Library/metadata/8a/8aaff0751054e4a9cb4642d01eaf5be9 differ diff --git a/SurvivalIsland/Library/metadata/95/951d74f7d57bed84cb623c62436bd064 b/SurvivalIsland/Library/metadata/95/951d74f7d57bed84cb623c62436bd064 index c7d8ced..e5abc49 100644 Binary files a/SurvivalIsland/Library/metadata/95/951d74f7d57bed84cb623c62436bd064 and b/SurvivalIsland/Library/metadata/95/951d74f7d57bed84cb623c62436bd064 differ diff --git a/SurvivalIsland/Library/metadata/96/96b2117e72a038e41acc5be055c9c5f9 b/SurvivalIsland/Library/metadata/96/96b2117e72a038e41acc5be055c9c5f9 index 6c4aed2..784920b 100644 Binary files a/SurvivalIsland/Library/metadata/96/96b2117e72a038e41acc5be055c9c5f9 and b/SurvivalIsland/Library/metadata/96/96b2117e72a038e41acc5be055c9c5f9 differ diff --git a/SurvivalIsland/Library/metadata/9c/9c2c627f6fe3945b39581fc103d32251 b/SurvivalIsland/Library/metadata/9c/9c2c627f6fe3945b39581fc103d32251 index bf3361c..14f61d7 100644 Binary files a/SurvivalIsland/Library/metadata/9c/9c2c627f6fe3945b39581fc103d32251 and b/SurvivalIsland/Library/metadata/9c/9c2c627f6fe3945b39581fc103d32251 differ diff --git a/SurvivalIsland/Library/metadata/a1/a1da353243062479a9b31c85074a796b b/SurvivalIsland/Library/metadata/a1/a1da353243062479a9b31c85074a796b index e4865e2..0f1e500 100644 Binary files a/SurvivalIsland/Library/metadata/a1/a1da353243062479a9b31c85074a796b and b/SurvivalIsland/Library/metadata/a1/a1da353243062479a9b31c85074a796b differ diff --git a/SurvivalIsland/Library/metadata/a3/a3d3ef1a5bbfb4e0a910fbbe5830b1f9 b/SurvivalIsland/Library/metadata/a3/a3d3ef1a5bbfb4e0a910fbbe5830b1f9 index 53bbd4d..781ee0c 100644 Binary files a/SurvivalIsland/Library/metadata/a3/a3d3ef1a5bbfb4e0a910fbbe5830b1f9 and b/SurvivalIsland/Library/metadata/a3/a3d3ef1a5bbfb4e0a910fbbe5830b1f9 differ diff --git a/SurvivalIsland/Library/metadata/ae/ae162c0523ab4468bb03ef160eb672e2 b/SurvivalIsland/Library/metadata/ae/ae162c0523ab4468bb03ef160eb672e2 index c5bdb40..9cffc86 100644 Binary files a/SurvivalIsland/Library/metadata/ae/ae162c0523ab4468bb03ef160eb672e2 and b/SurvivalIsland/Library/metadata/ae/ae162c0523ab4468bb03ef160eb672e2 differ diff --git a/SurvivalIsland/Library/metadata/ba/ba6a41dc489914734857bb5924eb70ad b/SurvivalIsland/Library/metadata/ba/ba6a41dc489914734857bb5924eb70ad index ff47733..395accf 100644 Binary files a/SurvivalIsland/Library/metadata/ba/ba6a41dc489914734857bb5924eb70ad and b/SurvivalIsland/Library/metadata/ba/ba6a41dc489914734857bb5924eb70ad differ diff --git a/SurvivalIsland/Library/metadata/c6/c62b7d87755b447919138e67f8e22e0c b/SurvivalIsland/Library/metadata/c6/c62b7d87755b447919138e67f8e22e0c index c916709..ae6f0ac 100644 Binary files a/SurvivalIsland/Library/metadata/c6/c62b7d87755b447919138e67f8e22e0c and b/SurvivalIsland/Library/metadata/c6/c62b7d87755b447919138e67f8e22e0c differ diff --git a/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 b/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 index 4e9bdc8..6f51186 100644 Binary files a/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 and b/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 differ diff --git a/SurvivalIsland/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3 b/SurvivalIsland/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3 index a21b59d..a80f3ff 100644 Binary files a/SurvivalIsland/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3 and b/SurvivalIsland/Library/metadata/da/da93ddd6928094e24bb1f3f665f143d3 differ diff --git a/SurvivalIsland/Library/metadata/de/de2ab2b9ac93bb544b9552e49030371b b/SurvivalIsland/Library/metadata/de/de2ab2b9ac93bb544b9552e49030371b index adb51e5..0848b8a 100644 Binary files a/SurvivalIsland/Library/metadata/de/de2ab2b9ac93bb544b9552e49030371b and b/SurvivalIsland/Library/metadata/de/de2ab2b9ac93bb544b9552e49030371b differ diff --git a/SurvivalIsland/Library/metadata/e4/e4ef7a64bb14d407eab4ff1f33a2bf7d b/SurvivalIsland/Library/metadata/e4/e4ef7a64bb14d407eab4ff1f33a2bf7d index 7b2968c..a823f42 100644 Binary files a/SurvivalIsland/Library/metadata/e4/e4ef7a64bb14d407eab4ff1f33a2bf7d and b/SurvivalIsland/Library/metadata/e4/e4ef7a64bb14d407eab4ff1f33a2bf7d differ diff --git a/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc b/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc index 2cbdce2..49bc188 100644 Binary files a/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc and b/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc differ diff --git a/SurvivalIsland/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 b/SurvivalIsland/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 index b83d123..1e166a7 100644 Binary files a/SurvivalIsland/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 and b/SurvivalIsland/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 differ diff --git a/SurvivalIsland/Library/metadata/f6/f67f2bac30f824d4f8270bb8bb0779df b/SurvivalIsland/Library/metadata/f6/f67f2bac30f824d4f8270bb8bb0779df index c88cd8e..c0e9764 100644 Binary files a/SurvivalIsland/Library/metadata/f6/f67f2bac30f824d4f8270bb8bb0779df and b/SurvivalIsland/Library/metadata/f6/f67f2bac30f824d4f8270bb8bb0779df differ diff --git a/SurvivalIsland/Library/metadata/ff/ff3b0e14a61014f50be83e1a18c6d43e b/SurvivalIsland/Library/metadata/ff/ff3b0e14a61014f50be83e1a18c6d43e index 47a4adf..8f59a0e 100644 Binary files a/SurvivalIsland/Library/metadata/ff/ff3b0e14a61014f50be83e1a18c6d43e and b/SurvivalIsland/Library/metadata/ff/ff3b0e14a61014f50be83e1a18c6d43e differ diff --git a/SurvivalIsland/Library/shadercompiler-1.log b/SurvivalIsland/Library/shadercompiler-1.log index e00fefb..0f95b4e 100644 --- a/SurvivalIsland/Library/shadercompiler-1.log +++ b/SurvivalIsland/Library/shadercompiler-1.log @@ -1,3 +1,9 @@ -Base path: D:/Unity/Editor/Data -Pipe name: \\.\pipe\UnityShaderCompiler-1-25372 +Base path: C:/Program Files (x86)/Unity/Editor/Data +Pipe name: \\.\pipe\UnityShaderCompiler-1-9540 Cmd: getPlatforms +Cmd: preprocess + insize=5351 outsize=2168 ok=1 +Cmd: preprocess + insize=13357 outsize=2694 ok=1 +Cmd: preprocess + insize=12509 outsize=2575 ok=1 diff --git a/SurvivalIsland/ProjectSettings/TagManager.asset b/SurvivalIsland/ProjectSettings/TagManager.asset index c9d8372..13b6a4d 100644 Binary files a/SurvivalIsland/ProjectSettings/TagManager.asset and b/SurvivalIsland/ProjectSettings/TagManager.asset differ