portal vfx rework - shield spell art added - logs made stackable - some portal script interference fixed

This commit is contained in:
2022-04-10 18:06:16 +03:00
parent 1f2af9127e
commit 6f7c3eaa9b
57 changed files with 44692 additions and 8528 deletions

View File

@@ -16,9 +16,10 @@ GameObject:
- component: {fileID: -728432962252772913}
- component: {fileID: 1264022012566418942}
- component: {fileID: 759522315152862422}
- component: {fileID: 7019801789685915322}
m_Layer: 0
m_Name: Log
m_TagString: Untagged
m_TagString: Throwable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -287,3 +288,19 @@ MonoBehaviour:
precomputeOutline: 0
bakeKeys: []
bakeValues: []
--- !u!114 &7019801789685915322
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3057085693074020240}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
m_Name:
m_EditorClassIdentifier:
itemId: 5
canStack: 1
itemName: Wood Log
itemDescription: A simple wooden log. A key ingredient for many things.

View File

@@ -15,9 +15,9 @@ GameObject:
- component: {fileID: 5579585539182961868}
- component: {fileID: 8105550803505491054}
- component: {fileID: 4591371125200328589}
m_Layer: 0
m_Layer: 10
m_Name: Mushroom_01
m_TagString: Untagged
m_TagString: Throwable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

View File

@@ -15,9 +15,9 @@ GameObject:
- component: {fileID: 5868452619794669030}
- component: {fileID: 2669145217468523370}
- component: {fileID: 8028753017960928093}
m_Layer: 0
m_Layer: 10
m_Name: Mushroom_02
m_TagString: Untagged
m_TagString: Throwable
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ef2ea3e86cf37844f9ab6a9093d855b7
guid: ae343c9db3f764a4fb226d043e7a4743
PrefabImporter:
externalObjects: {}
userData:

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c5d51a2f14dbd754986192f475aa6719
guid: a72fc9de03049aa4c886d2034bf938aa
PrefabImporter:
externalObjects: {}
userData:

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 76e270eb5751f7e4ea45ed3b158d050f
guid: 2f6b9693c8108f24db357c4f551127af
PrefabImporter:
externalObjects: {}
userData:

View File

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

View File

@@ -1,91 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &257613199430467881
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2664851654700168790, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_Name
value: Portal_Purple
objectReference: {fileID: 0}
- target: {fileID: 2664851655031599332, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 0}
- target: {fileID: 2664851655031599332, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: linkedPortal
value:
objectReference: {fileID: 0}
- target: {fileID: 2664851655392724835, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: fec29ec9aeff5d148ae4ce39ab5981f0, type: 2}
- target: {fileID: 2664851656537753515, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
type: 3}
propertyPath: m_InteractionManager
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ef2ea3e86cf37844f9ab6a9093d855b7, type: 3}

View File

@@ -1,121 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &3086217307916794381
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1022042495959285158, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_InteractionManager
value:
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1022042496337251419, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_Name
value: Portal_Red
objectReference: {fileID: 0}
- target: {fileID: 1022042496669043433, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: player
value:
objectReference: {fileID: 0}
- target: {fileID: 1022042496669043433, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: linkedPortal
value:
objectReference: {fileID: 0}
- target: {fileID: 1022042496961707374, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: bf0da4907b1b1174d82fea8c818ebf1e, type: 2}
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: InitialModule.startColor.maxColor.b
value: 0.17647058
objectReference: {fileID: 0}
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: InitialModule.startColor.maxColor.g
value: 0.3111662
objectReference: {fileID: 0}
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: InitialModule.startColor.maxColor.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: InitialModule.startColor.minColor.b
value: 0.32549024
objectReference: {fileID: 0}
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: InitialModule.startColor.minColor.g
value: 0.7882222
objectReference: {fileID: 0}
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
type: 3}
propertyPath: InitialModule.startColor.minColor.r
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c5d51a2f14dbd754986192f475aa6719, type: 3}