Merge remote-tracking branch 'origin/joonasp_Milestone3' into staging2

# Conflicts:
#	Assets/SkyProfile-457889269655148736.asset
#	Assets/_TerrainData/TerrainData_521113671563848736.asset
#	Assets/_TerrainData/TerrainData_699485723238748736.asset
#	Assets/_TerrainData/TerrainData_869121471408748736.asset
#	Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
#	Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
#	Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
This commit is contained in:
HelarJ 2022-04-11 18:53:05 +03:00
commit cd1633af54
15 changed files with 39802 additions and 259 deletions

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 8bc88477f037e96478019bba8de301fd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -17,7 +17,7 @@ GameObject:
- component: {fileID: 1264022012566418942}
- component: {fileID: 759522315152862422}
- component: {fileID: 7019801789685915322}
m_Layer: 0
m_Layer: 10
m_Name: Log
m_TagString: Throwable
m_Icon: {fileID: 0}

View File

@ -4835,6 +4835,8 @@ GameObject:
- component: {fileID: 824121554007831541}
- component: {fileID: 3271421586109646936}
- component: {fileID: 6090694805862981561}
- component: {fileID: 6268334591715512481}
- component: {fileID: 7195648623186244198}
m_Layer: 10
m_Name: IceBolt
m_TagString: IceBolt
@ -4897,7 +4899,7 @@ SphereCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!135 &6090694805862981561
SphereCollider:
@ -4910,8 +4912,58 @@ SphereCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!33 &6268334591715512481
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3928666337405863711}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7195648623186244198
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3928666337405863711}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: bd0bb729cb6159b4ab21c5f62cad24ee, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &4403856838497526616
GameObject:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8183020133482818824
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8183020133482637934}
- component: {fileID: 8183020133483952674}
- component: {fileID: 8183020133484680894}
- component: {fileID: 8183020133918107436}
m_Layer: 0
m_Name: EssenceWell
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8183020133482637934
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_LocalRotation: {x: 0.000000115202326, y: 0.7071068, z: 0.7071068, w: -0.000000115202326}
m_LocalPosition: {x: -10.25, y: 1.47, z: -12.115}
m_LocalScale: {x: 10, y: 10, z: 10}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8183020133483952674
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_Mesh: {fileID: 4300122, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
--- !u!23 &8183020133484680894
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: b27fa8aa11d99d440bab56b1de24981f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &8183020133918107436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8183020133482818824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 580a2bc767950d54d9fdf84752500d7f, type: 3}
m_Name:
m_EditorClassIdentifier:
node: {fileID: 3467985268477833302, guid: 215fe2a51d12ecc43ba8f86d3dc3ae54, type: 3}
numberOfNodes: 5
spawnDelay: 1
despawnTime: 2
rightDistance: 0.1
maxUp: 0.2
minDown: -0.2

View File

@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 10f2e5d2e4dd2ba42b4dcf6195a74f02
DefaultImporter:
guid: c52ee40e56d869645af73fd6f39c1323
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:

View File

@ -157,12 +157,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3757395767074346460}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3}
m_Name:
m_EditorClassIdentifier:
particles: {fileID: 8844865646353305354}
particles: {fileID: 0}
flySpeed: 10
testForce: 1000
--- !u!114 &3757395767037568670
@ -379,9 +379,3 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 6456652935746308080}
m_PrefabAsset: {fileID: 0}
--- !u!198 &8844865646353305354 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 2532683062447540474, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
type: 3}
m_PrefabInstance: {fileID: 6456652935746308080}
m_PrefabAsset: {fileID: 0}

View File

@ -12,6 +12,8 @@ public class ActionGestureInteraction : MonoBehaviour
private GameObject player;
public float projectileSpeed = 30;
private bool holdingWand;
void Start()
{
player = gameObject;
@ -19,8 +21,63 @@ public class ActionGestureInteraction : MonoBehaviour
public void PerformAction(string action)
{
Debug.Log(action);
if (action == "Portal")
Debug.LogWarning(action);
if (player.GetComponent<PlayerInfo>().GetRightHand() != null)
{
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
}
else holdingWand = false;
switch (action)
{
case "HorizontalLine":
if (holdingWand)
{
Debug.LogWarning("CAST BOLT");
ShootProjectile();
InstantiateIceBolt(objects[0]);
}
else
{
Debug.LogWarning("WOODCUTTING ACTION");
}
return;
case "VerticalLine":
if (holdingWand)
{
Debug.LogWarning("WAND VERTICAL");
}
else
{
Debug.LogWarning("VERTICAL");
}
return;
case "Circle":
if (holdingWand)
{
Debug.LogWarning("Arcing fireball");
}
else
{
Debug.LogWarning("CIRCLE");
}
return;
case "Triangle":
if (holdingWand)
{
Debug.LogWarning("WAND TRIANGLE");
}
else
{
Debug.LogWarning("WOODCUTTING ACTION");
}
return;
}
/*if (action == "Portal")
{
// Raycast to find portal were looking at.
var nearestPortal = FindPortalInFront();
@ -41,9 +98,9 @@ public class ActionGestureInteraction : MonoBehaviour
// Make ice wall appear from below to block incoming projectiles
}
}
}
} */
}
void EnableDisablePortal(GameObject portal)
void MinigameEnable(GameObject portal)
{
// Did the raycast catch a portal in front of us?
if (portal != null)
@ -70,7 +127,7 @@ public class ActionGestureInteraction : MonoBehaviour
}
}
GameObject FindPortalInFront()
GameObject FindMinigame()
{
Ray ray = playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
RaycastHit hit;
@ -104,6 +161,7 @@ public class ActionGestureInteraction : MonoBehaviour
void InstantiateIceBolt(GameObject item)
{
Debug.LogWarning("INSTANTIATE BOLT");
var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
projectileObj.GetComponent<Rigidbody>().velocity = (destination - rightHandTransform.position).normalized * projectileSpeed;
}

View File

@ -11,7 +11,10 @@ public class EssenceNodeController : MonoBehaviour
public bool isTouched;
private bool followPlayer = false;
private Transform player;
private Transform playerCamera;
[SerializeField]
private PlayerInfo playerInfo;
private float timer;
private Material nodeMaterial;
@ -21,6 +24,7 @@ public class EssenceNodeController : MonoBehaviour
private void Awake()
{
nodeMaterial = GetComponent<Renderer>().material;
playerInfo = PlayerInfo.Instance;
}
public void Touched()
@ -37,7 +41,7 @@ public class EssenceNodeController : MonoBehaviour
public void FollowPlayer()
{
followPlayer = true;
player = GameObject.FindGameObjectWithTag("MainCamera").transform;
playerCamera = GameObject.FindGameObjectWithTag("MainCamera").transform;
StartCoroutine(Collect());
}
@ -56,8 +60,8 @@ public class EssenceNodeController : MonoBehaviour
IEnumerator Collect()
{
playerInfo.AddEssenceBasic(1);
yield return new WaitForSeconds(2f);
//TODO: Update value in player inventory
Destroy(gameObject);
}
@ -76,7 +80,7 @@ public class EssenceNodeController : MonoBehaviour
if (followPlayer)
{
transform.position = Vector3.Lerp(transform.position, new Vector3(player.position.x,player.position.y - 0.5f, player.position.z), Time.deltaTime);
transform.position = Vector3.Lerp(transform.position, new Vector3(playerCamera.position.x, playerCamera.position.y - 0.5f, playerCamera.position.z), Time.deltaTime);
}
}

View File

@ -0,0 +1,73 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PlayerInfo : MonoBehaviour
{
public static PlayerInfo Instance;
private int health;
private int essence_basic;
private GameObject rightHandHeld;
private GameObject leftHandHeld;
private void Awake()
{
Instance = this;
health = 5;
essence_basic = 0;
rightHandHeld = null;
leftHandHeld = null;
}
public void AddHealth(int value)
{
health += value;
if (health <= 0)
{
Debug.Log("NO HEALTH REAMINING");
}
}
public void AddEssenceBasic(int value)
{
if (essence_basic + value < 0)
{
Debug.Log("NOT ENOUGH ESSENCE");
}
else essence_basic += value;
}
public void AddLeftHand(GameObject obj)
{
leftHandHeld = obj;
}
public void AddRightHand(GameObject obj)
{
rightHandHeld = obj;
}
public void RemoveLeftHand()
{
leftHandHeld = null;
}
public void RemoveRightHand()
{
rightHandHeld = null;
}
public GameObject GetLeftHand()
{
return leftHandHeld;
}
public GameObject GetRightHand()
{
return rightHandHeld;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 51150922d2ca8cc44b6fc27d9365a8d4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: da52a93af762fab4ab9085821b0fb632
guid: 97fc7747e77335e4483b4a65db2e4fc1
DefaultImporter:
externalObjects: {}
userData:

View File

@ -131,31 +131,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 973685166}
m_PrefabAsset: {fileID: 0}
--- !u!1 &48807391 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 122020, guid: 627e36a0129013a47a9ff4c741c3f6d6,
type: 3}
m_PrefabInstance: {fileID: 1694198627}
m_PrefabAsset: {fileID: 0}
--- !u!114 &48807395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 48807391}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 580a2bc767950d54d9fdf84752500d7f, type: 3}
m_Name:
m_EditorClassIdentifier:
node: {fileID: 3467985268477833302, guid: 215fe2a51d12ecc43ba8f86d3dc3ae54, type: 3}
numberOfNodes: 5
spawnDelay: 1
despawnTime: 2
rightDistance: 0.1
maxUp: 0.2
minDown: -0.2
--- !u!4 &407110722 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3475118261464492563, guid: 1f4d373a613d0466fbd8849470265852,
@ -596,7 +571,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &629412354
GameObject:
@ -646,7 +621,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &629412357
MonoBehaviour:
@ -758,7 +733,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &705507993
GameObject:
@ -1029,7 +1004,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &913183357
GameObject:
@ -1096,7 +1071,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &953161746
PrefabInstance:
@ -1332,7 +1307,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1342371955
MonoBehaviour:
@ -1493,7 +1468,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 15
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1366746230
GameObject:
@ -1528,7 +1503,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1366746232
MonoBehaviour:
@ -1760,7 +1735,7 @@ PrefabInstance:
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
@ -1866,7 +1841,7 @@ Transform:
m_Children:
- {fileID: 508810528}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1578543177
MonoBehaviour:
@ -2032,185 +2007,8 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1694198627
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 122020, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_Name
value: EssenceWell
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalScale.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalScale.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalScale.z
value: 10
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalPosition.x
value: -10.25
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalPosition.y
value: 1.47
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalPosition.z
value: -12.115
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalRotation.w
value: -0.000000115202326
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000115202326
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalRotation.z
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 465858, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 627e36a0129013a47a9ff4c741c3f6d6, type: 3}
--- !u!1001 &1699517438
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 48807395}
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: StartMinigame
objectReference: {fileID: 0}
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: WellController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 7543052554150911968, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: onDown.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355069, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_Name
value: Lever (1)
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalPosition.x
value: -8.716
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.235
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalPosition.z
value: -11.355
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.6532815
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.27059805
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.6532815
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.27059805
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 7543052554475355072, guid: cb8b19b563b3d224897e3b3d94c353aa,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 45
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cb8b19b563b3d224897e3b3d94c353aa, type: 3}
--- !u!1 &1986139475
GameObject:
m_ObjectHideFlags: 0
@ -2460,7 +2258,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2057955796 stripped
GameObject:
@ -2675,7 +2473,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3}
propertyPath: m_RootOrder
value: 11
value: 10
objectReference: {fileID: 0}
- target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3}
propertyPath: m_LocalPosition.x
@ -3023,3 +2821,72 @@ SphereCollider:
serializedVersion: 2
m_Radius: 0.05
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &8183020133965781711
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalPosition.x
value: -10.25
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.47
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalPosition.z
value: -12.115
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.000000115202326
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.000000115202326
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8183020133482637934, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8183020133482818824, guid: c52ee40e56d869645af73fd6f39c1323,
type: 3}
propertyPath: m_Name
value: EssenceWell
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c52ee40e56d869645af73fd6f39c1323, type: 3}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3829f2d229e9f9b44b6d3f85cb2d6653
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2dc48376fb0fbaa4f93eb47a43ad6560
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: