Compare commits
1 Commits
gesture_jo
...
InvSave
| Author | SHA1 | Date | |
|---|---|---|---|
|
b1954dd40e |
@@ -4834,6 +4834,7 @@ GameObject:
|
||||
- component: {fileID: 3928666337405863709}
|
||||
- component: {fileID: 824121554007831541}
|
||||
- component: {fileID: 3271421586109646936}
|
||||
- component: {fileID: 6090694805862981561}
|
||||
- component: {fileID: 6268334591715512481}
|
||||
- component: {fileID: 7195648623186244198}
|
||||
m_Layer: 10
|
||||
@@ -4900,6 +4901,19 @@ SphereCollider:
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!135 &6090694805862981561
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3928666337405863711}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &6268334591715512481
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -4915,7 +4929,7 @@ MeshRenderer:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3928666337405863711}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
|
||||
@@ -1,500 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2498142196473246277
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2498142196473246274}
|
||||
- component: {fileID: 2498142196473246273}
|
||||
- component: {fileID: 2498142196473246272}
|
||||
- component: {fileID: 2498142196473246275}
|
||||
- component: {fileID: 2498142196473246286}
|
||||
m_Layer: 2
|
||||
m_Name: Holster1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2498142196473246274
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142196473246277}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0.656, y: 1.124, z: 0}
|
||||
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4613100203587676735}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &2498142196473246273
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142196473246277}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &2498142196473246272
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142196473246277}
|
||||
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: 8aa659f864a2309459a789493298b561, 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!135 &2498142196473246275
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142196473246277}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2498142196473246286
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142196473246277}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_InteractionManager: {fileID: 0}
|
||||
m_InteractionLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_InteractionLayers:
|
||||
m_Bits: 4294967295
|
||||
m_AttachTransform: {fileID: 0}
|
||||
m_KeepSelectedTargetValid: 1
|
||||
m_StartingSelectedInteractable: {fileID: 0}
|
||||
m_HoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2498142198148501413}
|
||||
m_TargetAssemblyTypeName: CraftingTable, Assembly-CSharp
|
||||
m_MethodName: Set1
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_SelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2498142198148501413}
|
||||
m_TargetAssemblyTypeName: CraftingTable, Assembly-CSharp
|
||||
m_MethodName: Exit1
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_OnHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ShowInteractableHoverMeshes: 1
|
||||
m_InteractableHoverMeshMaterial: {fileID: 0}
|
||||
m_InteractableCantHoverMeshMaterial: {fileID: 0}
|
||||
m_SocketActive: 1
|
||||
m_InteractableHoverScale: 1
|
||||
m_RecycleDelayTime: 1
|
||||
--- !u!1 &2498142196498008886
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2498142196498008887}
|
||||
m_Layer: 0
|
||||
m_Name: Output
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2498142196498008887
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142196498008886}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.442, z: 0.4}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4613100203587676735}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2498142198288847794
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2498142198288847795}
|
||||
- component: {fileID: 2498142198288847806}
|
||||
- component: {fileID: 2498142198288847793}
|
||||
- component: {fileID: 2498142198288847792}
|
||||
- component: {fileID: 2498142198288847807}
|
||||
m_Layer: 2
|
||||
m_Name: Holster2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2498142198288847795
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142198288847794}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.625, y: 1.125, z: 0}
|
||||
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
|
||||
m_ConstrainProportionsScale: 1
|
||||
m_Children: []
|
||||
m_Father: {fileID: 4613100203587676735}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &2498142198288847806
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142198288847794}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &2498142198288847793
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142198288847794}
|
||||
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: 8aa659f864a2309459a789493298b561, 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!135 &2498142198288847792
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142198288847794}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2498142198288847807
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2498142198288847794}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_InteractionManager: {fileID: 0}
|
||||
m_InteractionLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_InteractionLayers:
|
||||
m_Bits: 4294967295
|
||||
m_AttachTransform: {fileID: 0}
|
||||
m_KeepSelectedTargetValid: 1
|
||||
m_StartingSelectedInteractable: {fileID: 0}
|
||||
m_HoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2498142198148501413}
|
||||
m_TargetAssemblyTypeName: CraftingTable, Assembly-CSharp
|
||||
m_MethodName: Set2
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_SelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2498142198148501413}
|
||||
m_TargetAssemblyTypeName: CraftingTable, Assembly-CSharp
|
||||
m_MethodName: Exit2
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_OnHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_ShowInteractableHoverMeshes: 1
|
||||
m_InteractableHoverMeshMaterial: {fileID: 0}
|
||||
m_InteractableCantHoverMeshMaterial: {fileID: 0}
|
||||
m_SocketActive: 1
|
||||
m_InteractableHoverScale: 1
|
||||
m_RecycleDelayTime: 1
|
||||
--- !u!1 &7555529677801912869
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4613100203587676735}
|
||||
- component: {fileID: 2332025137064483307}
|
||||
- component: {fileID: 9211503402556239371}
|
||||
- component: {fileID: 5589036462924164355}
|
||||
- component: {fileID: 2498142198148501413}
|
||||
m_Layer: 0
|
||||
m_Name: CratingTable
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4613100203587676735
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7555529677801912869}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -17.734375, y: 2.651288, z: 46.831947}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2498142198288847795}
|
||||
- {fileID: 2498142196473246274}
|
||||
- {fileID: 2498142196498008887}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &2332025137064483307
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7555529677801912869}
|
||||
m_Mesh: {fileID: 4300000, guid: c0a2638e6a3e8204d911bad0db1a66ef, type: 3}
|
||||
--- !u!23 &9211503402556239371
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7555529677801912869}
|
||||
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: d08a0d1aba6bbce4b815d4bd76548e32, 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: 0
|
||||
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!64 &5589036462924164355
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7555529677801912869}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 4300000, guid: c0a2638e6a3e8204d911bad0db1a66ef, type: 3}
|
||||
--- !u!114 &2498142198148501413
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7555529677801912869}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 3cc30985ba0315045835d44b1b530ed4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
item1: {fileID: 0}
|
||||
item2: {fileID: 0}
|
||||
socket1: {fileID: 2498142196473246274}
|
||||
socket2: {fileID: 2498142198288847795}
|
||||
output: {fileID: 2498142196498008887}
|
||||
startWand: {fileID: 7748908063851026723, guid: d3af4ebc0ff721d4fbcc988713bb674c,
|
||||
type: 3}
|
||||
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 95a45162399a4e545b37f543c2c9e3cb
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3e4dd2090cef3854996bb61576625b95
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,405 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2150963203490498599
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8009436372187810761}
|
||||
m_Layer: 0
|
||||
m_Name: AudioContainer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8009436372187810761
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2150963203490498599}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8016638631522913145}
|
||||
- {fileID: 830771699160150727}
|
||||
m_Father: {fileID: 4402262400481754071}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3917053023338471789
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4402262400481754071}
|
||||
- component: {fileID: 772404450966566002}
|
||||
- component: {fileID: 3268723311598239928}
|
||||
- component: {fileID: 7564575873016353892}
|
||||
- component: {fileID: 3597675138378626114}
|
||||
m_Layer: 0
|
||||
m_Name: shield_spell
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &4402262400481754071
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3917053023338471789}
|
||||
m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 26.388, y: 4.077, z: 49.415}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8009436372187810761}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180}
|
||||
--- !u!33 &772404450966566002
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3917053023338471789}
|
||||
m_Mesh: {fileID: -462981019419857548, guid: 61bc520e906d62948ad0190bdafa7e0b, type: 3}
|
||||
--- !u!23 &3268723311598239928
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3917053023338471789}
|
||||
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: 76a090587dfffcc44b9f65fc50885f0e, 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!65 &7564575873016353892
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3917053023338471789}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 3.8, y: 0.3, z: 2.0000007}
|
||||
m_Center: {x: 0, y: -0.0046907673, z: 0.000000001118366}
|
||||
--- !u!114 &3597675138378626114
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3917053023338471789}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: add865683e185ac43b2093091d499b6a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
health: 5
|
||||
startColor: {r: 0.019607844, g: 0.77254903, b: 0.77254903, a: 0}
|
||||
endColor: {r: 0.8666667, g: 0.43137255, b: 0.13333334, a: 0}
|
||||
--- !u!1 &4435714647248106357
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 830771699160150727}
|
||||
- component: {fileID: 1847720263387817307}
|
||||
m_Layer: 0
|
||||
m_Name: StartAudio
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &830771699160150727
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4435714647248106357}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8009436372187810761}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &1847720263387817307
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4435714647248106357}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: bffd04c63c968ad4fb0e13f0e411bace, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 0
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 500
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &8184507062429303495
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8016638631522913145}
|
||||
- component: {fileID: 8507697006130315820}
|
||||
m_Layer: 0
|
||||
m_Name: PassiveAudio
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8016638631522913145
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8184507062429303495}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8009436372187810761}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!82 &8507697006130315820
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8184507062429303495}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
OutputAudioMixerGroup: {fileID: 0}
|
||||
m_audioClip: {fileID: 8300000, guid: 4e7ab8c8a00c0974ebf8da37173931f7, type: 3}
|
||||
m_PlayOnAwake: 1
|
||||
m_Volume: 1
|
||||
m_Pitch: 1
|
||||
Loop: 1
|
||||
Mute: 0
|
||||
Spatialize: 0
|
||||
SpatializePostEffects: 0
|
||||
Priority: 128
|
||||
DopplerLevel: 1
|
||||
MinDistance: 1
|
||||
MaxDistance: 200
|
||||
Pan2D: 0
|
||||
rolloffMode: 0
|
||||
BypassEffects: 0
|
||||
BypassListenerEffects: 0
|
||||
BypassReverbZones: 0
|
||||
rolloffCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
panLevelCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
spreadCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 0
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
reverbZoneMixCustomCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 0
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0.33333334
|
||||
outWeight: 0.33333334
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a355e1838d63064c90e1022e869ce87
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,407 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &7748908063851026723
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7748908063851286711}
|
||||
- component: {fileID: 7748908063854181351}
|
||||
- component: {fileID: 7748908063853248009}
|
||||
- component: {fileID: 7748908063613086307}
|
||||
- component: {fileID: 7748908063613086306}
|
||||
- component: {fileID: 7748908063613086305}
|
||||
- component: {fileID: -6665883121303373720}
|
||||
m_Layer: 10
|
||||
m_Name: wand
|
||||
m_TagString: Player
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7748908063851286711
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0}
|
||||
m_LocalPosition: {x: -16.799112, y: 2.9991617, z: 50.491257}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7748908064016802036}
|
||||
- {fileID: 8368985291049322116}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180}
|
||||
--- !u!33 &7748908063854181351
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
m_Mesh: {fileID: 4300134, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
|
||||
--- !u!23 &7748908063853248009
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
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!54 &7748908063613086307
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!136 &7748908063613086306
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Radius: 0.03857441
|
||||
m_Height: 0.44495377
|
||||
m_Direction: 1
|
||||
m_Center: {x: -0.0026081756, y: 0.15938577, z: -0.0010241088}
|
||||
--- !u!114 &7748908063613086305
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_InteractionManager: {fileID: 0}
|
||||
m_Colliders: []
|
||||
m_InteractionLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_InteractionLayers:
|
||||
m_Bits: 1
|
||||
m_SelectMode: 0
|
||||
m_CustomReticle: {fileID: 0}
|
||||
m_FirstHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LastHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FirstSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LastSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2674332923911434404, guid: 3e4dd2090cef3854996bb61576625b95,
|
||||
type: 3}
|
||||
m_TargetAssemblyTypeName: PlayerInfo, Assembly-CSharp
|
||||
m_MethodName: AddLeftHand
|
||||
m_Mode: 2
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 7748908063851026723}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 2674332923911434404, guid: 3e4dd2090cef3854996bb61576625b95,
|
||||
type: 3}
|
||||
m_TargetAssemblyTypeName: PlayerInfo, Assembly-CSharp
|
||||
m_MethodName: AddRightHand
|
||||
m_Mode: 2
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 7748908063851026723}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_SelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2674332923911434404, guid: 3e4dd2090cef3854996bb61576625b95,
|
||||
type: 3}
|
||||
m_TargetAssemblyTypeName: PlayerInfo, Assembly-CSharp
|
||||
m_MethodName: RemoveLeftHand
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
- m_Target: {fileID: 2674332923911434404, guid: 3e4dd2090cef3854996bb61576625b95,
|
||||
type: 3}
|
||||
m_TargetAssemblyTypeName: PlayerInfo, Assembly-CSharp
|
||||
m_MethodName: RemoveRightHand
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
m_Activated:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Deactivated:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnFirstHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnLastHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectCanceled:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnActivate:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnDeactivate:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_AttachTransform: {fileID: 7748908064016802036}
|
||||
m_AttachEaseInTime: 0.15
|
||||
m_MovementType: 2
|
||||
m_VelocityDamping: 1
|
||||
m_VelocityScale: 1
|
||||
m_AngularVelocityDamping: 1
|
||||
m_AngularVelocityScale: 1
|
||||
m_TrackPosition: 1
|
||||
m_SmoothPosition: 0
|
||||
m_SmoothPositionAmount: 5
|
||||
m_TightenPosition: 0.5
|
||||
m_TrackRotation: 1
|
||||
m_SmoothRotation: 0
|
||||
m_SmoothRotationAmount: 5
|
||||
m_TightenRotation: 0.5
|
||||
m_ThrowOnDetach: 1
|
||||
m_ThrowSmoothingDuration: 0.25
|
||||
m_ThrowSmoothingCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
m_ThrowVelocityScale: 1.5
|
||||
m_ThrowAngularVelocityScale: 1
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_RetainTransformParent: 1
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
--- !u!114 &-6665883121303373720
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908063851026723}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9df026d0ca5cb9c4dbe59181dd93dbdb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
power: 1
|
||||
--- !u!1 &7748908064016802035
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7748908064016802036}
|
||||
m_Layer: 0
|
||||
m_Name: AttachTransform
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7748908064016802036
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7748908064016802035}
|
||||
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7748908063851286711}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||
--- !u!1001 &448098250526919439
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 7748908063851286711}
|
||||
m_Modifications:
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.331
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8788993151639831550, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: FlyWandParticles
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 16595acc1c95e1843870f6d5ed6b3ad8, type: 3}
|
||||
--- !u!4 &8368985291049322116 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 448098250526919439}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d3af4ebc0ff721d4fbcc988713bb674c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -87,7 +87,7 @@ public class HandAnim : MonoBehaviour
|
||||
|
||||
private void GripActionPerformed(InputAction.CallbackContext obj)
|
||||
{
|
||||
Debug.Log("grip");
|
||||
//Debug.Log("grip");
|
||||
CalculateState(obj.ReadValue<float>(), ref grip_state);
|
||||
m_animator.SetFloat(m_animParamIndexFlex, grip_state);
|
||||
}
|
||||
|
||||
@@ -1,17 +1,22 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
[Serializable]
|
||||
public class Inventory : MonoBehaviour
|
||||
{
|
||||
//perhaps use these additional slots for holsters attached to the player?
|
||||
public List<InventorySlot> additionalSlots;
|
||||
|
||||
public GameObject itemContainerPrefab;
|
||||
|
||||
private List<InventorySlot> _inventorySlots;
|
||||
|
||||
public InventorySaveData inventorySaveData;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_inventorySlots = new List<InventorySlot>();
|
||||
@@ -20,10 +25,15 @@ public class Inventory : MonoBehaviour
|
||||
inventorySlot.SetParentInventory(this);
|
||||
_inventorySlots.Add(inventorySlot);
|
||||
}
|
||||
|
||||
Debug.Log(_inventorySlots.Count);
|
||||
}
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
SceneManager.sceneLoaded += OnSceneLoaded;
|
||||
|
||||
|
||||
var inventorySlotsInChildren = GetComponentsInChildren<InventorySlot>();
|
||||
foreach (var inventorySlot in inventorySlotsInChildren)
|
||||
{
|
||||
@@ -32,6 +42,12 @@ public class Inventory : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
SceneManager.sceneLoaded -= OnSceneLoaded;
|
||||
}
|
||||
|
||||
|
||||
public bool AddItem(ItemData item)
|
||||
{
|
||||
if (item.canStack)
|
||||
@@ -39,16 +55,17 @@ public class Inventory : MonoBehaviour
|
||||
return AddItem(ConvertToInventoryItem(item));
|
||||
}
|
||||
|
||||
return AddToFirstOpenSlot(item.gameObject);
|
||||
return AddToFirstOpenSlot(item.prefab.gameObject);
|
||||
}
|
||||
|
||||
public bool AddItem(InventoryItem item)
|
||||
{
|
||||
|
||||
//Stacks the item if it already exists in the inventory.
|
||||
foreach (var inventorySlot in _inventorySlots.Where(inventorySlot =>
|
||||
inventorySlot.ContainsItem(item.GetItemid())))
|
||||
{
|
||||
inventorySlot.GetItem().ChangeCount(item.Count);
|
||||
inventorySlot.GetItem().ChangeCount(item.saveData.count);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -67,11 +84,91 @@ public class Inventory : MonoBehaviour
|
||||
return false;
|
||||
}
|
||||
|
||||
private void AddToSpecificSlot(GameObject item, int slot)
|
||||
{
|
||||
_inventorySlots[slot].AssignItem(item);
|
||||
}
|
||||
|
||||
private InventoryItem ConvertToInventoryItem(ItemData item)
|
||||
{
|
||||
var inventoryItem = Instantiate(itemContainerPrefab, transform);
|
||||
itemContainerPrefab.GetComponent<InventoryItem>().itemPrefab = item.gameObject;
|
||||
itemContainerPrefab.GetComponent<InventoryItem>().itemPrefab = item.prefab.gameObject;
|
||||
|
||||
return inventoryItem.gameObject.GetComponent<InventoryItem>();
|
||||
}
|
||||
|
||||
|
||||
public void SaveInventory()
|
||||
{
|
||||
inventorySaveData.inventoryContents.Clear();
|
||||
foreach (var inventoryItem in _inventorySlots.Select(inventorySlot => inventorySlot.GetItem()))
|
||||
{
|
||||
//adds an itemsavedata to the list if it exists or an empty one if it doesnt
|
||||
inventorySaveData.inventoryContents.Add(inventoryItem != null
|
||||
? inventoryItem.saveData
|
||||
: new ItemSaveData());
|
||||
}
|
||||
|
||||
var json = JsonUtility.ToJson(inventorySaveData);
|
||||
Debug.Log(json);
|
||||
using var sw = new StreamWriter(Path.Combine(Application.persistentDataPath, "invSave.dat"));
|
||||
sw.Write(json);
|
||||
|
||||
|
||||
Debug.Log("Inv data saved!");
|
||||
}
|
||||
|
||||
public IEnumerator LoadInventory()
|
||||
{
|
||||
//Wait for 1 second after loading the scene to prevent missing prefabs. (1 second delay might also break something in the future)
|
||||
|
||||
yield return new WaitForSeconds(1);
|
||||
//todo make this modular, currently only supports one inventory, although the slots can be anywhere.
|
||||
if (File.Exists(Path.Combine(Application.persistentDataPath, "invSave.dat")))
|
||||
{
|
||||
var saveData = JsonUtility.FromJson<InventorySaveData>(File.ReadAllText(Path.Combine(Application.persistentDataPath, "invSave.dat")));
|
||||
Debug.Log(saveData);
|
||||
Debug.Log("Inv data loaded! total "+saveData.inventoryContents.Count);
|
||||
|
||||
|
||||
for (var i = 0; i < saveData.inventoryContents.Count; i++)
|
||||
{
|
||||
//prevents overwriting inventory slots when there is something already in there.
|
||||
//if (_inventorySlots[i]._itemInSlot != null) continue;
|
||||
|
||||
var data = saveData.inventoryContents[i];
|
||||
|
||||
//if there isnt an item in the slot the count is 0
|
||||
Debug.Log(data.assetPath + " "+data.count);
|
||||
if (data.count == 0) continue;
|
||||
|
||||
//Loads the prefab from resources folder
|
||||
var load = Resources.Load(data.assetPath, typeof(GameObject)) as GameObject;
|
||||
if (load == null)
|
||||
{
|
||||
Debug.LogError("Didn't find a prefab at " + data.assetPath);
|
||||
yield break;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Debug.Log(load);
|
||||
AddToSpecificSlot(load, i);
|
||||
|
||||
//sets the count after the item has been converted into inventoryitem
|
||||
if (load.GetComponent<ItemData>().canStack) _inventorySlots[i]._itemInSlot.GetComponent<InventoryItem>().saveData.count = data.count;
|
||||
}
|
||||
}
|
||||
else
|
||||
Debug.LogError("There is no save data!");
|
||||
}
|
||||
|
||||
|
||||
void OnSceneLoaded(Scene scene, LoadSceneMode mode)
|
||||
{
|
||||
Debug.Log("OnSceneLoaded: " + scene.name);
|
||||
|
||||
//primitive check to only load the inventory when you are in the home scene.
|
||||
if (scene.name.Contains("Homebase")) StartCoroutine(LoadInventory());
|
||||
}
|
||||
}
|
||||
@@ -4,16 +4,14 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.XR.Interaction.Toolkit;
|
||||
|
||||
[Serializable]
|
||||
[RequireComponent(typeof(XRSocketInteractor))]
|
||||
public class InventorySlot : MonoBehaviour
|
||||
{
|
||||
private XRSocketInteractor xrSocketInteractor;
|
||||
|
||||
private GameObject _itemInSlot;
|
||||
public GameObject _itemInSlot;
|
||||
|
||||
private Inventory _parentInventory;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
xrSocketInteractor = GetComponent<XRSocketInteractor>();
|
||||
@@ -35,6 +33,7 @@ public class InventorySlot : MonoBehaviour
|
||||
if (_itemInSlot.GetComponent<InventoryItem>() == null) return;
|
||||
if (_itemInSlot == args.interactableObject.transform.gameObject) return;
|
||||
|
||||
|
||||
//Debug.Log("hoverenter "+args.interactableObject + " " + xrSocketInteractor.hasHover + " " + xrSocketInteractor.hasSelection);
|
||||
|
||||
var newItem = args.interactableObject.transform.gameObject;
|
||||
@@ -47,7 +46,7 @@ public class InventorySlot : MonoBehaviour
|
||||
|
||||
if (inventoryItem != null)
|
||||
{
|
||||
_itemInSlot.GetComponent<InventoryItem>().ChangeCount(inventoryItem.Count);
|
||||
_itemInSlot.GetComponent<InventoryItem>().ChangeCount(inventoryItem.saveData.count);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -70,11 +69,13 @@ public class InventorySlot : MonoBehaviour
|
||||
private void SelectEnter(SelectEnterEventArgs args)
|
||||
{
|
||||
Debug.Log("Added to slot item " + _itemInSlot);
|
||||
|
||||
var newItem = args.interactableObject.transform.gameObject;
|
||||
|
||||
//todo: fix ones that cant stack
|
||||
|
||||
//Converts the item into a inventory item
|
||||
if (newItem.GetComponent<InventoryItem>() == null && newItem.GetComponent<ItemData>().canStack)
|
||||
if (newItem.GetComponent<InventoryItem>() == null)
|
||||
{
|
||||
|
||||
var load = Resources.Load("Helar/Item", typeof(GameObject)) as GameObject;
|
||||
@@ -101,12 +102,39 @@ public class InventorySlot : MonoBehaviour
|
||||
|
||||
|
||||
_itemInSlot = instance;
|
||||
|
||||
//_parentInventory.AddItem(instance.GetComponent<InventoryItem>());
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
_itemInSlot = newItem;
|
||||
|
||||
//_parentInventory.AddItem(newItem.GetComponentInChildren<ItemData>());
|
||||
//xrSocketInteractor.attachTransform = _itemInSlot.transform;
|
||||
Debug.Log("Holstered item" + _itemInSlot.GetComponentInChildren<ItemData>());
|
||||
|
||||
}
|
||||
|
||||
private GameObject ConvertItem(GameObject item)
|
||||
{
|
||||
//load container object
|
||||
var load = Resources.Load("Helar/Item", typeof(GameObject)) as GameObject;
|
||||
//instantiate the container object
|
||||
var instance = Instantiate(load, transform);
|
||||
|
||||
//load the container with the item to convert
|
||||
instance.GetComponent<InventoryItem>().itemPrefab = item.gameObject;
|
||||
|
||||
//set the position and scale so it fits in the container
|
||||
instance.transform.localScale = Vector3.one;
|
||||
instance.transform.localPosition = Vector3.zero;
|
||||
instance.transform.rotation = Quaternion.identity;
|
||||
|
||||
//enable the itemcontainer (more logic in InventoryItem OnEnable() method)
|
||||
instance.GetComponent<InventoryItem>().enabled = true;
|
||||
|
||||
return instance;
|
||||
}
|
||||
|
||||
private void ManagerOninteractableUnregistered(InteractableUnregisteredEventArgs obj)
|
||||
@@ -126,12 +154,14 @@ public class InventorySlot : MonoBehaviour
|
||||
component.drag = 0.5f;
|
||||
|
||||
if (!_itemInSlot.GetComponentInChildren<ItemData>().canStack ||
|
||||
_itemInSlot.GetComponent<InventoryItem>().Count == 1)
|
||||
_itemInSlot.GetComponent<InventoryItem>().saveData.count == 1)
|
||||
{
|
||||
//todo change back to regular item
|
||||
//_itemInSlot.GetComponent<InventoryItem>().PopItem();
|
||||
//var transformGameObject = _itemInSlot.GetComponentInChildren<ItemData>().transform.gameObject;
|
||||
//Debug.Log(transformGameObject);
|
||||
//args.interactableObject = transformGameObject.GetComponent<XRGrabInteractable>();
|
||||
//todo change back to regular item
|
||||
|
||||
}
|
||||
Debug.Log("Removed from slot item " + _itemInSlot);
|
||||
_itemInSlot = null;
|
||||
@@ -159,12 +189,21 @@ public class InventorySlot : MonoBehaviour
|
||||
}
|
||||
|
||||
public void AssignItem(GameObject newObject)
|
||||
{
|
||||
if (newObject.GetComponent<InventoryItem>() == null)
|
||||
{
|
||||
_itemInSlot = ConvertItem(newObject);
|
||||
}
|
||||
else
|
||||
{
|
||||
_itemInSlot = newObject;
|
||||
}
|
||||
}
|
||||
|
||||
public InventoryItem GetItem()
|
||||
{
|
||||
if (_itemInSlot == null) return null;
|
||||
|
||||
var inventoryItem = _itemInSlot.GetComponent<InventoryItem>();
|
||||
if (inventoryItem == null) Debug.LogError("Item in slot doesn't have InventoryItem component");
|
||||
return inventoryItem;
|
||||
|
||||
@@ -9,7 +9,7 @@ public class ItemSpawner : MonoBehaviour
|
||||
public GameObject placeToSpawn;
|
||||
public void SpawnItem()
|
||||
{
|
||||
Debug.Log("Spawned " + objectToSpawn);
|
||||
Instantiate(objectToSpawn, placeToSpawn.transform);
|
||||
Debug.Log("Spawned " + objectToSpawn);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using Unity.Mathematics;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.XR.Interaction.Toolkit;
|
||||
|
||||
@@ -13,15 +12,13 @@ public class InventoryItem : MonoBehaviour
|
||||
|
||||
public GameObject itemPrefab;
|
||||
|
||||
private int _itemId;
|
||||
|
||||
private GameObject _childPrefab;
|
||||
|
||||
public int Count { get; private set; }
|
||||
private TMP_Text itemCounterText;
|
||||
|
||||
public TMP_Text itemCounterText;
|
||||
private ItemData itemData;
|
||||
|
||||
private ItemData _itemData;
|
||||
public ItemSaveData saveData;
|
||||
|
||||
|
||||
private void OnEnable()
|
||||
@@ -37,13 +34,15 @@ public class InventoryItem : MonoBehaviour
|
||||
|
||||
if (itemCounterText == null) itemCounterText = GetComponentInChildren<TMP_Text>();
|
||||
|
||||
_childPrefab = GetComponentInChildren<ItemData>()?.gameObject;
|
||||
_childPrefab = GetComponentInChildren<ItemData>()?.prefab.gameObject;
|
||||
//Only attaches the prefab if it doesn't already have one ([ExecuteAlways] causes one to be spawned in editor).
|
||||
if (_childPrefab != null) return;
|
||||
|
||||
_childPrefab = Instantiate(itemPrefab, transform);
|
||||
_childPrefab.transform.localPosition = new Vector3(0, -0.45f, 0);
|
||||
_childPrefab.transform.localScale = new Vector3(2, 2, 2);
|
||||
|
||||
//todo switch to multiply instead so items with non 1,1,1 scale will retain their proportions
|
||||
_childPrefab.transform.localPosition = GetComponentInChildren<ItemData>().positionInContainer;
|
||||
_childPrefab.transform.localScale = GetComponentInChildren<ItemData>().scaleInContainer;
|
||||
_childPrefab.transform.rotation = quaternion.identity;
|
||||
|
||||
//Disable prefab components that arent relevant.
|
||||
@@ -60,23 +59,28 @@ public class InventoryItem : MonoBehaviour
|
||||
var xrGrabInteractableComponent = _childPrefab.GetComponent<XRGrabInteractable>();
|
||||
if (xrGrabInteractableComponent != null) xrGrabInteractableComponent.enabled = false;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_itemData = _childPrefab.GetComponent<ItemData>();
|
||||
itemData = _childPrefab.GetComponent<ItemData>();
|
||||
|
||||
if (_itemData == null) Debug.LogError("Item prefab has no attached ItemData", _childPrefab);
|
||||
if (itemData == null) Debug.LogError("Item prefab has no attached ItemData", _childPrefab);
|
||||
|
||||
|
||||
_itemId = _itemData.itemId;
|
||||
if (Count == 0) Count = 1;
|
||||
Debug.Log(saveData);
|
||||
if (string.IsNullOrEmpty(saveData.assetPath))
|
||||
{
|
||||
saveData.assetPath = itemData.assetLocation;
|
||||
saveData.count = saveData.count == 0 ? 1 : saveData.count;
|
||||
}
|
||||
UpdateText();
|
||||
}
|
||||
|
||||
private void UpdateText()
|
||||
{
|
||||
itemCounterText.text = _itemData.canStack ? Count.ToString() : "";
|
||||
itemCounterText.text = itemData.canStack ? saveData.count.ToString() : "";
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -85,11 +89,11 @@ public class InventoryItem : MonoBehaviour
|
||||
*/
|
||||
public bool ChangeCount(int amount)
|
||||
{
|
||||
if (Count + amount < 0) return false;
|
||||
if (saveData.count + amount < 0) return false;
|
||||
|
||||
Count += amount;
|
||||
saveData.count += amount;
|
||||
|
||||
if (Count == 0)
|
||||
if (saveData.count == 0)
|
||||
{
|
||||
//Destroys this gameobject if the count is 0 or lower
|
||||
Destroy(gameObject);
|
||||
@@ -103,10 +107,11 @@ public class InventoryItem : MonoBehaviour
|
||||
|
||||
public void PopItem()
|
||||
{
|
||||
GameObject item = Instantiate(_itemData.prefab, transform.position + transform.forward, Quaternion.identity);
|
||||
GameObject item = Instantiate(itemData.prefab, transform.position + transform.forward, Quaternion.identity);
|
||||
|
||||
|
||||
item.transform.localScale = Vector3.one;
|
||||
item.transform.name = _itemData.name;
|
||||
item.transform.name = itemData.itemName;
|
||||
|
||||
var colliderComponent = item.GetComponent<Collider>();
|
||||
if (colliderComponent != null) colliderComponent.enabled = true;
|
||||
@@ -127,13 +132,13 @@ public class InventoryItem : MonoBehaviour
|
||||
|
||||
public int GetItemid()
|
||||
{
|
||||
return _itemId;
|
||||
return itemData.itemId;;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return $"{base.ToString()}, Count: {Count}, ItemData: {_itemData}";
|
||||
return $"{base.ToString()}, Count: {saveData.count}, ItemData: {itemData}";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
[Serializable]
|
||||
public class InventorySaveData
|
||||
{
|
||||
public List<ItemSaveData> inventoryContents;
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3cc30985ba0315045835d44b1b530ed4
|
||||
guid: e60ec35305ed0b94099d18a09b488310
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@@ -1,16 +1,44 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor;
|
||||
using UnityEditor.SceneManagement;
|
||||
using UnityEngine;
|
||||
|
||||
[Serializable]
|
||||
public class ItemData : MonoBehaviour
|
||||
{
|
||||
[Tooltip("Location is populated automatically")]
|
||||
public string assetLocation;
|
||||
public int itemId;
|
||||
public bool canStack;
|
||||
public string itemName;
|
||||
public string itemDescription;
|
||||
public GameObject prefab;
|
||||
public Vector3 scaleInContainer;
|
||||
public Vector3 positionInContainer;
|
||||
|
||||
private void OnValidate()
|
||||
{
|
||||
if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(prefab))) assetLocation = AssetDatabase.GetAssetPath(prefab);
|
||||
|
||||
AdjustPath();
|
||||
}
|
||||
|
||||
private void AdjustPath()
|
||||
{
|
||||
//trims the location for use with Resources.Load later
|
||||
if (assetLocation.StartsWith("Assets/Resources/"))
|
||||
assetLocation = assetLocation[17 .. ^7];
|
||||
else if (!string.IsNullOrEmpty(assetLocation))
|
||||
if (assetLocation.StartsWith("Assets"))
|
||||
{
|
||||
Debug.LogError(itemName +
|
||||
": item with this script should be placed in the Assets/Resources/ folder. Currently: " +
|
||||
assetLocation);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
|
||||
12
Assets/Project Files/Scripts/Helar/Items/ItemSaveData.cs
Normal file
12
Assets/Project Files/Scripts/Helar/Items/ItemSaveData.cs
Normal file
@@ -0,0 +1,12 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
[Serializable]
|
||||
public class ItemSaveData
|
||||
{
|
||||
public string assetPath;
|
||||
public int count;
|
||||
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: add865683e185ac43b2093091d499b6a
|
||||
guid: 2e553150cec08514e9aacc82fe8da007
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
@@ -13,10 +13,6 @@ public class ActionGestureInteraction : MonoBehaviour
|
||||
public float projectileSpeed = 30;
|
||||
|
||||
private bool holdingWand;
|
||||
private float wandPower;
|
||||
private string wandElement;
|
||||
|
||||
public AudioSource noEssenceAudio;
|
||||
|
||||
void Start()
|
||||
{
|
||||
@@ -27,19 +23,16 @@ public class ActionGestureInteraction : MonoBehaviour
|
||||
{
|
||||
Debug.LogWarning(action);
|
||||
|
||||
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand());
|
||||
|
||||
/* todo: playerinfo doesnt have these methods?
|
||||
if (player.GetComponent<PlayerInfo>().GetRightHand() != null)
|
||||
{
|
||||
|
||||
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Contains("wand"))
|
||||
{
|
||||
holdingWand = true;
|
||||
wandPower = player.GetComponent<PlayerInfo>().GetRightHand().GetComponent<WandData>().power;
|
||||
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
|
||||
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
|
||||
}
|
||||
|
||||
}
|
||||
else holdingWand = false;
|
||||
|
||||
*/
|
||||
|
||||
switch (action)
|
||||
{
|
||||
@@ -54,29 +47,17 @@ public class ActionGestureInteraction : MonoBehaviour
|
||||
{
|
||||
Debug.LogWarning("WOODCUTTING ACTION");
|
||||
}
|
||||
break;
|
||||
return;
|
||||
case "VerticalLine":
|
||||
if (holdingWand)
|
||||
{
|
||||
Debug.LogWarning("WAND VERTICAL");
|
||||
if (PlayerInfo.Instance.AddEssenceBasic(-1))
|
||||
{
|
||||
Vector3 spawnPoint = transform.position + playerCamera.transform.forward;
|
||||
spawnPoint = new Vector3(spawnPoint.x, spawnPoint.y + 1, spawnPoint.z);
|
||||
GameObject shield = Instantiate(objects[1], spawnPoint, Quaternion.Euler(-90, playerCamera.transform.eulerAngles.y - 180, 180));
|
||||
shield.GetComponent<ShieldController>().health = 3 * wandPower;
|
||||
}
|
||||
else
|
||||
{
|
||||
noEssenceAudio.Play();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning("VERTICAL");
|
||||
|
||||
}
|
||||
break;
|
||||
return;
|
||||
case "Circle":
|
||||
if (holdingWand)
|
||||
{
|
||||
@@ -85,15 +66,9 @@ public class ActionGestureInteraction : MonoBehaviour
|
||||
}
|
||||
else
|
||||
{
|
||||
GameObject minigame = FindMinigame();
|
||||
if (minigame != null)
|
||||
{
|
||||
float distance = Vector3.Distance(transform.position, minigame.transform.position);
|
||||
if(distance < 4f) minigame.GetComponent<WellController>().StartMinigame();
|
||||
Debug.LogWarning("CIRCLE");
|
||||
}
|
||||
|
||||
}
|
||||
break;
|
||||
return;
|
||||
case "Triangle":
|
||||
if (holdingWand)
|
||||
{
|
||||
@@ -103,7 +78,7 @@ public class ActionGestureInteraction : MonoBehaviour
|
||||
{
|
||||
Debug.LogWarning("WOODCUTTING ACTION");
|
||||
}
|
||||
break;
|
||||
return;
|
||||
}
|
||||
|
||||
/*if (action == "Portal")
|
||||
@@ -192,7 +167,6 @@ public class ActionGestureInteraction : MonoBehaviour
|
||||
{
|
||||
Debug.LogWarning("INSTANTIATE BOLT");
|
||||
var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
|
||||
projectileObj.GetComponent<Projectile>().damage = 1 * wandPower;
|
||||
projectileObj.GetComponent<Rigidbody>().velocity = (playerCamera.transform.forward).normalized * projectileSpeed;
|
||||
projectileObj.GetComponent<Rigidbody>().velocity = (destination - rightHandTransform.position).normalized * projectileSpeed;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,8 +14,6 @@ public class GestureRecognizer : MonoBehaviour
|
||||
public InputHelpers.Button rightInputButton;
|
||||
public InputHelpers.Button rightControlButton;
|
||||
|
||||
public Camera mainCamera;
|
||||
|
||||
public float inputThreshold = 0.1f;
|
||||
public Transform movementSource;
|
||||
|
||||
@@ -33,15 +31,10 @@ public class GestureRecognizer : MonoBehaviour
|
||||
private List<Gesture> trainingSet = new List<Gesture>();
|
||||
private bool isMoving = false;
|
||||
private List<Vector3> positionsList = new List<Vector3>();
|
||||
private Vector3 relativePosition;
|
||||
private List<GameObject> debugCubes;
|
||||
private List<Vector3> relativePositions;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
debugCubes = new List<GameObject>();
|
||||
relativePositions = new List<Vector3>();
|
||||
// Path = ..\AppData\LocalLow\DefaultCompany\Heroes of Hiis SCM
|
||||
Debug.Log(Application.persistentDataPath);
|
||||
string[] gestureFiles = Directory.GetFiles(Application.persistentDataPath, "*.xml");
|
||||
@@ -92,18 +85,13 @@ public class GestureRecognizer : MonoBehaviour
|
||||
|
||||
void StartMovement()
|
||||
{
|
||||
debugCubes.Clear();
|
||||
relativePositions.Clear();
|
||||
Debug.Log("Movement started");
|
||||
isMoving = true;
|
||||
positionsList.Clear();
|
||||
relativePosition = movementSource.position - mainCamera.transform.position;
|
||||
positionsList.Add(relativePosition);
|
||||
positionsList.Add(movementSource.position);
|
||||
if (debugCubePrefab)
|
||||
{
|
||||
GameObject cube = Instantiate(debugCubePrefab, relativePosition, Quaternion.identity);
|
||||
debugCubes.Add(cube);
|
||||
relativePositions.Add(relativePosition);
|
||||
Destroy(Instantiate(debugCubePrefab, movementSource.position, Quaternion.identity), 3);
|
||||
}
|
||||
}
|
||||
void EndMovement()
|
||||
@@ -141,31 +129,17 @@ public class GestureRecognizer : MonoBehaviour
|
||||
|
||||
}
|
||||
}
|
||||
foreach(GameObject obj in debugCubes)
|
||||
{
|
||||
Destroy(obj);
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateMovement()
|
||||
{
|
||||
relativePosition = movementSource.position - mainCamera.transform.position;
|
||||
|
||||
|
||||
for(int i = 0; i < debugCubes.Count; i++)
|
||||
{
|
||||
debugCubes[i].transform.position = mainCamera.transform.position + relativePositions[i];
|
||||
}
|
||||
|
||||
Vector3 lastPosition = positionsList[positionsList.Count - 1];
|
||||
if (Vector3.Distance(relativePosition, lastPosition) > newPositionThresholdDistance)
|
||||
if (Vector3.Distance(movementSource.position, lastPosition) > newPositionThresholdDistance)
|
||||
{
|
||||
positionsList.Add(relativePosition);
|
||||
positionsList.Add(movementSource.position);
|
||||
if (debugCubePrefab)
|
||||
{
|
||||
GameObject cube = Instantiate(debugCubePrefab, relativePosition, Quaternion.identity);
|
||||
debugCubes.Add(cube);
|
||||
relativePositions.Add(relativePosition);
|
||||
Destroy(Instantiate(debugCubePrefab, movementSource.position, Quaternion.identity), 3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,46 +7,34 @@ public class Projectile : MonoBehaviour
|
||||
private bool collided;
|
||||
Vector3 oldEulerAngles;
|
||||
|
||||
public float damage;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
// Will always be destroyed after 10 seconds.
|
||||
Destroy(gameObject, 10);
|
||||
|
||||
//oldEulerAngles = transform.rotation.eulerAngles;
|
||||
oldEulerAngles = transform.rotation.eulerAngles;
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
/*if (oldEulerAngles != transform.rotation.eulerAngles)
|
||||
if (oldEulerAngles != transform.rotation.eulerAngles)
|
||||
{
|
||||
Destroy(gameObject);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
private void OnCollisionEnter(Collision collision)
|
||||
private void onCollisionEnter(Collider other)
|
||||
{
|
||||
Debug.LogWarning(collision.gameObject.name);
|
||||
if (collision.gameObject.tag != "IceBolt" && collision.gameObject.tag != "Player" && !collided)
|
||||
{
|
||||
collided = true;
|
||||
if (collision.gameObject.name == "Dummy") Destroy(collision.gameObject); //REPLACE WITH ENEMY TAG CHECK AND DAMAGE CHECKING
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
}
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
Debug.LogWarning(other.gameObject.name);
|
||||
if (other.gameObject.tag != "IceBolt" && other.gameObject.tag != "Player" && !collided)
|
||||
{
|
||||
collided = true;
|
||||
Destroy(gameObject);
|
||||
}
|
||||
else if (other.gameObject.name == "Dummy")
|
||||
}
|
||||
private void onTriggerEnter(Collider other)
|
||||
{
|
||||
Destroy(other.gameObject);
|
||||
if (other.gameObject.tag != "IceBolt" && other.gameObject.tag != "Player" && !collided)
|
||||
{
|
||||
collided = true;
|
||||
Destroy(gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,86 +0,0 @@
|
||||
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.XR.Interaction.Toolkit;
|
||||
|
||||
public class CraftingTable : MonoBehaviour
|
||||
{
|
||||
public Transform item1;
|
||||
public Transform item2;
|
||||
|
||||
public Transform socket1;
|
||||
public Transform socket2;
|
||||
|
||||
public Transform output;
|
||||
public GameObject startWand;
|
||||
|
||||
void Start()
|
||||
{
|
||||
item1 = null;
|
||||
item2 = null;
|
||||
}
|
||||
|
||||
|
||||
public void Set1()
|
||||
{
|
||||
StartCoroutine(DelayCast(socket1,1));
|
||||
}
|
||||
|
||||
public void Exit1()
|
||||
{
|
||||
item1 = null;
|
||||
}
|
||||
|
||||
public void Set2()
|
||||
{
|
||||
StartCoroutine(DelayCast(socket2, 2));
|
||||
}
|
||||
|
||||
public void Exit2()
|
||||
{
|
||||
item2 = null;
|
||||
}
|
||||
|
||||
public void Craft()
|
||||
{
|
||||
//Currently simple if statement check crafting. Could be done better but will see if this system will be expanded
|
||||
|
||||
if (item1 == null || item2 == null) Debug.LogError("Missing item!");
|
||||
else
|
||||
{
|
||||
if((item1.name.StartsWith("wand") && item2.name.StartsWith("Log")) || (item2.name.StartsWith("wand") && item1.name.StartsWith("Log")))
|
||||
{
|
||||
if (item1.name.StartsWith("wand"))
|
||||
{
|
||||
WandData data = item1.GetComponent<WandData>();
|
||||
data.SetPower(data.power + 0.5f);
|
||||
item1.transform.position = output.position;
|
||||
Destroy(item2.gameObject);
|
||||
item2 = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
WandData data = item2.GetComponent<WandData>();
|
||||
data.SetPower(data.power + 0.5f);
|
||||
item2.transform.position = output.position;
|
||||
Destroy(item1.gameObject);
|
||||
item1 = null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Debug.LogError("Invalid Recipe!");
|
||||
}
|
||||
|
||||
IEnumerator DelayCast(Transform from, int i)
|
||||
{
|
||||
yield return new WaitForSeconds(0.5f);
|
||||
RaycastHit hit;
|
||||
if (Physics.Raycast(from.position + from.up, -from.up, out hit, Mathf.Infinity))
|
||||
{
|
||||
if (i == 1) item1 = hit.transform;
|
||||
else item2 = hit.transform;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@ public class EssenceNodeController : MonoBehaviour
|
||||
private void Awake()
|
||||
{
|
||||
nodeMaterial = GetComponent<Renderer>().material;
|
||||
playerInfo = PlayerInfo.Instance;
|
||||
//playerInfo = PlayerInfo.Instance;
|
||||
playerInventory = GameObject.Find("Inventory").GetComponent<Inventory>();
|
||||
}
|
||||
|
||||
|
||||
@@ -4,70 +4,32 @@ using UnityEngine;
|
||||
|
||||
public class PlayerInfo : MonoBehaviour
|
||||
{
|
||||
public static PlayerInfo Instance;
|
||||
|
||||
private int health;
|
||||
|
||||
private int essence_basic;
|
||||
//Add elemental essences?
|
||||
|
||||
private GameObject rightHandHeld;
|
||||
private GameObject leftHandHeld;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
Instance = this;
|
||||
health = 5;
|
||||
essence_basic = 0;
|
||||
rightHandHeld = null;
|
||||
leftHandHeld = null;
|
||||
}
|
||||
|
||||
public bool AddHealth(int value)
|
||||
public void AddHealth(int value)
|
||||
{
|
||||
health += value;
|
||||
if (health <= 0)
|
||||
{
|
||||
Debug.Log("NO HEALTH REMAINING");
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool AddEssenceBasic(int value)
|
||||
public void AddEssenceBasic(int value)
|
||||
{
|
||||
if (essence_basic + value < 0)
|
||||
{
|
||||
Debug.Log("NOT ENOUGH ESSENCE");
|
||||
return false;
|
||||
Debug.LogError("NOT ENOUGH ESSENCE");
|
||||
}
|
||||
else
|
||||
{
|
||||
essence_basic += value;
|
||||
return true;
|
||||
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 GetRightHand() { return rightHandHeld; }
|
||||
public GameObject GetLeftHand() { return leftHandHeld; }
|
||||
}
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class ShieldController : MonoBehaviour
|
||||
{
|
||||
|
||||
public float health = 5;
|
||||
|
||||
public Color startColor;
|
||||
public Color endColor;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
health -= Time.deltaTime;
|
||||
GetComponent<Renderer>().material.SetColor("_Color0", Color.Lerp(endColor, startColor, health / 5));
|
||||
if (health <= 0) Destroy(gameObject);
|
||||
}
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class WandData : MonoBehaviour
|
||||
{
|
||||
public float power = 1f;
|
||||
|
||||
//public string element = "water";
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void SetPower(float pow)
|
||||
{
|
||||
power = pow;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9df026d0ca5cb9c4dbe59181dd93dbdb
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -32,7 +32,7 @@ public class XRGUI : MonoBehaviour
|
||||
ExitButton.onClick.AddListener(() =>
|
||||
{
|
||||
Debug.Log("Clicked");
|
||||
//UnityEditor.EditorApplication.isPlaying = false;
|
||||
UnityEditor.EditorApplication.isPlaying = false;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c99047a61fb87224a853c5e5bd2e8b06
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
@@ -1,22 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4e7ab8c8a00c0974ebf8da37173931f7
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2b57b900363404c41af0b0d6300b8f9e
|
||||
guid: 7e103e2a5fcad9145a7884a55aaf9792
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
@@ -21,15 +21,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.1048176
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.032218672
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.81958795
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 451388, guid: 2ec0a21ef68f64a46864ad388da793c4, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
@@ -270,3 +270,23 @@ MonoBehaviour:
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_RetainTransformParent: 1
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
--- !u!114 &8950488617520359539
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 988253026175220877}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetLocation: Arlo/Axe
|
||||
itemId: 69
|
||||
canStack: 0
|
||||
itemName: Axe
|
||||
itemDescription:
|
||||
prefab: {fileID: 988253026175220877}
|
||||
scaleInContainer: {x: 2, y: 2, z: 2}
|
||||
positionInContainer: {x: 0, y: -0.33, z: 0}
|
||||
@@ -300,7 +300,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetLocation: Arlo/Log
|
||||
itemId: 5
|
||||
canStack: 1
|
||||
itemName: Wood Log
|
||||
itemDescription: A simple wooden log. A key ingredient for many things.
|
||||
prefab: {fileID: 3057085693074020240}
|
||||
scaleInContainer: {x: 0.8, y: 0.8, z: 0.8}
|
||||
positionInContainer: {x: 0, y: -0.215, z: 0}
|
||||
@@ -244,8 +244,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetLocation: Helar/Mushroom_01
|
||||
itemId: 1
|
||||
canStack: 1
|
||||
itemName: Red Mushroom
|
||||
itemDescription:
|
||||
prefab: {fileID: 4385080170328260021}
|
||||
scaleInContainer: {x: 2, y: 2, z: 2}
|
||||
positionInContainer: {x: 0, y: -0.45, z: 0}
|
||||
@@ -244,8 +244,11 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetLocation: Helar/Mushroom_02
|
||||
itemId: 2
|
||||
canStack: 1
|
||||
itemName: Brown Mushroom
|
||||
itemDescription:
|
||||
prefab: {fileID: 5440707293445505367}
|
||||
scaleInContainer: {x: 2, y: 2, z: 2}
|
||||
positionInContainer: {x: 0, y: -0.45, z: 0}
|
||||
8
Assets/Resources/JoonasP.meta
Normal file
8
Assets/Resources/JoonasP.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4ee37c3948632d84f82c9f76c2ac6daa
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -206,6 +206,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
chime: {fileID: 965315076614651339}
|
||||
isTouched: 0
|
||||
playerInfo: {fileID: 0}
|
||||
--- !u!82 &965315076614651339
|
||||
AudioSource:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -314,11 +315,13 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
assetLocation:
|
||||
itemId: 10
|
||||
canStack: 1
|
||||
itemName: Magic essence
|
||||
itemDescription:
|
||||
prefab: {fileID: 3467985268477833302}
|
||||
scaleInContainer: {x: 1, y: 1, z: 1}
|
||||
--- !u!1 &5463776654730074005
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
39315
Assets/Scenes/Helar/Homebase_Helar.unity
Normal file
39315
Assets/Scenes/Helar/Homebase_Helar.unity
Normal file
File diff suppressed because one or more lines are too long
11
Assets/Scenes/Helar/Homebase_Helar.unity.meta
Normal file
11
Assets/Scenes/Helar/Homebase_Helar.unity.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<<< HEAD:Assets/Scenes/JoonasP/Homebase_JP.unity.meta
|
||||
guid: 97fc7747e77335e4483b4a65db2e4fc1
|
||||
========
|
||||
guid: 6d5f257272c8a9840891d8745d7bc200
|
||||
>>>>>>>> joonasp_Milestone2:Assets/Scenes/JoonasP/Homebase_JoonasP.unity.meta
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because one or more lines are too long
36087
Assets/Scenes/JoonasP/Homebase_JoonasP.unity
Normal file
36087
Assets/Scenes/JoonasP/Homebase_JoonasP.unity
Normal file
File diff suppressed because one or more lines are too long
3
Assets/Scenes/JoonasP/Homebase_JoonasP.unity.meta
Normal file
3
Assets/Scenes/JoonasP/Homebase_JoonasP.unity.meta
Normal file
@@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b5e52a1ec3144c3698b70a852c266400
|
||||
timeCreated: 1649692466
|
||||
@@ -90,19 +90,19 @@ Material:
|
||||
- _HorizonCloudSize: 4.91
|
||||
- _HorizonCloudStartPosition: -0.1
|
||||
- _HorizonCloudStep: 25
|
||||
- _HorizonExponent: 4.212204
|
||||
- _HorizonExponent: 3.5590127
|
||||
- _HorizonStep: 500
|
||||
- _HorizonThickness: 1
|
||||
- _MoonGlow: 0
|
||||
- _MoonLightIntensity: 0.11609189
|
||||
- _MoonLightIntensity: 0.0000009446238
|
||||
- _MoonSize: 0
|
||||
- _MoonSoftEdge: 0
|
||||
- _OverheadCloudAltitude: 1000
|
||||
- _OverheadCloudAnimationSpeed: 50
|
||||
- _OverheadCloudFlowDirectionX: 1
|
||||
- _OverheadCloudFlowDirectionZ: 1
|
||||
- _OverheadCloudRemapMax: 1
|
||||
- _OverheadCloudRemapMin: -0.40113193
|
||||
- _OverheadCloudRemapMax: 1.14697
|
||||
- _OverheadCloudRemapMin: 0.16336505
|
||||
- _OverheadCloudSize: 10
|
||||
- _OverheadCloudStep: 2
|
||||
- _StarsDensity0: 0.4
|
||||
@@ -112,7 +112,7 @@ Material:
|
||||
- _StarsGlow0: 0.01
|
||||
- _StarsGlow1: 0.01
|
||||
- _StarsGlow2: 0.01
|
||||
- _StarsOpacity: 0.77006197
|
||||
- _StarsOpacity: 0
|
||||
- _StarsSize0: 0.42
|
||||
- _StarsSize1: 0.53
|
||||
- _StarsSize2: 0.46
|
||||
@@ -121,25 +121,25 @@ Material:
|
||||
- _StarsTwinkle1: 6
|
||||
- _StarsTwinkle2: 2
|
||||
- _SunGlow: 0.45
|
||||
- _SunLightIntensity: 0.00026742788
|
||||
- _SunLightIntensity: 0.3061529
|
||||
- _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.32409453, g: 0.28410664, b: 0.36156124, a: 1}
|
||||
- _GroundColor: {r: 0.4181847, g: 0.3995859, b: 0.4356108, a: 1}
|
||||
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _HorizonColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
|
||||
- _MoonColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _HorizonColor: {r: 0.9020369, g: 0.86305594, b: 0.76238817, 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.8412408}
|
||||
- _SkyColor: {r: 0.08056989, g: 0.03172837, b: 0.21698111, a: 1}
|
||||
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.9756075}
|
||||
- _SkyColor: {r: 0.22028852, g: 0.39287567, b: 0.63273, 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.991845, g: 0.9783889, b: 0.95618623, a: 0}
|
||||
- _SunDirection: {r: 0, g: 0.8362344, b: 0.54837215, a: 0}
|
||||
- _SunColor: {r: 0.9725966, g: 0.9273795, b: 0.85277134, a: 1}
|
||||
- _SunDirection: {r: 0, g: -0.37054375, b: 0.928815, a: 0}
|
||||
- _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &11400000
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -27,17 +27,17 @@ Material:
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorBlend:
|
||||
m_Texture: {fileID: 6645868241028219394, guid: b6bbea2e1167a7346822545139402874,
|
||||
m_Texture: {fileID: 3296297345525164742, guid: b6bbea2e1167a7346822545139402874,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByHeight:
|
||||
m_Texture: {fileID: -121627458200216486, guid: b6bbea2e1167a7346822545139402874,
|
||||
m_Texture: {fileID: 7822123968218558248, guid: b6bbea2e1167a7346822545139402874,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByNormal:
|
||||
m_Texture: {fileID: -7276647378916462705, guid: b6bbea2e1167a7346822545139402874,
|
||||
m_Texture: {fileID: -5897336944087639462, guid: b6bbea2e1167a7346822545139402874,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
|
||||
@@ -40,17 +40,17 @@ Material:
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorBlend:
|
||||
m_Texture: {fileID: -7449783031340888013, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
m_Texture: {fileID: 2309935011595810566, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByHeight:
|
||||
m_Texture: {fileID: 4937893386260152019, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
m_Texture: {fileID: -9169335222111477954, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByNormal:
|
||||
m_Texture: {fileID: -3859054405634403209, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
m_Texture: {fileID: 2978575347860503324, guid: 726ce83d589353742be6b48ff467fc48,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
|
||||
@@ -40,17 +40,17 @@ Material:
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorBlend:
|
||||
m_Texture: {fileID: 5427283241702814613, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
m_Texture: {fileID: 896384531317697102, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByHeight:
|
||||
m_Texture: {fileID: 889239393527384433, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
m_Texture: {fileID: 4029862431913224828, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _ColorByNormal:
|
||||
m_Texture: {fileID: -1304865347520842725, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
m_Texture: {fileID: 4575790855133332405, guid: 7f589c682d367b442b8cf75918f5aa55,
|
||||
type: 2}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
|
||||
@@ -100,7 +100,7 @@ Material:
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color0: {r: 7.3553696, g: 17.679485, b: 28.351603, a: 0}
|
||||
- _Color0: {r: 1.5507064, g: 15.19919, b: 29.6185, a: 0}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
|
||||
@@ -18,7 +18,7 @@ PhysicsManager:
|
||||
m_ClothInterCollisionDistance: 0
|
||||
m_ClothInterCollisionStiffness: 0
|
||||
m_ContactsGeneration: 1
|
||||
m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbfffffff9ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbfffffffdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||
m_AutoSimulation: 1
|
||||
m_AutoSyncTransforms: 1
|
||||
m_ReuseCollisionCallbacks: 1
|
||||
|
||||
@@ -11,12 +11,9 @@ EditorBuildSettings:
|
||||
- enabled: 0
|
||||
path: Assets/Scenes/JoonasP/SampleScene.unity
|
||||
guid: 84eaff0e1a543c244920ec3c1b11b50f
|
||||
- enabled: 0
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/Homebase.unity
|
||||
guid: 523fd126e711a6f429c1285150b11dfc
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/JoonasP/Homebase_JP.unity
|
||||
guid: 97fc7747e77335e4483b4a65db2e4fc1
|
||||
m_configObjects:
|
||||
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260,
|
||||
type: 2}
|
||||
|
||||
@@ -158,12 +158,9 @@ PlayerSettings:
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
|
||||
- {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
|
||||
- {fileID: -990268426630310298, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
@@ -734,7 +731,7 @@ PlayerSettings:
|
||||
PS4: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
|
||||
PS5: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
|
||||
Stadia: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
|
||||
Standalone: RH_SerializedDictionary;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2;GRIFFIN_URP;POSEIDON;POSEIDON_URP;JUPITER;GRIFFIN;TEXTURE_GRAPH;TG_SEARCHER;GRIFFIN_2021
|
||||
Standalone: RH_SerializedDictionary;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2;GRIFFIN_URP;POSEIDON;POSEIDON_URP;JUPITER;GRIFFIN;TEXTURE_GRAPH;GRIFFIN_2021;TG_SEARCHER
|
||||
WebGL: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
|
||||
Windows Store Apps: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
|
||||
XboxOne: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2
|
||||
|
||||
Reference in New Issue
Block a user