Commit 37d585ee4169a95bd8646af399c5386addf2969e

kuutioiden actioneita lisatty
Assembly-CSharp-firstpass-vs.csproj
(2 / 1)
  
4444 </Reference>
4545 </ItemGroup>
4646 <ItemGroup>
47 <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
47 <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\Init.cs" />
48 <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\Select.cs" />
4849 </ItemGroup>
4950 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5051 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Assembly-CSharp-firstpass.csproj
(2 / 1)
  
4444 </Reference>
4545 </ItemGroup>
4646 <ItemGroup>
47 <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\MouseLook.cs" />
47 <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\Init.cs" />
48 <Compile Include="Assets\Standard Assets\Character Controllers\Sources\Scripts\Select.cs" />
4849 </ItemGroup>
4950 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5051 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Assembly-CSharp-firstpass.pidb
(4 / 7)
Binary files differ
Assembly-CSharp-vs.csproj
(3 / 7)
  
4545 </ItemGroup>
4646 <ItemGroup>
4747 <Compile Include="Assets\WSAD.cs" />
48 <Reference Include="Assembly-UnityScript-firstpass">
49 <HintPath>Library\ScriptAssemblies\Assembly-UnityScript-firstpass.dll</HintPath>
50 </Reference>
51 </ItemGroup>
52 <ItemGroup>
53 <ProjectReference Include="Assembly-CSharp-firstpass-vs.csproj">
54 <Project>{AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}</Project> <Name>Assembly-CSharp-firstpass-vs</Name> </ProjectReference>
48 <Compile Include="Assets\ownAssets\Scripts\Init.cs" />
49 <Compile Include="Assets\ownAssets\Scripts\InstrumentAction.cs" />
50 <Compile Include="Assets\ownAssets\Scripts\Select.cs" />
5551 </ItemGroup>
5652 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5753 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Assembly-CSharp.csproj
(3 / 6)
  
4545 </ItemGroup>
4646 <ItemGroup>
4747 <Compile Include="Assets\WSAD.cs" />
48 </ItemGroup>
49 <ItemGroup>
50 <ProjectReference Include="Assembly-CSharp-firstpass.csproj">
51 <Project>{AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
52 <ProjectReference Include="Assembly-UnityScript-firstpass.unityproj">
53 <Project>{47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}</Project> <Name>Assembly-UnityScript-firstpass</Name> </ProjectReference>
48 <Compile Include="Assets\ownAssets\Scripts\Init.cs" />
49 <Compile Include="Assets\ownAssets\Scripts\InstrumentAction.cs" />
50 <Compile Include="Assets\ownAssets\Scripts\Select.cs" />
5451 </ItemGroup>
5552 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5653 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Assembly-CSharp.pidb
(15 / 6)
Binary files differ
Assets/VersioTesti.unity
(60 / 13)
Binary files differ
Assets/ownAssets.meta
(5 / 0)
  
1fileFormatVersion: 2
2guid: 44ff3c4ba8f85864cae9570a12501880
3folderAsset: yes
4DefaultImporter:
5 userData:
Assets/ownAssets/Scripts.meta
(5 / 0)
  
1fileFormatVersion: 2
2guid: ecf084a151b4cfa4285b5e1ffd980682
3folderAsset: yes
4DefaultImporter:
5 userData:
Assets/ownAssets/Scripts/Init.cs
(18 / 0)
  
1using UnityEngine;
2using System.Collections;
3
4public class Init : MonoBehaviour {
5
6 // Use this for initialization
7 void Start () {
8 Screen.showCursor = true;
9
10
11
12 }
13
14 // Update is called once per frame
15 void Update () {
16
17 }
18}
Assets/ownAssets/Scripts/Init.cs.meta
(8 / 0)
  
1fileFormatVersion: 2
2guid: 598ac08d2ed64bb4e8dd15a04e7facda
3MonoImporter:
4 serializedVersion: 2
5 defaultReferences: []
6 executionOrder: 0
7 icon: {instanceID: 0}
8 userData:
Assets/ownAssets/Scripts/InstrumentAction.cs
(40 / 0)
  
1using UnityEngine;
2using System.Collections;
3
4public class InstrumentAction : MonoBehaviour {
5 Vector3 elevation = new Vector3(0,0.01f,0);
6 Vector3 descent = new Vector3(0,-0.005f,0);
7 double maxHeight;
8 double minHeight;
9 bool isCursosOn;
10
11 // Use this for initialization
12 void Start () {
13 maxHeight = transform.position.y + 0.2f;
14 minHeight = transform.position.y;
15 }
16
17 // Update is called once per frame
18 void Update () {
19 if(transform.position.y >= minHeight)
20 transform.Translate(descent);
21
22 }
23
24 /*
25 * What happens when cursor is over object
26 */
27 public void MouseOver(){
28 if(transform.position.y <= maxHeight){
29 transform.Translate(elevation);
30 }
31 }
32
33
34 /*
35 * When cursor is over object and mouse is clicked
36 */
37 public void MouseClicked(){
38 Destroy(transform.gameObject);
39 }
40}
Assets/ownAssets/Scripts/InstrumentAction.cs.meta
(8 / 0)
  
1fileFormatVersion: 2
2guid: d050f16139f19ab4d975e285561ee982
3MonoImporter:
4 serializedVersion: 2
5 defaultReferences: []
6 executionOrder: 0
7 icon: {instanceID: 0}
8 userData:
Assets/ownAssets/Scripts/Select.cs
(31 / 0)
  
1using UnityEngine;
2using System.Collections;
3
4public class Select : MonoBehaviour {
5 GameObject targeted;
6 // Use this for initialization
7 void Start ()
8 {
9
10 }
11
12 // Update is called once per frame
13 void Update ()
14 {
15 Ray ray = camera.ScreenPointToRay(Input.mousePosition);
16 Debug.DrawRay(ray.origin, ray.direction , Color.yellow);
17 RaycastHit hitInfo;
18 if(Physics.Raycast(ray, out hitInfo, 13f)){
19 targeted = hitInfo.collider.gameObject;
20 InstrumentAction o = targeted.GetComponent<InstrumentAction>();
21 if (o != null){
22 o.MouseOver();
23 if (Input.GetMouseButton(0))
24 {
25 o.MouseClicked();
26 }
27 }
28 }
29
30 }
31}
Assets/ownAssets/Scripts/Select.cs.meta
(8 / 0)
  
1fileFormatVersion: 2
2guid: a9b76ea9f6b50c74bbb283e0670a4818
3MonoImporter:
4 serializedVersion: 2
5 defaultReferences: []
6 executionOrder: 0
7 icon: {instanceID: 0}
8 userData:
Assets/ownAssets/instrumentti.prefab
(8 / 0)
Binary files differ
Assets/ownAssets/instrumentti.prefab.meta
(4 / 0)
  
1fileFormatVersion: 2
2guid: ffc62faf069230f4f8203e18b0618a2a
3NativeFormatImporter:
4 userData:
InstruTrivia-csharp.sln
(1 / 7)
  
11Microsoft Visual Studio Solution File, Format Version 11.00
22# Visual Studio 2008
33
4Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-CSharp-firstpass-vs.csproj", "{AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}"
5EndProject
64Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-CSharp-vs.csproj", "{24A579A7-3ADB-D23C-9C93-1EE5FABD277A}"
75EndProject
86Global
99 Release|Any CPU = Release|Any CPU
1010 EndGlobalSection
1111 GlobalSection(ProjectConfigurationPlatforms) = postSolution
12 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
14 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
15 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Release|Any CPU.Build.0 = Release|Any CPU
1612 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1713 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Debug|Any CPU.Build.0 = Debug|Any CPU
1814 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Release|Any CPU.ActiveCfg = Release|Any CPU
1717 GlobalSection(SolutionProperties) = preSolution
1818 HideSolutionNode = FALSE
1919 EndGlobalSection
20 GlobalSection(MonoDevelopProperties) = preSolution
20 GlobalSection(MonoDevelopProperties) = preSolution
2121=======
2222 GlobalSection(MonoDevelopProperties) = preSolution
2323>>>>>>> 3be0aa50872888a75a85d35533659d278f5e2c72
InstruTrivia.sln
(1 / 13)
  
11Microsoft Visual Studio Solution File, Format Version 11.00
22# Visual Studio 2008
33
4Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-CSharp-firstpass.csproj", "{AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}"
5EndProject
64Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-CSharp.csproj", "{24A579A7-3ADB-D23C-9C93-1EE5FABD277A}"
75EndProject
8Project("{F0DEEB08-9F6E-E42F-4E66-06286E3DD5E7}") = "instrutrivia", "Assembly-UnityScript-firstpass.unityproj", "{47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}"
9EndProject
106Global
117 GlobalSection(SolutionConfigurationPlatforms) = preSolution
128 Debug|Any CPU = Debug|Any CPU
139 Release|Any CPU = Release|Any CPU
1410 EndGlobalSection
1511 GlobalSection(ProjectConfigurationPlatforms) = postSolution
16 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
18 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
19 {AB0BAEF8-1FD7-4A21-3D88-29DEC7854B86}.Release|Any CPU.Build.0 = Release|Any CPU
2012 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2113 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Debug|Any CPU.Build.0 = Debug|Any CPU
2214 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Release|Any CPU.ActiveCfg = Release|Any CPU
2315 {24A579A7-3ADB-D23C-9C93-1EE5FABD277A}.Release|Any CPU.Build.0 = Release|Any CPU
24 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
26 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
27 {47CE8E8D-7E44-BC6D-D3DE-8E8DA0D40E6D}.Release|Any CPU.Build.0 = Release|Any CPU
2816 EndGlobalSection
2917 GlobalSection(SolutionProperties) = preSolution
3018 HideSolutionNode = FALSE
3119 EndGlobalSection
32 GlobalSection(MonoDevelopProperties) = preSolution
20 GlobalSection(MonoDevelopProperties) = preSolution
3321=======
3422 GlobalSection(MonoDevelopProperties) = preSolution
3523>>>>>>> 3be0aa50872888a75a85d35533659d278f5e2c72
InstruTrivia.userprefs
(4 / 2)
  
11<Properties>
22 <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
3 <MonoDevelop.Ide.Workbench ActiveDocument="Assets\WSAD.cs">
3 <MonoDevelop.Ide.Workbench ActiveDocument="Assets\ownAssets\Scripts\Init.cs">
44 <Files>
5 <File FileName="Assets\WSAD.cs" Line="14" Column="3" />
5 <File FileName="Assets\ownAssets\Scripts\InstrumentAction.cs" Line="9" Column="18" />
6 <File FileName="Assets\ownAssets\Scripts\Select.cs" Line="25" Column="13" />
7 <File FileName="Assets\ownAssets\Scripts\Init.cs" Line="1" Column="1" />
68 </Files>
79 </MonoDevelop.Ide.Workbench>
810 <MonoDevelop.Ide.DebuggingService.Breakpoints>
Library/AssetServerCacheV3
(2 / 2)
Binary files differ
Library/InspectorExpandedItems.asset
(2 / 2)
Binary files differ
Library/assetDatabase3
(15 / 10)
Binary files differ
Library/expandedItems
(2 / 2)
Binary files differ
Library/guidmapper
(3 / 2)
Binary files differ
Library/metadata/04/04fde1049e7f58344822c999cd576c34
(28 / 17)
Binary files differ