Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

temple2 #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

temple2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions Assembly-CSharp-Editor-vs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0019E5CB-A1F5-BA4B-AF85-623B522DD54A}</ProjectGuid>
<ProjectGuid>{AD8C1F91-A79C-15CE-4281-61AAE7FA0F04}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -113,7 +113,7 @@
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="JMOAssets">
<HintPath>/Users/Jang_wony/GitHub/HiSatan_1/Assets/JMO Assets/Editor/JMOAssets.dll</HintPath>
<HintPath>/Users/Parkjiyeon/Desktop/HiSatan2/Assets/JMO Assets/Editor/JMOAssets.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Graphs">
<HintPath>/Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll</HintPath>
Expand Down Expand Up @@ -151,7 +151,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-vs.csproj">
<Project>{1C310333-0D7E-E60C-0BDA-4030F9F29C80}</Project> <Name>Assembly-CSharp-vs</Name> </ProjectReference>
<Project>{FC76E43C-29D5-0C4A-06E9-6A446AEE55CA}</Project> <Name>Assembly-CSharp-vs</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
6 changes: 3 additions & 3 deletions Assembly-CSharp-Editor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0019E5CB-A1F5-BA4B-AF85-623B522DD54A}</ProjectGuid>
<ProjectGuid>{AD8C1F91-A79C-15CE-4281-61AAE7FA0F04}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -113,7 +113,7 @@
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="JMOAssets">
<HintPath>/Users/Jang_wony/GitHub/HiSatan_1/Assets/JMO Assets/Editor/JMOAssets.dll</HintPath>
<HintPath>/Users/Parkjiyeon/Desktop/HiSatan2/Assets/JMO Assets/Editor/JMOAssets.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Graphs">
<HintPath>/Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll</HintPath>
Expand Down Expand Up @@ -151,7 +151,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp.csproj">
<Project>{1C310333-0D7E-E60C-0BDA-4030F9F29C80}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
<Project>{FC76E43C-29D5-0C4A-06E9-6A446AEE55CA}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
14 changes: 13 additions & 1 deletion Assembly-CSharp-vs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1C310333-0D7E-E60C-0BDA-4030F9F29C80}</ProjectGuid>
<ProjectGuid>{FC76E43C-29D5-0C4A-06E9-6A446AEE55CA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -65,6 +65,7 @@
<Compile Include="Assets\JMO Assets\Cartoon FX\Scripts\CFX_LightIntensityFade.cs" />
<Compile Include="Assets\JMO Assets\Cartoon FX\Scripts\CFX_ShurikenThreadFix.cs" />
<Compile Include="Assets\JMO Assets\Cartoon FX\Spawn System\CFX_SpawnSystem.cs" />
<Compile Include="Assets\move_priest.cs" />
<Compile Include="Assets\script\DDalKKak.cs" />
<Compile Include="Assets\script\DragGameObject.cs" />
<Compile Include="Assets\script\Object_Cursor.cs" />
Expand Down Expand Up @@ -130,10 +131,21 @@
<Compile Include="Assets\stage_residence\script\ori_axe_to_pillar.cs" />
<Compile Include="Assets\stage_residence\script\scroll_zoom.cs" />
<Compile Include="Assets\stage_residence\script\touch_girl.cs" />
<Compile Include="Assets\stage_temple\script\acid_to_fountain.cs" />
<Compile Include="Assets\stage_temple\script\bottle_kind.cs" />
<Compile Include="Assets\stage_temple\script\bottle_puzzle.cs" />
<Compile Include="Assets\stage_temple\script\chk_acid.cs" />
<Compile Include="Assets\stage_temple\script\click_fountain.cs" />
<Compile Include="Assets\stage_temple\script\erase_picture.cs" />
<Compile Include="Assets\stage_temple\script\picture_button.cs" />
<Compile Include="Assets\stage_temple\script\picture_touch.cs" />
<Compile Include="Assets\stage_temple\script\puzzle_manage.cs" />
<Compile Include="Assets\stage_temple\script\puzzle_open.cs" />
<Compile Include="Assets\stage_temple\script\puzzle_state.cs" />
<Compile Include="Assets\stage_temple\script\sweeper_to_picture.cs" />
<Compile Include="Assets\stage_temple\script\touch_marble.cs" />
<Compile Include="Assets\stage_temple\script\view.cs" />
<Compile Include="Assets\stage_temple\script\view_scene.cs" />
<Compile Include="Assets\stage_woodman&apos;s_house\script\bat_to_man.cs" />
<Compile Include="Assets\stage_woodman&apos;s_house\script\boy_rotate.cs" />
<Compile Include="Assets\stage_woodman&apos;s_house\script\carpet_click.cs" />
Expand Down
14 changes: 13 additions & 1 deletion Assembly-CSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1C310333-0D7E-E60C-0BDA-4030F9F29C80}</ProjectGuid>
<ProjectGuid>{FC76E43C-29D5-0C4A-06E9-6A446AEE55CA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace></RootNamespace>
Expand Down Expand Up @@ -65,6 +65,7 @@
<Compile Include="Assets\JMO Assets\Cartoon FX\Scripts\CFX_LightIntensityFade.cs" />
<Compile Include="Assets\JMO Assets\Cartoon FX\Scripts\CFX_ShurikenThreadFix.cs" />
<Compile Include="Assets\JMO Assets\Cartoon FX\Spawn System\CFX_SpawnSystem.cs" />
<Compile Include="Assets\move_priest.cs" />
<Compile Include="Assets\script\DDalKKak.cs" />
<Compile Include="Assets\script\DragGameObject.cs" />
<Compile Include="Assets\script\Object_Cursor.cs" />
Expand Down Expand Up @@ -130,10 +131,21 @@
<Compile Include="Assets\stage_residence\script\ori_axe_to_pillar.cs" />
<Compile Include="Assets\stage_residence\script\scroll_zoom.cs" />
<Compile Include="Assets\stage_residence\script\touch_girl.cs" />
<Compile Include="Assets\stage_temple\script\acid_to_fountain.cs" />
<Compile Include="Assets\stage_temple\script\bottle_kind.cs" />
<Compile Include="Assets\stage_temple\script\bottle_puzzle.cs" />
<Compile Include="Assets\stage_temple\script\chk_acid.cs" />
<Compile Include="Assets\stage_temple\script\click_fountain.cs" />
<Compile Include="Assets\stage_temple\script\erase_picture.cs" />
<Compile Include="Assets\stage_temple\script\picture_button.cs" />
<Compile Include="Assets\stage_temple\script\picture_touch.cs" />
<Compile Include="Assets\stage_temple\script\puzzle_manage.cs" />
<Compile Include="Assets\stage_temple\script\puzzle_open.cs" />
<Compile Include="Assets\stage_temple\script\puzzle_state.cs" />
<Compile Include="Assets\stage_temple\script\sweeper_to_picture.cs" />
<Compile Include="Assets\stage_temple\script\touch_marble.cs" />
<Compile Include="Assets\stage_temple\script\view.cs" />
<Compile Include="Assets\stage_temple\script\view_scene.cs" />
<Compile Include="Assets\stage_woodman&apos;s_house\script\bat_to_man.cs" />
<Compile Include="Assets\stage_woodman&apos;s_house\script\boy_rotate.cs" />
<Compile Include="Assets\stage_woodman&apos;s_house\script\carpet_click.cs" />
Expand Down
Binary file modified Assets/Scene/stage-temple.unity
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions ...911d24751674d58bb745f29a9492be/asset.meta → Assets/Scene/stage-temple.unity.meta
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Assets/move_priest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using UnityEngine;
using System.Collections;

public class move_priest : MonoBehaviour {
public GameObject priest1;
public GameObject priest2;
public bool chk = false;

void Update () {
if (chk == false) {
if (GameObject.Find ("Boy").GetComponent <player_state> ().his_position == 3) {
priest1.SetActive (false);
priest2.SetActive (true);
} else if (GameObject.Find ("Boy").GetComponent <player_state> ().his_position != 3) {
priest1.SetActive (true);
priest2.SetActive (false);
}
}
}
}
24 changes: 12 additions & 12 deletions ...3c661ce5b2347fea171af5b867d79d/asset.meta → Assets/move_priest.cs.meta
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions Assets/stage_residence/item.meta
View file
Open in desktop

This file was deleted.

26 changes: 26 additions & 0 deletions Assets/stage_temple/script/acid_to_fountain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using UnityEngine;
using System.Collections;

public class acid_to_fountain : MonoBehaviour {

public GameObject bottle;
public GameObject fountain;
public bool acid_chk=false;

void Update () {
Vector3 lp = bottle.transform.position;
float dis = Vector3.Distance (fountain.transform.position, lp);

if (dis < 3f) {
GameObject.Find("EventSystem").GetComponent<on_correcteffect>().on_eff();
if(Input.GetKeyUp(KeyCode.Mouse0)){
acid_chk=true;
GameObject.Find ("item").GetComponent <manage_inven> ().pop_item (bottle);
GameObject.Find ("blank").GetComponent<inven> ().dragitem = false;
GameObject.Find("EventSystem").GetComponent<on_correcteffect>().StopCoroutine ("on_effect");
}
}

}

}
24 changes: 12 additions & 12 deletions ...37beda6e14b4c86b1d65ecf1135b8d/asset.meta → ...ge_temple/script/acid_to_fountain.cs.meta
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/stage_temple/script/chk_acid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using UnityEngine;
using System.Collections;

public class chk_acid : MonoBehaviour {

public bool acid;

}
24 changes: 12 additions & 12 deletions ...8a65da5c69b4483b57e47227f20027/asset.meta → Assets/stage_temple/script/chk_acid.cs.meta
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 33 additions & 0 deletions Assets/stage_temple/script/click_fountain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using UnityEngine;
using System.Collections;

public class click_fountain : MonoBehaviour {

public GameObject top;
public GameObject right;
public GameObject left;
public int state=1;

void OnMouseUpAsButton(){
if (GameObject.Find ("Boy").GetComponent<player_state> ().his_position == 2) {
if (state == 0) {
top.SetActive (true);
left.SetActive (false);
state = 1;
} else if (state == 1) {
top.SetActive (false);
right.SetActive (true);
state = 2;
} else if (state == 2) {
right.SetActive (false);
top.SetActive (true);
state = 3;
} else if (state == 3) {
top.SetActive (false);
left.SetActive (true);
state = 0;
}
}
}
}

24 changes: 12 additions & 12 deletions ...5bad151937e43b1865378feeedd396/asset.meta → ...tage_temple/script/click_fountain.cs.meta
100755 → 100644
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading