helar
/
Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

gesture_joonasp #31

Open
jonasty wants to merge 11 commits from gesture_joonasp into staging2
pull from: gesture_joonasp
merge into: helar:staging2
Conversation 0 Commits 11 Files Changed 39 +1150 -1061
10 changed files with 1150 additions and 1061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3c991bd09 - Show all commits

2
Assets/Project Files/Prefabs/JonasB/IceBolt.prefab
View File

@ -4915,7 +4915,7 @@ MeshRenderer:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3928666337405863711}
m_Enabled: 1
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1

8
Assets/Project Files/Scripts/JonasB/ActionGestureInteraction.cs
View File

@ -76,7 +76,13 @@ public class ActionGestureInteraction : MonoBehaviour
}
else
{
Debug.LogWarning("CIRCLE");
GameObject minigame = FindMinigame();
if (minigame != null)
{
float distance = Vector3.Distance(transform.position, minigame.transform.position);
if(distance < 4f) minigame.GetComponent<WellController>().StartMinigame();
}
}
break;
case "Triangle":

1463
Assets/Scenes/JoonasP/Homebase_JP.unity
View File

File diff suppressed because one or more lines are too long

22
Assets/SkyProfile-457889269655148736.asset
View File

@ -90,19 +90,19 @@ Material:
- _HorizonCloudSize: 4.91
- _HorizonCloudStartPosition: -0.1
- _HorizonCloudStep: 25
- _HorizonExponent: 3.5049064
- _HorizonExponent: 4.5262575
- _HorizonStep: 500
- _HorizonThickness: 1
- _MoonGlow: 0
- _MoonLightIntensity: 0.00000018459268
- _MoonLightIntensity: 0.00007462764
- _MoonSize: 0
- _MoonSoftEdge: 0
- _OverheadCloudAltitude: 1000
- _OverheadCloudAnimationSpeed: 50
- _OverheadCloudFlowDirectionX: 1
- _OverheadCloudFlowDirectionZ: 1
- _OverheadCloudRemapMax: 1.1221364
- _OverheadCloudRemapMin: 0.14734921
- _OverheadCloudRemapMax: 1.6860074
- _OverheadCloudRemapMin: 0.3994308
- _OverheadCloudSize: 10
- _OverheadCloudStep: 2
- _StarsDensity0: 0.4
@ -121,25 +121,25 @@ Material:
- _StarsTwinkle1: 6
- _StarsTwinkle2: 2
- _SunGlow: 0.45
- _SunLightIntensity: 0.27927652
- _SunLightIntensity: 0.76967657
- _SunSize: 0.1
- _SunSoftEdge: 0.5
m_Colors:
- _DetailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
- _FogColor: {r: 0, g: 0, b: 0, a: 0}
- _GroundColor: {r: 0.4156625, g: 0.3964904, b: 0.43362582, a: 1}
- _GroundColor: {r: 0.45972604, g: 0.45057073, b: 0.46830416, a: 1}
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
- _HorizonColor: {r: 0.9031393, g: 0.85970676, b: 0.7559662, a: 1}
- _HorizonColor: {r: 0.8838805, g: 0.91821855, b: 0.86816055, a: 1}
- _MoonColor: {r: 1, g: 1, b: 1, a: 0}
- _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
- _MoonLightColor: {r: 0, g: 0, b: 0, a: 0}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.9720057}
- _SkyColor: {r: 0.21562512, g: 0.38082168, b: 0.61885357, a: 1}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.99385715}
- _SkyColor: {r: 0.29709646, g: 0.59141034, b: 0.8612809, a: 1}
- _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
- _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
- _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
- _SunColor: {r: 0.9731126, g: 0.9287469, b: 0.8555435, a: 1}
- _SunDirection: {r: 0, g: -0.3361922, b: 0.9417934, a: 0}
- _SunColor: {r: 0.9716981, g: 0.92388135, b: 0.8443182, a: 1}
- _SunDirection: {r: 0, g: -0.83296573, b: 0.5533246, a: 0}
- _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
m_BuildTextureStacks: []
--- !u!114 &11400000

238
Assets/_TerrainData/TerrainData_521113671563848736.asset
View File

File diff suppressed because one or more lines are too long

172
Assets/_TerrainData/TerrainData_699485723238748736.asset
View File

File diff suppressed because one or more lines are too long

288
Assets/_TerrainData/TerrainData_869121471408748736.asset
View File

File diff suppressed because one or more lines are too long

6
Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
View File

@ -27,17 +27,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -3060729322124398683, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -6556316676253526225, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 6653415060070705161, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -6870677732268956318, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 5795199688330459156, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: 647227324473049, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

6
Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
View File

@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: 5230418480753423839, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 3578454826137520848, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 1154069719257359876, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: -2524911961136045829, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 527483421379118287, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 6071937167051093205, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

6
Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
View File

@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -2176569442210198836, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: -318453109426760785, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 7640766898490954091, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: 2599907500881124078, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: -2833636078624372882, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: 3396191670951455934, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}