diff --git a/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat b/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat index 6e7f8c8..9cc354b 100644 Binary files a/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat and b/CollectCoins/Assets/Book Assets/Models/Materials/bark_2.mat differ diff --git a/CollectCoins/Assets/Book Assets/Sounds/menu_beep.wav.meta b/CollectCoins/Assets/Book Assets/Sounds/menu_beep.wav.meta index ec5659d..fd63000 100644 --- a/CollectCoins/Assets/Book Assets/Sounds/menu_beep.wav.meta +++ b/CollectCoins/Assets/Book Assets/Sounds/menu_beep.wav.meta @@ -3,9 +3,9 @@ guid: 5ef113ab4bf224549ac9ba830450588d AudioImporter: serializedVersion: 4 format: -1 - quality: -1 + quality: .5 stream: 1 - 3D: 1 + 3D: 0 forceToMono: 0 useHardware: 0 loopable: 0 diff --git a/CollectCoins/Assets/Prefabs/Coin.prefab b/CollectCoins/Assets/Prefabs/Coin.prefab index c0a635b..bc0230e 100644 Binary files a/CollectCoins/Assets/Prefabs/Coin.prefab and b/CollectCoins/Assets/Prefabs/Coin.prefab differ diff --git a/CollectCoins/Assets/Scenes/CollectCoins.unity b/CollectCoins/Assets/Scenes/game.unity similarity index 66% rename from CollectCoins/Assets/Scenes/CollectCoins.unity rename to CollectCoins/Assets/Scenes/game.unity index dc3ad7f..d4774c8 100644 Binary files a/CollectCoins/Assets/Scenes/CollectCoins.unity and b/CollectCoins/Assets/Scenes/game.unity differ diff --git a/CollectCoins/Assets/Scenes/CollectCoins.unity.meta b/CollectCoins/Assets/Scenes/game.unity.meta similarity index 100% rename from CollectCoins/Assets/Scenes/CollectCoins.unity.meta rename to CollectCoins/Assets/Scenes/game.unity.meta diff --git a/CollectCoins/Assets/Scenes/menu.unity b/CollectCoins/Assets/Scenes/menu.unity new file mode 100644 index 0000000..117e278 Binary files /dev/null and b/CollectCoins/Assets/Scenes/menu.unity differ diff --git a/CollectCoins/Assets/Scenes/menu.unity.meta b/CollectCoins/Assets/Scenes/menu.unity.meta new file mode 100644 index 0000000..2962ce8 --- /dev/null +++ b/CollectCoins/Assets/Scenes/menu.unity.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: bcc445ac71ae47b40833dde313b86586 +DefaultImporter: + userData: diff --git a/CollectCoins/Assets/Scripts/CoinScript.cs b/CollectCoins/Assets/Scripts/CoinScript.cs index 557cfe7..c9d7a0f 100644 --- a/CollectCoins/Assets/Scripts/CoinScript.cs +++ b/CollectCoins/Assets/Scripts/CoinScript.cs @@ -5,13 +5,24 @@ public class CoinScript : MonoBehaviour { public float rotationSpeed = 100.0f; GameObject player; + public float rotationCenterSpeed = 50f; + public Vector3 centerPosition; + private Color startColor; + public float colorChangeSpeed = 0.1f; void Start () { player = GameObject.Find("First Person Controller"); + startColor = renderer.material.color; } void Update () { transform.Rotate(0, 0, rotationSpeed * Time.deltaTime); + + transform.RotateAround(centerPosition, Vector3.up, Time.deltaTime * rotationCenterSpeed); + + float change = Mathf.PingPong(colorChangeSpeed * Time.time, 1f); + Color newColor = Color.Lerp(startColor, Color.red, change); + renderer.material.color = newColor; } void OnTriggerEnter(Collider collider) diff --git a/CollectCoins/Assets/Scripts/CoinSpawnerScript.cs b/CollectCoins/Assets/Scripts/CoinSpawnerScript.cs new file mode 100644 index 0000000..6b8d190 --- /dev/null +++ b/CollectCoins/Assets/Scripts/CoinSpawnerScript.cs @@ -0,0 +1,40 @@ +using UnityEngine; +using System.Collections; + +public class CoinSpawnerScript : MonoBehaviour { + + public int maxCoinCount = 8; + public int minCoinCount = 4; + public GameObject coinPrefab; + public float radius = 3f; + public GameObject floor; + float floorLength; + float floorWidth; + + + // Use this for initialization + void Start () { + floorLength = floor.transform.localScale.x; + floorWidth = floor.transform.localScale.z; + } + + // Update is called once per frame + void Update () { + if (!GameObject.FindGameObjectWithTag("Coin")) + { + int count = Random.Range(minCoinCount, maxCoinCount); + float x = Random.Range(-floorLength / 2, floorLength / 2); + float z = Random.Range(-floorWidth / 2, floorWidth / 2); + for (int i = 0;i < count; i++) + { + float angle = 2 * Mathf.PI / count * i; + Vector3 pos = new Vector3(Mathf.Cos(angle), 0, Mathf.Sin(angle)) * radius; + Vector3 center = new Vector3(x, 0, z) + transform.position; + GameObject coin = Instantiate(coinPrefab, center + pos, Quaternion.Euler(90, 0, 0)) as GameObject; + coin.transform.SetParent(transform); + + coin.GetComponent().centerPosition = center; + } + } + } +} diff --git a/CollectCoins/Assets/Scripts/CoinSpawnerScript.cs.meta b/CollectCoins/Assets/Scripts/CoinSpawnerScript.cs.meta new file mode 100644 index 0000000..3c06c73 --- /dev/null +++ b/CollectCoins/Assets/Scripts/CoinSpawnerScript.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8733077bd5267d04fb5b9a81d3c3ecf4 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/CollectCoins/Assets/Scripts/MainMenuButtonScript.cs b/CollectCoins/Assets/Scripts/MainMenuButtonScript.cs new file mode 100644 index 0000000..7abff68 --- /dev/null +++ b/CollectCoins/Assets/Scripts/MainMenuButtonScript.cs @@ -0,0 +1,47 @@ +using UnityEngine; +using System.Collections; + +[RequireComponent (typeof(AudioSource))] +public class MainMenuButtonScript : MonoBehaviour { + + public string levelToLoad; + public Texture2D startTexture; + public Texture2D rollOverTexture; + public bool isPlayButton = false; + public bool isQuitButton = false; + public AudioClip beep; + + + void OnMouseEnter() + { + guiTexture.texture = rollOverTexture; + } + + void OnMouseExit() + { + guiTexture.texture = startTexture; + } + + IEnumerator OnMouseUp() + { + audio.PlayOneShot(beep); + yield return new WaitForSeconds(0.35f); + if (isQuitButton ) + { + Application.Quit(); + } else if (isPlayButton ) + { + Application.LoadLevel(levelToLoad); + } + } + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } +} diff --git a/CollectCoins/Assets/Scripts/MainMenuButtonScript.cs.meta b/CollectCoins/Assets/Scripts/MainMenuButtonScript.cs.meta new file mode 100644 index 0000000..f195f35 --- /dev/null +++ b/CollectCoins/Assets/Scripts/MainMenuButtonScript.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a5121dca6ee2a64ca0e83e04f06b702 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/CollectCoins/Assets/Scripts/TargetScript.cs b/CollectCoins/Assets/Scripts/TargetScript.cs index 6e454a3..446cf02 100644 --- a/CollectCoins/Assets/Scripts/TargetScript.cs +++ b/CollectCoins/Assets/Scripts/TargetScript.cs @@ -27,6 +27,10 @@ public class TargetScript : MonoBehaviour { } } + /// + /// 击中靶子 + /// + /// IEnumerator targetHit() { targetRoot.Play("down"); diff --git a/CollectCoins/Assets/Scripts/TextHintScript.cs b/CollectCoins/Assets/Scripts/TextHintScript.cs index d5ab355..a5f3dda 100644 --- a/CollectCoins/Assets/Scripts/TextHintScript.cs +++ b/CollectCoins/Assets/Scripts/TextHintScript.cs @@ -8,6 +8,7 @@ public class TextHintScript : MonoBehaviour { public float maxShowTime = 3.0f; float timer = 0.0f; public int maxfontSize = 100; + public int startFontSize = 25; void Start () { @@ -26,6 +27,7 @@ public class TextHintScript : MonoBehaviour { { guiText.enabled = false; timer = 0.0f; + guiText.fontSize = startFontSize; } } diff --git a/CollectCoins/Assets/Sounds/bgm.mp3 b/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3 similarity index 100% rename from CollectCoins/Assets/Sounds/bgm.mp3 rename to CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3 diff --git a/CollectCoins/Assets/Sounds/bgm.mp3.meta b/CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3.meta similarity index 100% rename from CollectCoins/Assets/Sounds/bgm.mp3.meta rename to CollectCoins/Assets/Sounds/Synth5 - Barrier.mp3.meta diff --git a/CollectCoins/Library/AssetServerCacheV3 b/CollectCoins/Library/AssetServerCacheV3 index 353f4dc..44229d5 100644 Binary files a/CollectCoins/Library/AssetServerCacheV3 and b/CollectCoins/Library/AssetServerCacheV3 differ diff --git a/CollectCoins/Library/CurrentLayout.dwlt b/CollectCoins/Library/CurrentLayout.dwlt index 3a9348c..6933af0 100644 Binary files a/CollectCoins/Library/CurrentLayout.dwlt and b/CollectCoins/Library/CurrentLayout.dwlt differ diff --git a/CollectCoins/Library/CurrentMaximizeLayout.dwlt b/CollectCoins/Library/CurrentMaximizeLayout.dwlt index 318a8a9..95de596 100644 Binary files a/CollectCoins/Library/CurrentMaximizeLayout.dwlt and b/CollectCoins/Library/CurrentMaximizeLayout.dwlt differ diff --git a/CollectCoins/Library/InspectorExpandedItems.asset b/CollectCoins/Library/InspectorExpandedItems.asset index 06bbd3f..4f69c77 100644 Binary files a/CollectCoins/Library/InspectorExpandedItems.asset and b/CollectCoins/Library/InspectorExpandedItems.asset differ diff --git a/CollectCoins/Library/ProjectSettings.asset b/CollectCoins/Library/ProjectSettings.asset index 33455ff..bff40ca 100644 Binary files a/CollectCoins/Library/ProjectSettings.asset and b/CollectCoins/Library/ProjectSettings.asset differ diff --git a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll index 87a73fb..0f7c070 100644 Binary files a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll and b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll differ diff --git a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll index e0ee691..8540f71 100644 Binary files a/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll and b/CollectCoins/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll b/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll index cfd02e8..03cd5fb 100644 Binary files a/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll and b/CollectCoins/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll differ diff --git a/CollectCoins/Library/assetDatabase3 b/CollectCoins/Library/assetDatabase3 index 9c30b07..05b16a2 100644 Binary files a/CollectCoins/Library/assetDatabase3 and b/CollectCoins/Library/assetDatabase3 differ diff --git a/CollectCoins/Library/expandedItems b/CollectCoins/Library/expandedItems index 1ba4bc6..2caa90e 100644 Binary files a/CollectCoins/Library/expandedItems and b/CollectCoins/Library/expandedItems differ diff --git a/CollectCoins/Library/guidmapper b/CollectCoins/Library/guidmapper index afbebe6..0f3939a 100644 Binary files a/CollectCoins/Library/guidmapper and b/CollectCoins/Library/guidmapper differ diff --git a/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a b/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a index c020cb0..f11ab3c 100644 Binary files a/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a and b/CollectCoins/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a differ diff --git a/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 b/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 index ff3a618..5764a2d 100644 Binary files a/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 and b/CollectCoins/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59 differ diff --git a/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a b/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a index 89c8bb6..a4773d9 100644 Binary files a/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a and b/CollectCoins/Library/metadata/46/46343425c2eef44398d93b235cc6378a differ diff --git a/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 b/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 index cd017f9..3ca3ddc 100644 Binary files a/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 and b/CollectCoins/Library/metadata/48/48fc5b65d94de48af9c2fd1b270db997 differ diff --git a/CollectCoins/Library/metadata/4a/4a5121dca6ee2a64ca0e83e04f06b702 b/CollectCoins/Library/metadata/4a/4a5121dca6ee2a64ca0e83e04f06b702 new file mode 100644 index 0000000..073d68a Binary files /dev/null and b/CollectCoins/Library/metadata/4a/4a5121dca6ee2a64ca0e83e04f06b702 differ diff --git a/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b b/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b index c31ae3e..e08f1ab 100644 Binary files a/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b and b/CollectCoins/Library/metadata/52/527b563e83815419cbb75081cc0a594b differ diff --git a/CollectCoins/Library/metadata/5e/5ef113ab4bf224549ac9ba830450588d b/CollectCoins/Library/metadata/5e/5ef113ab4bf224549ac9ba830450588d index f65c620..a2e4179 100644 Binary files a/CollectCoins/Library/metadata/5e/5ef113ab4bf224549ac9ba830450588d and b/CollectCoins/Library/metadata/5e/5ef113ab4bf224549ac9ba830450588d differ diff --git a/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 b/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 index d682659..940650b 100644 Binary files a/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 and b/CollectCoins/Library/metadata/60/6016e4bf32bdd7b4b825e06965ff6377 differ diff --git a/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 b/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 index 39725c4..56caa40 100644 Binary files a/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 and b/CollectCoins/Library/metadata/64/647fbd98c5dd8cf449638baf77c5e6a6 differ diff --git a/CollectCoins/Library/metadata/64/64cf3671ca23b5b418bce84e3690cfe0 b/CollectCoins/Library/metadata/64/64cf3671ca23b5b418bce84e3690cfe0 index 7f1e702..7a46f0c 100644 Binary files a/CollectCoins/Library/metadata/64/64cf3671ca23b5b418bce84e3690cfe0 and b/CollectCoins/Library/metadata/64/64cf3671ca23b5b418bce84e3690cfe0 differ diff --git a/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 b/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 index 05ab615..4301b73 100644 Binary files a/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 and b/CollectCoins/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 differ diff --git a/CollectCoins/Library/metadata/87/8733077bd5267d04fb5b9a81d3c3ecf4 b/CollectCoins/Library/metadata/87/8733077bd5267d04fb5b9a81d3c3ecf4 new file mode 100644 index 0000000..e02d3d3 Binary files /dev/null and b/CollectCoins/Library/metadata/87/8733077bd5267d04fb5b9a81d3c3ecf4 differ diff --git a/CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 b/CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 index ab41f74..3442e80 100644 Binary files a/CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 and b/CollectCoins/Library/metadata/b4/b48fc750d71b8134397184c342c2bcc3 differ diff --git a/CollectCoins/Library/metadata/bc/bcc445ac71ae47b40833dde313b86586 b/CollectCoins/Library/metadata/bc/bcc445ac71ae47b40833dde313b86586 new file mode 100644 index 0000000..8bd71bb Binary files /dev/null and b/CollectCoins/Library/metadata/bc/bcc445ac71ae47b40833dde313b86586 differ diff --git a/CollectCoins/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc b/CollectCoins/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc index 97c24fc..108274f 100644 Binary files a/CollectCoins/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc and b/CollectCoins/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc differ diff --git a/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 b/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 index 57e2a94..ac064aa 100644 Binary files a/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 and b/CollectCoins/Library/metadata/fd/fd60e17f43a90984298774cd0c767130 differ diff --git a/CollectCoins/ProjectSettings/EditorBuildSettings.asset b/CollectCoins/ProjectSettings/EditorBuildSettings.asset index 71655d7..7ac1563 100644 Binary files a/CollectCoins/ProjectSettings/EditorBuildSettings.asset and b/CollectCoins/ProjectSettings/EditorBuildSettings.asset differ diff --git a/CollectCoins/ProjectSettings/ProjectSettings.asset b/CollectCoins/ProjectSettings/ProjectSettings.asset index 33455ff..bff40ca 100644 Binary files a/CollectCoins/ProjectSettings/ProjectSettings.asset and b/CollectCoins/ProjectSettings/ProjectSettings.asset differ diff --git a/CollectCoins/ProjectSettings/QualitySettings.asset b/CollectCoins/ProjectSettings/QualitySettings.asset index 2199b39..3d8cfe5 100644 Binary files a/CollectCoins/ProjectSettings/QualitySettings.asset and b/CollectCoins/ProjectSettings/QualitySettings.asset differ diff --git a/SurvivalIsland/Assets/Scripts/CoconutThrower.cs.meta b/SurvivalIsland/Assets/Scripts/CoconutThrower.cs.meta new file mode 100644 index 0000000..9120320 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/CoconutThrower.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85cba2d465ac9ab4d8064e0b99aaa7dd +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/CoconutWin.cs.meta b/SurvivalIsland/Assets/Scripts/CoconutWin.cs.meta new file mode 100644 index 0000000..599883c --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/CoconutWin.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4ccbd406b9ee9a4dbf41adad9400abe +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/DoorManager.cs b/SurvivalIsland/Assets/Scripts/DoorManager.cs index 1303fae..b7ae018 100644 --- a/SurvivalIsland/Assets/Scripts/DoorManager.cs +++ b/SurvivalIsland/Assets/Scripts/DoorManager.cs @@ -44,7 +44,6 @@ public class DoorManager : MonoBehaviour audio.PlayOneShot(aClip); doorIsOpen = openCheck; transform.parent.animation.Play(animName); - } } diff --git a/SurvivalIsland/Assets/Scripts/DoorManager.cs.meta b/SurvivalIsland/Assets/Scripts/DoorManager.cs.meta new file mode 100644 index 0000000..877a1cd --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/DoorManager.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80af9609c13cf5648aa46809aaec8e8c +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/Inventory.cs.meta b/SurvivalIsland/Assets/Scripts/Inventory.cs.meta new file mode 100644 index 0000000..b8550b8 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/Inventory.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41ee0d51a80bc614cbc4c2fc637cb996 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/MainMenuBtns.cs.meta b/SurvivalIsland/Assets/Scripts/MainMenuBtns.cs.meta new file mode 100644 index 0000000..375f43d --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/MainMenuBtns.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 782d7955bf27e2244acf3aa18fa8d58e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/Matches.cs.meta b/SurvivalIsland/Assets/Scripts/Matches.cs.meta new file mode 100644 index 0000000..2a61e56 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/Matches.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ff7e1803b15b4f4c8c16b28071afc58 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs.meta b/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs.meta new file mode 100644 index 0000000..f0ba61c --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/PlayerCollisions.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4996adab0d5ae548ae6ef51830da0f2 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/PowerCell.cs.meta b/SurvivalIsland/Assets/Scripts/PowerCell.cs.meta new file mode 100644 index 0000000..e6fb9dd --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/PowerCell.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e564b3f50537083478ebea99a84920c0 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/TargetCollision.cs.meta b/SurvivalIsland/Assets/Scripts/TargetCollision.cs.meta new file mode 100644 index 0000000..bd350fe --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/TargetCollision.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81348036fe326a44aabe9dd92dad9412 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/TextHints.cs.meta b/SurvivalIsland/Assets/Scripts/TextHints.cs.meta new file mode 100644 index 0000000..21169ed --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/TextHints.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce0e2ee8905a73d4ca6006d8924194e6 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/ThrowTrigger.cs.meta b/SurvivalIsland/Assets/Scripts/ThrowTrigger.cs.meta new file mode 100644 index 0000000..4bfd6e0 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/ThrowTrigger.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ef851c593da8cd4d8fbf46996e72817 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/TidyObject.cs.meta b/SurvivalIsland/Assets/Scripts/TidyObject.cs.meta new file mode 100644 index 0000000..790aac0 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/TidyObject.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59dcc2d1f955c094fbee06fc38a0f423 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Scripts/TriggerZone.cs.meta b/SurvivalIsland/Assets/Scripts/TriggerZone.cs.meta new file mode 100644 index 0000000..12f1167 --- /dev/null +++ b/SurvivalIsland/Assets/Scripts/TriggerZone.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 749d278a94f759c4bb676c433e07044e +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/SurvivalIsland/Assets/Sounds.meta b/SurvivalIsland/Assets/Sounds.meta new file mode 100644 index 0000000..3b682db --- /dev/null +++ b/SurvivalIsland/Assets/Sounds.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 3c14468497622d842bad56bd53232ee0 +folderAsset: yes +DefaultImporter: + userData: diff --git a/SurvivalIsland/Assets/Textures.meta b/SurvivalIsland/Assets/Textures.meta new file mode 100644 index 0000000..0ae2baa --- /dev/null +++ b/SurvivalIsland/Assets/Textures.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 2d39bf1702aad3d47a412c1166c2d8a4 +folderAsset: yes +DefaultImporter: + userData: diff --git a/SurvivalIsland/Library/CurrentLayout.dwlt b/SurvivalIsland/Library/CurrentLayout.dwlt index c216ce9..cc8217b 100644 Binary files a/SurvivalIsland/Library/CurrentLayout.dwlt and b/SurvivalIsland/Library/CurrentLayout.dwlt differ diff --git a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 23845d9..d19184c 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.dll b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll index a93d7b3..c9731a7 100644 Binary files a/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll and b/SurvivalIsland/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/SurvivalIsland/Library/ScriptMapper b/SurvivalIsland/Library/ScriptMapper index 22d4ce8..c504f46 100644 Binary files a/SurvivalIsland/Library/ScriptMapper and b/SurvivalIsland/Library/ScriptMapper differ diff --git a/SurvivalIsland/Library/assetDatabase3 b/SurvivalIsland/Library/assetDatabase3 index 3661d23..6554503 100644 Binary files a/SurvivalIsland/Library/assetDatabase3 and b/SurvivalIsland/Library/assetDatabase3 differ diff --git a/SurvivalIsland/Library/expandedItems b/SurvivalIsland/Library/expandedItems index a1677fd..2caa90e 100644 Binary files a/SurvivalIsland/Library/expandedItems and b/SurvivalIsland/Library/expandedItems differ diff --git a/SurvivalIsland/Library/guidmapper b/SurvivalIsland/Library/guidmapper index fe7d2ff..e10e38a 100644 Binary files a/SurvivalIsland/Library/guidmapper and b/SurvivalIsland/Library/guidmapper differ diff --git a/SurvivalIsland/Library/metadata/2d/2d39bf1702aad3d47a412c1166c2d8a4 b/SurvivalIsland/Library/metadata/2d/2d39bf1702aad3d47a412c1166c2d8a4 new file mode 100644 index 0000000..fafb8d1 Binary files /dev/null and b/SurvivalIsland/Library/metadata/2d/2d39bf1702aad3d47a412c1166c2d8a4 differ diff --git a/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a b/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a index 88ce286..6d9d504 100644 Binary files a/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a and b/SurvivalIsland/Library/metadata/31/31c03f629e3ce437ca8454fe54ce026a differ diff --git a/SurvivalIsland/Library/metadata/3c/3c14468497622d842bad56bd53232ee0 b/SurvivalIsland/Library/metadata/3c/3c14468497622d842bad56bd53232ee0 new file mode 100644 index 0000000..4256127 Binary files /dev/null and b/SurvivalIsland/Library/metadata/3c/3c14468497622d842bad56bd53232ee0 differ diff --git a/SurvivalIsland/Library/metadata/3e/3ef851c593da8cd4d8fbf46996e72817 b/SurvivalIsland/Library/metadata/3e/3ef851c593da8cd4d8fbf46996e72817 index c11d966..01e6653 100644 Binary files a/SurvivalIsland/Library/metadata/3e/3ef851c593da8cd4d8fbf46996e72817 and b/SurvivalIsland/Library/metadata/3e/3ef851c593da8cd4d8fbf46996e72817 differ diff --git a/SurvivalIsland/Library/metadata/3f/3ff7e1803b15b4f4c8c16b28071afc58 b/SurvivalIsland/Library/metadata/3f/3ff7e1803b15b4f4c8c16b28071afc58 index 45d9df7..8e11c9b 100644 Binary files a/SurvivalIsland/Library/metadata/3f/3ff7e1803b15b4f4c8c16b28071afc58 and b/SurvivalIsland/Library/metadata/3f/3ff7e1803b15b4f4c8c16b28071afc58 differ diff --git a/SurvivalIsland/Library/metadata/41/41ee0d51a80bc614cbc4c2fc637cb996 b/SurvivalIsland/Library/metadata/41/41ee0d51a80bc614cbc4c2fc637cb996 index 33c0fa4..d180938 100644 Binary files a/SurvivalIsland/Library/metadata/41/41ee0d51a80bc614cbc4c2fc637cb996 and b/SurvivalIsland/Library/metadata/41/41ee0d51a80bc614cbc4c2fc637cb996 differ diff --git a/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a b/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a index 0acfbbe..0a94057 100644 Binary files a/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a and b/SurvivalIsland/Library/metadata/46/46343425c2eef44398d93b235cc6378a differ diff --git a/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b b/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b index 02351a8..22bfbb6 100644 Binary files a/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b and b/SurvivalIsland/Library/metadata/52/527b563e83815419cbb75081cc0a594b differ diff --git a/SurvivalIsland/Library/metadata/59/59dcc2d1f955c094fbee06fc38a0f423 b/SurvivalIsland/Library/metadata/59/59dcc2d1f955c094fbee06fc38a0f423 index 1f284fd..e9f1bda 100644 Binary files a/SurvivalIsland/Library/metadata/59/59dcc2d1f955c094fbee06fc38a0f423 and b/SurvivalIsland/Library/metadata/59/59dcc2d1f955c094fbee06fc38a0f423 differ diff --git a/SurvivalIsland/Library/metadata/74/749d278a94f759c4bb676c433e07044e b/SurvivalIsland/Library/metadata/74/749d278a94f759c4bb676c433e07044e index e1d27b3..1c52eb1 100644 Binary files a/SurvivalIsland/Library/metadata/74/749d278a94f759c4bb676c433e07044e and b/SurvivalIsland/Library/metadata/74/749d278a94f759c4bb676c433e07044e differ diff --git a/SurvivalIsland/Library/metadata/78/782d7955bf27e2244acf3aa18fa8d58e b/SurvivalIsland/Library/metadata/78/782d7955bf27e2244acf3aa18fa8d58e index 3552b8d..36ce80c 100644 Binary files a/SurvivalIsland/Library/metadata/78/782d7955bf27e2244acf3aa18fa8d58e and b/SurvivalIsland/Library/metadata/78/782d7955bf27e2244acf3aa18fa8d58e differ diff --git a/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 b/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 index 47925bf..8a62254 100644 Binary files a/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 and b/SurvivalIsland/Library/metadata/7b/7b5b57d547ed446c795e8b86e881b006 differ diff --git a/SurvivalIsland/Library/metadata/80/80af9609c13cf5648aa46809aaec8e8c b/SurvivalIsland/Library/metadata/80/80af9609c13cf5648aa46809aaec8e8c index 77bf25b..7dcf720 100644 Binary files a/SurvivalIsland/Library/metadata/80/80af9609c13cf5648aa46809aaec8e8c and b/SurvivalIsland/Library/metadata/80/80af9609c13cf5648aa46809aaec8e8c differ diff --git a/SurvivalIsland/Library/metadata/81/81348036fe326a44aabe9dd92dad9412 b/SurvivalIsland/Library/metadata/81/81348036fe326a44aabe9dd92dad9412 index a08dcde..760682d 100644 Binary files a/SurvivalIsland/Library/metadata/81/81348036fe326a44aabe9dd92dad9412 and b/SurvivalIsland/Library/metadata/81/81348036fe326a44aabe9dd92dad9412 differ diff --git a/SurvivalIsland/Library/metadata/85/85cba2d465ac9ab4d8064e0b99aaa7dd b/SurvivalIsland/Library/metadata/85/85cba2d465ac9ab4d8064e0b99aaa7dd index 22e02f1..d09a6f1 100644 Binary files a/SurvivalIsland/Library/metadata/85/85cba2d465ac9ab4d8064e0b99aaa7dd and b/SurvivalIsland/Library/metadata/85/85cba2d465ac9ab4d8064e0b99aaa7dd differ diff --git a/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 b/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 index f27ccdf..b5d482d 100644 Binary files a/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 and b/SurvivalIsland/Library/metadata/ce/ce040982d3c2c4754a6d5d6ccda0cdd8 differ diff --git a/SurvivalIsland/Library/metadata/ce/ce0e2ee8905a73d4ca6006d8924194e6 b/SurvivalIsland/Library/metadata/ce/ce0e2ee8905a73d4ca6006d8924194e6 index c5b159f..73ba9fa 100644 Binary files a/SurvivalIsland/Library/metadata/ce/ce0e2ee8905a73d4ca6006d8924194e6 and b/SurvivalIsland/Library/metadata/ce/ce0e2ee8905a73d4ca6006d8924194e6 differ diff --git a/SurvivalIsland/Library/metadata/e4/e4996adab0d5ae548ae6ef51830da0f2 b/SurvivalIsland/Library/metadata/e4/e4996adab0d5ae548ae6ef51830da0f2 index 0aeae4f..cda7d18 100644 Binary files a/SurvivalIsland/Library/metadata/e4/e4996adab0d5ae548ae6ef51830da0f2 and b/SurvivalIsland/Library/metadata/e4/e4996adab0d5ae548ae6ef51830da0f2 differ diff --git a/SurvivalIsland/Library/metadata/e4/e4ccbd406b9ee9a4dbf41adad9400abe b/SurvivalIsland/Library/metadata/e4/e4ccbd406b9ee9a4dbf41adad9400abe index b118eb4..07f6fa4 100644 Binary files a/SurvivalIsland/Library/metadata/e4/e4ccbd406b9ee9a4dbf41adad9400abe and b/SurvivalIsland/Library/metadata/e4/e4ccbd406b9ee9a4dbf41adad9400abe differ diff --git a/SurvivalIsland/Library/metadata/e5/e564b3f50537083478ebea99a84920c0 b/SurvivalIsland/Library/metadata/e5/e564b3f50537083478ebea99a84920c0 index 3cecb1a..4991c27 100644 Binary files a/SurvivalIsland/Library/metadata/e5/e564b3f50537083478ebea99a84920c0 and b/SurvivalIsland/Library/metadata/e5/e564b3f50537083478ebea99a84920c0 differ diff --git a/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc b/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc index 042d7da..e0f3c72 100644 Binary files a/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc and b/SurvivalIsland/Library/metadata/f2/f21b73d3da843424c8a08424bae3b6cc differ diff --git a/SurvivalIsland/Library/shadercompiler-1.log b/SurvivalIsland/Library/shadercompiler-1.log index 3ecb15b..8d94129 100644 --- a/SurvivalIsland/Library/shadercompiler-1.log +++ b/SurvivalIsland/Library/shadercompiler-1.log @@ -1,37 +1,3 @@ Base path: D:/Unity/Editor/Data -Pipe name: \\.\pipe\UnityShaderCompiler-1-17116 +Pipe name: \\.\pipe\UnityShaderCompiler-1-7160 Cmd: getPlatforms -Cmd: preprocess - insize=5140 outsize=2085 ok=1 -Cmd: compileSnippet - api=4 type=0 insize=3359 outsize=2087 kw=WATER_REFRACTIVE ok=1 -Cmd: compileSnippet - api=4 type=1 insize=3359 outsize=2875 kw=WATER_REFRACTIVE ok=1 -Cmd: preprocess - insize=12913 outsize=2602 ok=1 -Cmd: compileSnippet - api=4 type=0 insize=10220 outsize=5369 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=1 insize=10220 outsize=5897 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=0 insize=10224 outsize=4979 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=1 insize=10224 outsize=4483 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=0 insize=9966 outsize=1875 kw= ok=1 -Cmd: compileSnippet - api=4 type=1 insize=9966 outsize=3070 kw= ok=1 -Cmd: preprocess - insize=12080 outsize=2481 ok=1 -Cmd: compileSnippet - api=4 type=0 insize=9506 outsize=5020 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=1 insize=9506 outsize=5003 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=0 insize=9510 outsize=4727 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=1 insize=9510 outsize=4215 kw=WATER_VERTEX_DISPLACEMENT_ON WATER_EDGEBLEND_ON WATER_REFLECTIVE ok=1 -Cmd: compileSnippet - api=4 type=0 insize=9252 outsize=1835 kw= ok=1 -Cmd: compileSnippet - api=4 type=1 insize=9252 outsize=3070 kw= ok=1