diff --git a/FricaDeGaze/Assets/FricaDeGazeScene.unity b/FricaDeGaze/Assets/FricaDeGazeScene.unity index 269ec01..be432ba 100644 Binary files a/FricaDeGaze/Assets/FricaDeGazeScene.unity and b/FricaDeGaze/Assets/FricaDeGazeScene.unity differ diff --git a/FricaDeGaze/Assets/misca2.cs b/FricaDeGaze/Assets/misca2.cs index d5e7eb4..0477771 100644 --- a/FricaDeGaze/Assets/misca2.cs +++ b/FricaDeGaze/Assets/misca2.cs @@ -2,19 +2,33 @@ using System.Collections; public class misca2 : MonoBehaviour { - + + public Transform target; IEnumerator Start () { //yield return new WaitForSeconds (0.2f); //float width = camera.pixelWidth; + Vector3 dis = transform.position - target.position; + float xpos = Random.Range (-dis.x, dis.x); + while (xpos+dis.x > target.position.x || xpos+dis.x < -target.position.x ) + xpos = Random.Range (-target.position.x, target.position.x); + float zpos = Random.Range (-target.position.z, target.position.z); + while (zpos+dis.z > target.position.z) + zpos = Random.Range (-target.position.z, target.position.z); - Vector3 position = new Vector3(Random.Range(-5.0F, 5.0F), 0, Random.Range(-5.0F, 5.0F)); + Vector3 position = new Vector3(xpos, 0, zpos); + //transform.TransformVector (new Vector3(target.position.x,target.position.y,target.position)); Vector3 pointA = transform.position; - Vector3 pointB = pointA + new Vector3 (0.5f,0,0.5f); + //Vector3 pointB = pointA + new Vector3 (0.5f,0,0.5f); while (true) { yield return StartCoroutine(MoveObject(transform, pointA, position, 1.5f)); yield return StartCoroutine(MoveObject(transform, position, pointA, 1.5f)); - position = new Vector3(Random.Range(-5.0F, 5.0F), 0, Random.Range(-5.0F, 5.0F)); + while (xpos > target.position.x) + xpos = Random.Range (-target.position.x, target.position.x); + while (zpos > target.position.z || zpos< -target.position.z) + zpos = Random.Range (-target.position.z, target.position.z); + position.x = xpos; + position.y = zpos; } } diff --git a/FricaDeGaze/FricaDeGaze-csharp.sln b/FricaDeGaze/FricaDeGaze-csharp.sln index 022e3e6..76adec4 100644 --- a/FricaDeGaze/FricaDeGaze-csharp.sln +++ b/FricaDeGaze/FricaDeGaze-csharp.sln @@ -23,7 +23,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/FricaDeGaze/FricaDeGaze.sln b/FricaDeGaze/FricaDeGaze.sln index e3c0cd5..717fb4e 100644 --- a/FricaDeGaze/FricaDeGaze.sln +++ b/FricaDeGaze/FricaDeGaze.sln @@ -29,7 +29,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/FricaDeGaze/FricaDeGaze.userprefs b/FricaDeGaze/FricaDeGaze.userprefs index bd298ed..952a707 100644 --- a/FricaDeGaze/FricaDeGaze.userprefs +++ b/FricaDeGaze/FricaDeGaze.userprefs @@ -2,10 +2,10 @@ - + + - - + diff --git a/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt b/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt index d25c77b..bad4e88 100644 Binary files a/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt and b/FricaDeGaze/Library/CurrentMaximizeLayout.dwlt differ diff --git a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll index 466bd46..f64d564 100644 Binary files a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll and b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll differ diff --git a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb index bc4f4ec..025be06 100644 Binary files a/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb and b/FricaDeGaze/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb differ diff --git a/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll b/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll index 2ea985c..c659184 100644 Binary files a/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll and b/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll differ diff --git a/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb b/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb index 299411d..4307f2e 100644 Binary files a/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb and b/FricaDeGaze/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb differ diff --git a/FricaDeGaze/Library/assetDatabase3 b/FricaDeGaze/Library/assetDatabase3 index 49bfbd6..7c7a220 100644 Binary files a/FricaDeGaze/Library/assetDatabase3 and b/FricaDeGaze/Library/assetDatabase3 differ diff --git a/FricaDeGaze/Library/guidmapper b/FricaDeGaze/Library/guidmapper index 4ea836e..892cf01 100644 Binary files a/FricaDeGaze/Library/guidmapper and b/FricaDeGaze/Library/guidmapper differ diff --git a/FricaDeGaze/Library/metadata/7a/7a410311ab974f04d8f4e4518d2392f1 b/FricaDeGaze/Library/metadata/7a/7a410311ab974f04d8f4e4518d2392f1 index 701fff8..95f654f 100644 Binary files a/FricaDeGaze/Library/metadata/7a/7a410311ab974f04d8f4e4518d2392f1 and b/FricaDeGaze/Library/metadata/7a/7a410311ab974f04d8f4e4518d2392f1 differ diff --git a/FricaDeGaze/Library/metadata/9c/9c47b6421c139f34991c12875828e632 b/FricaDeGaze/Library/metadata/9c/9c47b6421c139f34991c12875828e632 index fa9debf..8ff6718 100644 Binary files a/FricaDeGaze/Library/metadata/9c/9c47b6421c139f34991c12875828e632 and b/FricaDeGaze/Library/metadata/9c/9c47b6421c139f34991c12875828e632 differ diff --git a/FricaDeGaze/Library/metadata/cb/cb590ec5fc2eabb48b6d30c0abecea34 b/FricaDeGaze/Library/metadata/cb/cb590ec5fc2eabb48b6d30c0abecea34 index 9fdd6de..ab16702 100644 Binary files a/FricaDeGaze/Library/metadata/cb/cb590ec5fc2eabb48b6d30c0abecea34 and b/FricaDeGaze/Library/metadata/cb/cb590ec5fc2eabb48b6d30c0abecea34 differ diff --git a/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 b/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 index 6eb177f..a5cee4c 100644 Binary files a/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 and b/FricaDeGaze/Library/metadata/d8/d87acaaacd69c38439d8be03d44fd932 differ