diff --git a/Unity/SeedQuest/Assets/New Terrain 1.asset b/Unity/SeedQuest/Assets/New Terrain 1.asset deleted file mode 100644 index f6266839..00000000 Binary files a/Unity/SeedQuest/Assets/New Terrain 1.asset and /dev/null differ diff --git a/Unity/SeedQuest/Assets/New Terrain 2.asset b/Unity/SeedQuest/Assets/New Terrain 2.asset deleted file mode 100644 index 2520330d..00000000 Binary files a/Unity/SeedQuest/Assets/New Terrain 2.asset and /dev/null differ diff --git a/Unity/SeedQuest/Assets/NewLayer 4.terrainlayer b/Unity/SeedQuest/Assets/NewLayer 4.terrainlayer deleted file mode 100644 index 5c7e4d4b..00000000 --- a/Unity/SeedQuest/Assets/NewLayer 4.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 4 - m_DiffuseTexture: {fileID: 2800000, guid: 6b94cc5cca635fb41ae280f500cfcbf8, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: d5ff7715dda4dd649bcaba36e83e8d94, type: 3} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 3, y: 3} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 1, g: 1, b: 1, a: 0} - m_Metallic: 0 - m_Smoothness: 1 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer 5.terrainlayer b/Unity/SeedQuest/Assets/NewLayer 5.terrainlayer deleted file mode 100644 index 9545d669..00000000 --- a/Unity/SeedQuest/Assets/NewLayer 5.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 5 - m_DiffuseTexture: {fileID: 2800000, guid: a221de6a82f604d48a78393db6179dd0, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: a648a512ba50d3c42a567c72bb81eb3c, type: 3} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 2, y: 2} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} - m_Metallic: 0 - m_Smoothness: 0 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer 6.terrainlayer b/Unity/SeedQuest/Assets/NewLayer 6.terrainlayer deleted file mode 100644 index e586ffdc..00000000 --- a/Unity/SeedQuest/Assets/NewLayer 6.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 6 - m_DiffuseTexture: {fileID: 2800000, guid: 6b94cc5cca635fb41ae280f500cfcbf8, type: 3} - m_NormalMapTexture: {fileID: 0} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 2, y: 2} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} - m_Metallic: 0 - m_Smoothness: 0 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer 7.terrainlayer b/Unity/SeedQuest/Assets/NewLayer 7.terrainlayer deleted file mode 100644 index ea2ee16a..00000000 --- a/Unity/SeedQuest/Assets/NewLayer 7.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 7 - m_DiffuseTexture: {fileID: 2800000, guid: ab44671cf9d74544c8bb2fcfccabf496, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: d5ff7715dda4dd649bcaba36e83e8d94, type: 3} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 3, y: 3} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} - m_Metallic: 0 - m_Smoothness: 0 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer.terrainlayer.meta b/Unity/SeedQuest/Assets/NewLayer.terrainlayer.meta deleted file mode 100644 index 075f396d..00000000 --- a/Unity/SeedQuest/Assets/NewLayer.terrainlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a0557e433f8db745a422c1c57ee2ca9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8574412962073106934 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_Mac1984 Var.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_Mac1984 Var.prefab index 19015fc3..a67ee3ca 100755 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_Mac1984 Var.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_Mac1984 Var.prefab @@ -1,82 +1,87 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6861550353305139842 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4578421751069201721, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_Name - value: BA_Ad_1984 Var - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_TargetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_VideoClip - value: - objectReference: {fileID: 32900000, guid: 5c515e5fe43096945a33248a6b6f1f1c, - type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dcb2bdb68050a224eb7410312832e8e0, type: 3} +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6861550353305139842 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4578421751069201721, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_Name + value: BA_Ad_Mac1984 Var + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_TargetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_VideoClip + value: + objectReference: {fileID: 32900000, guid: 5c515e5fe43096945a33248a6b6f1f1c, + type: 3} + - target: {fileID: 5467983975930964798, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: eec48a51e481921409698e0618bb27aa, type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dcb2bdb68050a224eb7410312832e8e0, type: 3} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_MacVsPC Var.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_MacVsPC Var.prefab index 0e2918e1..97071b94 100755 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_MacVsPC Var.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_MacVsPC Var.prefab @@ -1,82 +1,87 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6861550353305139842 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4578421751069201721, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_Name - value: BA_Ad_MacVsPC Var - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_TargetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_VideoClip - value: - objectReference: {fileID: 32900000, guid: f44ac119aaab6d0498cb17557e970b1d, - type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dcb2bdb68050a224eb7410312832e8e0, type: 3} +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6861550353305139842 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4578421751069201721, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_Name + value: BA_Ad_MacVsPC Var + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_TargetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_VideoClip + value: + objectReference: {fileID: 32900000, guid: f44ac119aaab6d0498cb17557e970b1d, + type: 3} + - target: {fileID: 5467983975930964798, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: 1c40fc5c74df0c74784d97d0b21ff17f, type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dcb2bdb68050a224eb7410312832e8e0, type: 3} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_ThinkDifferent Var.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_ThinkDifferent Var.prefab index 6f84d45a..de56bc8e 100755 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_ThinkDifferent Var.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_ThinkDifferent Var.prefab @@ -1,82 +1,92 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6861550353305139842 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4578421751069201721, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_Name - value: BA_Ad_ThinkDifferent Var - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_TargetCamera - value: - objectReference: {fileID: 0} - - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, - type: 3} - propertyPath: m_VideoClip - value: - objectReference: {fileID: 32900000, guid: 1358894d529734842a5d76415f21ae2a, - type: 3} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: dcb2bdb68050a224eb7410312832e8e0, type: 3} +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6861550353305139842 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4578421751069201721, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_Name + value: BA_Ad_ThinkDifferent Var + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751069201720, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_TargetCamera + value: + objectReference: {fileID: 0} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_VideoClip + value: + objectReference: {fileID: 32900000, guid: 1358894d529734842a5d76415f21ae2a, + type: 3} + - target: {fileID: 4578421751780469639, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_EnabledAudioTracks.Array.data[0] + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5467983975930964798, guid: dcb2bdb68050a224eb7410312832e8e0, + type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: 32dd155aab55d6d4f845a44ec6f80315, type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dcb2bdb68050a224eb7410312832e8e0, type: 3} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_iPod_Base.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_iPod_Base.prefab index ea8673c7..06804b34 100755 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_iPod_Base.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Prefabs/BA_Ad_iPod_Base.prefab @@ -90,7 +90,7 @@ VideoPlayer: m_DirectAudioVolumes: - 0.521 m_Url: - m_EnabledAudioTracks: 01 + m_EnabledAudioTracks: 00 m_DirectAudioMutes: 00 m_ControlledAudioTrackCount: 1 m_PlayOnAwake: 1 @@ -108,7 +108,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3033f7e3ef84de54db971afe248281e3, type: 3} + m_audioClip: {fileID: 8300000, guid: 080c302ca6143f94293de5d7f23bc199, type: 3} m_PlayOnAwake: 1 m_Volume: 0.294 m_Pitch: 1 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Sounds.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Sounds.meta deleted file mode 100644 index 23fcffb8..00000000 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/Sounds.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a23ac4fdc2787434bb6afbc4ebfb523e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_1984_Audio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_1984_Audio.mp3 new file mode 100644 index 00000000..ca1e9102 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_1984_Audio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4e0d0534055533182e2915cc1d9e7efab0ee1aee20c3f92a7b6a10a56a96e4c +size 578455 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_1984_Audio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_1984_Audio.mp3.meta new file mode 100644 index 00000000..76e7aec2 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_1984_Audio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: eec48a51e481921409698e0618bb27aa +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_MacVSPC_Audio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_MacVSPC_Audio.mp3 new file mode 100644 index 00000000..8236f2cb --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_MacVSPC_Audio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee8b38738409d2e47c86846d2304336ae3ad44ab8a46d4130e17d8a0cca12d3a +size 478145 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_MacVSPC_Audio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_MacVSPC_Audio.mp3.meta new file mode 100644 index 00000000..964451eb --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_MacVSPC_Audio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1c40fc5c74df0c74784d97d0b21ff17f +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_ThinkDifferent_Audio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_ThinkDifferent_Audio.mp3 new file mode 100644 index 00000000..7dbc5973 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_ThinkDifferent_Audio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daa2f3da35f511a6486979bcf1953b39b137ef45f20a0b3ac93b6a2e293ed83f +size 975934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_ThinkDifferent_Audio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_ThinkDifferent_Audio.mp3.meta new file mode 100644 index 00000000..8e9a9709 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_ThinkDifferent_Audio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 32dd155aab55d6d4f845a44ec6f80315 +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_iPod_Audio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_iPod_Audio.mp3 new file mode 100644 index 00000000..d6ed00b5 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_iPod_Audio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:230f281d716b9965417bdb4006dfe8f91de8254161d763f5517a50deb4149b58 +size 486504 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_iPod_Audio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_iPod_Audio.mp3.meta new file mode 100644 index 00000000..89be12ff --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Apple/VideoClip/Commercials/BA_Ad_iPod_Audio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 080c302ca6143f94293de5d7f23bc199 +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Mario.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Mario.prefab index 7264757a..df624967 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Mario.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Mario.prefab @@ -167,7 +167,7 @@ VideoPlayer: m_DirectAudioVolumes: - 1 m_Url: - m_EnabledAudioTracks: 01 + m_EnabledAudioTracks: 00 m_DirectAudioMutes: 00 m_ControlledAudioTrackCount: 1 m_PlayOnAwake: 1 @@ -185,7 +185,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3033f7e3ef84de54db971afe248281e3, type: 3} + m_audioClip: {fileID: 8300000, guid: d4b97e28e5a25764b8f0988e3216c953, type: 3} m_PlayOnAwake: 1 m_Volume: 0.298 m_Pitch: 1 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Metriod.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Metriod.prefab index 2ee89549..34db6896 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Metriod.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Metriod.prefab @@ -167,7 +167,7 @@ VideoPlayer: m_DirectAudioVolumes: - 1 m_Url: - m_EnabledAudioTracks: 01 + m_EnabledAudioTracks: 00 m_DirectAudioMutes: 00 m_ControlledAudioTrackCount: 1 m_PlayOnAwake: 1 @@ -185,7 +185,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3033f7e3ef84de54db971afe248281e3, type: 3} + m_audioClip: {fileID: 8300000, guid: 6d7601eb691101b47b75ca2943f99058, type: 3} m_PlayOnAwake: 1 m_Volume: 0.457 m_Pitch: 1 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_SSB.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_SSB.prefab index 23b12661..1a25cac1 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_SSB.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_SSB.prefab @@ -58,7 +58,7 @@ VideoPlayer: m_DirectAudioVolumes: - 1 m_Url: - m_EnabledAudioTracks: 01 + m_EnabledAudioTracks: 00 m_DirectAudioMutes: 00 m_ControlledAudioTrackCount: 1 m_PlayOnAwake: 1 @@ -76,7 +76,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3033f7e3ef84de54db971afe248281e3, type: 3} + m_audioClip: {fileID: 8300000, guid: fb74b369f4a20be4d9fbf61d622151a9, type: 3} m_PlayOnAwake: 1 m_Volume: 0.222 m_Pitch: 1 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Zelda.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Zelda.prefab index 64d180d6..10ea4819 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Zelda.prefab +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/Prefabs/PlayGame_Zelda.prefab @@ -90,7 +90,7 @@ VideoPlayer: m_DirectAudioVolumes: - 1 m_Url: - m_EnabledAudioTracks: 01 + m_EnabledAudioTracks: 00 m_DirectAudioMutes: 00 m_ControlledAudioTrackCount: 1 m_PlayOnAwake: 1 @@ -108,7 +108,7 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 3033f7e3ef84de54db971afe248281e3, type: 3} + m_audioClip: {fileID: 8300000, guid: 680c6de418c20054e84f43ae8cc3b7fc, type: 3} m_PlayOnAwake: 1 m_Volume: 0.753 m_Pitch: 1 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/BOTWAudio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/BOTWAudio.mp3 new file mode 100644 index 00000000..2a0c3e4a --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/BOTWAudio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2754bbf3ff03a706aac2be409b95d9470cf8240a98933f4feffde98656bf9b82 +size 1267252 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/BOTWAudio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/BOTWAudio.mp3.meta new file mode 100644 index 00000000..ca525511 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/BOTWAudio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 680c6de418c20054e84f43ae8cc3b7fc +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/MetroidAudio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/MetroidAudio.mp3 new file mode 100644 index 00000000..be425fb5 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/MetroidAudio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9ea7b115dd9e83ce182b3b8a65e0ca57156e18d75037c3bd49405d43dd60811 +size 1108845 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/MetroidAudio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/MetroidAudio.mp3.meta new file mode 100644 index 00000000..da31e718 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/MetroidAudio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6d7601eb691101b47b75ca2943f99058 +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SM64Audio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SM64Audio.mp3 new file mode 100644 index 00000000..7d6e5ac9 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SM64Audio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:710a0ba6caff164fec7731a7357696f6575bdf68254023a7bff8902427faebe5 +size 687542 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SM64Audio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SM64Audio.mp3.meta new file mode 100644 index 00000000..a333fee1 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SM64Audio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d4b97e28e5a25764b8f0988e3216c953 +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SSBMAudio.mp3 b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SSBMAudio.mp3 new file mode 100644 index 00000000..f67db3b1 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SSBMAudio.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cf8f8b18cdcb9b0c57e00e5e55d01346bbb70dd70df6776e913ad0c5c7ba5c0 +size 1515102 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SSBMAudio.mp3.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SSBMAudio.mp3.meta new file mode 100644 index 00000000..e2019498 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Branding/Nintendo/VideoClips/SSBMAudio.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fb74b369f4a20be4d9fbf61d622151a9 +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: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain.meta deleted file mode 100644 index 8fc903c5..00000000 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 42db3e7d02eeb7b449ef27d5e678a596 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Geo/Head/NPC_Beard_LightFade.fbm.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Geo/Head/NPC_Beard_LightFade.fbm.meta deleted file mode 100644 index 5a5254fe..00000000 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Geo/Head/NPC_Beard_LightFade.fbm.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 762539f5d21f5ec409ea83db97f57bd0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Materials/NPCBase_Player_mat.mat b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Materials/NPCBase_Player_mat.mat index 57251017..d1841adc 100755 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Materials/NPCBase_Player_mat.mat +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Materials/NPCBase_Player_mat.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NPCBase_Player_mat - m_Shader: {fileID: 4800000, guid: 24923b68e09c86742adca3a59b1000c9, type: 3} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Prefab.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Prefab.meta deleted file mode 100644 index d3c9cd96..00000000 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Universal/Characters/Prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 49e437ac65d9b3e4fb16a849ed36c537 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Cafe.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Cafe.unity index f7b45683..b9067f1f 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Cafe.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Cafe.unity @@ -1711,8 +1711,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 0 + siteID: 0 + spotID: 13 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -2735,8 +2735,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 1 + siteID: 0 + spotID: 3 actionID: 0 defaultShader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} highlightShader: {fileID: 4800000, guid: 1890f8dccedbe2b428bb79bd5c1a62e7, type: 3} @@ -3003,8 +3003,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 2 + siteID: 0 + spotID: 10 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -4311,9 +4311,9 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 3 - actionID: 1 + siteID: 0 + spotID: 0 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -10454,9 +10454,9 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 4 - actionID: 2 + siteID: 0 + spotID: 11 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -11791,8 +11791,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 5 + siteID: 0 + spotID: 2 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -11958,7 +11958,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 8 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -15765,7 +15765,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 12 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16234,8 +16234,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 8 + siteID: 0 + spotID: 6 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16419,7 +16419,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 5 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16961,7 +16961,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 9 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -19610,8 +19610,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 12 + siteID: 0 + spotID: 7 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -19980,8 +19980,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 12 + siteID: 0 + spotID: 4 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -20061,8 +20061,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 13 + siteID: 0 + spotID: 15 actionID: 0 defaultShader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} highlightShader: {fileID: 4800000, guid: 1890f8dccedbe2b428bb79bd5c1a62e7, type: 3} @@ -22247,8 +22247,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 14 + siteID: 0 + spotID: 1 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -22611,8 +22611,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 15 - spotID: 15 + siteID: 0 + spotID: 14 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -25621,7 +25621,7 @@ PrefabInstance: - target: {fileID: 1629311123691991929, guid: 1826e75eb0e2a8b4a9394e4533d09130, type: 3} propertyPath: m_LocalRotation.x - value: 0.38885346 + value: 0.38885352 objectReference: {fileID: 0} - target: {fileID: 1629311123691991929, guid: 1826e75eb0e2a8b4a9394e4533d09130, type: 3} @@ -25631,7 +25631,7 @@ PrefabInstance: - target: {fileID: 1629311123691991929, guid: 1826e75eb0e2a8b4a9394e4533d09130, type: 3} propertyPath: m_LocalRotation.z - value: 0.09337787 + value: 0.09337788 objectReference: {fileID: 0} - target: {fileID: 1629311123691991929, guid: 1826e75eb0e2a8b4a9394e4533d09130, type: 3} @@ -25940,6 +25940,31 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: near clip plane + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: far clip plane + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: field of view + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: orthographic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: m_ForceIntoRT + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4180337171827899489, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: smoothSpeed @@ -25975,31 +26000,6 @@ PrefabInstance: propertyPath: lookAtPeek value: 2 objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: near clip plane - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: far clip plane - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: field of view - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: orthographic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: m_ForceIntoRT - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} --- !u!4 &6606428587971382840 stripped diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Campground Iso.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Campground Iso.unity index aca0339d..a40cbc79 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Campground Iso.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/Campground Iso.unity @@ -181,6 +181,37 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} +--- !u!1 &46386804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 46386805} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &46386805 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46386804} + 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_Children: + - {fileID: 257469591} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &51328612 PrefabInstance: m_ObjectHideFlags: 0 @@ -459,7 +490,7 @@ PrefabInstance: - target: {fileID: 224208419225187348, guid: a93254a9ad48b9b4eaef71164a0e4b98, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 224208419225187348, guid: a93254a9ad48b9b4eaef71164a0e4b98, type: 3} @@ -789,7 +820,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 597916727} + m_TransformParent: {fileID: 1140324291} m_Modifications: - target: {fileID: 100000, guid: e94f7a7564333dc41890ac207ad98a08, type: 3} propertyPath: m_StaticEditorFlags @@ -1073,11 +1104,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: ede3df81e712bf646a555da6eccdce0a, type: 3} propertyPath: m_LocalScale.z - value: 1.3 + value: 1.3000014 objectReference: {fileID: 0} - target: {fileID: 400000, guid: ede3df81e712bf646a555da6eccdce0a, type: 3} propertyPath: m_LocalScale.x - value: 1.3 + value: 1.3000014 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: ede3df81e712bf646a555da6eccdce0a, type: 3} propertyPath: m_Materials.Array.data[0] @@ -1185,7 +1216,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -1193,15 +1224,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 9.01 + value: 1.6018925 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 21.06 + value: 7.711504 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -1209,11 +1240,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -1221,7 +1252,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 19 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1235,6 +1266,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} --- !u!1001 &140594857 @@ -1408,8 +1447,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 14 + siteID: 0 + spotID: 8 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -1796,6 +1835,43 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 175723068} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &179465822 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 340489513} + m_PrefabAsset: {fileID: 0} +--- !u!1 &183299528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183299529} + m_Layer: 0 + m_Name: Int11_Animal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &183299529 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 183299528} + 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_Children: + - {fileID: 5111621357860423552} + m_Father: {fileID: 1394429269} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &202772185 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100072, guid: 82f55cca76532c8419667f3d55ac1123, @@ -1897,140 +1973,6 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 065c8b83e7c866947829f1cc7d1253cf, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4fa21a43ed2bb614da920debd9abd6cd, type: 3} ---- !u!1001 &210329299 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 503349454} - m_Modifications: - - target: {fileID: 1828615232133135628, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_Name - value: HUD ProgressTracker - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1828615232133135731, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 149388394086916736, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 31.200195 - objectReference: {fileID: 0} - - target: {fileID: 7897377787702630676, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_Material - value: - objectReference: {fileID: 0} - - target: {fileID: 7897377787702630676, guid: db4e3ddf36b6d4343aa1c141fef172a3, - type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: db4e3ddf36b6d4343aa1c141fef172a3, type: 3} --- !u!1001 &216790335 PrefabInstance: m_ObjectHideFlags: 0 @@ -2308,7 +2250,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 221025210} m_PrefabAsset: {fileID: 0} ---- !u!1 &222814178 +--- !u!1 &223402185 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2316,28 +2258,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 222814179} + - component: {fileID: 223402186} m_Layer: 0 - m_Name: Picnic_Int + m_Name: Int4_RecordPLayer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &222814179 +--- !u!4 &223402186 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 222814178} + m_GameObject: {fileID: 223402185} 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_Children: - - {fileID: 1467576744} - m_Father: {fileID: 1505579321} - m_RootOrder: 11 + - {fileID: 1350911990} + m_Father: {fileID: 1394429269} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &229983210 GameObject: @@ -2408,7 +2350,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1505579321} + m_TransformParent: {fileID: 245495856} m_Modifications: - target: {fileID: 7429910647625487654, guid: 71b8a24c19a24bd4a881dd61d15fc323, type: 3} @@ -2453,7 +2395,7 @@ PrefabInstance: - target: {fileID: 3648811711988032189, guid: 71b8a24c19a24bd4a881dd61d15fc323, type: 3} propertyPath: m_RootOrder - value: 8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3648811711988032189, guid: 71b8a24c19a24bd4a881dd61d15fc323, type: 3} @@ -2564,6 +2506,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 238228324} m_Mesh: {fileID: 4300000, guid: 4fcf86a2a5f183b4481fc78819f1753f, type: 3} +--- !u!1 &245495855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 245495856} + m_Layer: 0 + m_Name: Int12_Pest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &245495856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 245495855} + 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_Children: + - {fileID: 1598077011} + m_Father: {fileID: 1394429269} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &246607153 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100004, guid: 417c07718d5f14341b499e350be707bc, @@ -2852,6 +2825,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: 7b9f34b0b410b1e4692ede10881f5090, type: 3} +--- !u!4 &257469591 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + m_PrefabInstance: {fileID: 510352080} + m_PrefabAsset: {fileID: 0} +--- !u!4 &266423572 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, + type: 3} + m_PrefabInstance: {fileID: 1062272677} + m_PrefabAsset: {fileID: 0} --- !u!1 &273402849 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: cd1934aaebac97942bfdb7f07f468b70, @@ -2884,6 +2869,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1469632076} m_PrefabAsset: {fileID: 0} +--- !u!4 &291792859 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, + type: 3} + m_PrefabInstance: {fileID: 928459395} + m_PrefabAsset: {fileID: 0} --- !u!1 &304380209 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, @@ -2904,6 +2895,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} +--- !u!4 &312231878 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 467911912} + m_PrefabAsset: {fileID: 0} --- !u!1001 &317865832 PrefabInstance: m_ObjectHideFlags: 0 @@ -3014,12 +3011,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 317865832} m_PrefabAsset: {fileID: 0} +--- !u!4 &318104734 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 1296342599} + m_PrefabAsset: {fileID: 0} --- !u!1001 &338679823 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1610523501} + m_TransformParent: {fileID: 1378092452} m_Modifications: - target: {fileID: 7382237208071772740, guid: add78418c045d9f49843edc4e1ba577f, type: 3} @@ -3089,7 +3092,7 @@ PrefabInstance: - target: {fileID: 3015780961295435591, guid: add78418c045d9f49843edc4e1ba577f, type: 3} propertyPath: m_LocalScale.x - value: 1.366 + value: 1.3660002 objectReference: {fileID: 0} - target: {fileID: 3015780961295435591, guid: add78418c045d9f49843edc4e1ba577f, type: 3} @@ -3099,7 +3102,7 @@ PrefabInstance: - target: {fileID: 3015780961295435591, guid: add78418c045d9f49843edc4e1ba577f, type: 3} propertyPath: m_LocalScale.z - value: 1.366 + value: 1.3660002 objectReference: {fileID: 0} - target: {fileID: 5437637294701130945, guid: add78418c045d9f49843edc4e1ba577f, type: 3} @@ -3130,7 +3133,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -3138,15 +3141,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: -4.2482147 + value: -11.6563225 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 22.14 + value: 8.791504 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -3154,11 +3157,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -3166,7 +3169,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 2 + value: 26 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3180,6 +3183,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -3693,7 +3704,7 @@ PrefabInstance: - target: {fileID: 7530584008426828345, guid: cfe79d731ed3a6c4cbaa290c47486b47, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7530584008426828345, guid: cfe79d731ed3a6c4cbaa290c47486b47, type: 3} @@ -4099,8 +4110,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 13 + siteID: 0 + spotID: 9 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -4210,6 +4221,12 @@ Light: m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 1.8 +--- !u!4 &464721324 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 528822790} + m_PrefabAsset: {fileID: 0} --- !u!1001 &465623315 PrefabInstance: m_ObjectHideFlags: 0 @@ -4334,7 +4351,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -4342,15 +4359,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 6.8 + value: -0.60810757 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 12.04 + value: -1.3084955 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -4358,11 +4375,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -4370,7 +4387,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 25 + value: 17 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4384,8 +4401,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, - type: 3} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: a1049c1597a3a0e4782a3beff7f29bfe, type: 2} @@ -4522,6 +4547,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 488130091} m_PrefabAsset: {fileID: 0} +--- !u!4 &496394741 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 2133728360} + m_PrefabAsset: {fileID: 0} --- !u!224 &503349454 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 138245716538526188, guid: 70c082c534d6e4ba697693f5a980ec0d, @@ -4578,6 +4609,115 @@ Transform: m_Father: {fileID: 911297614} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &510352080 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 46386805} + m_Modifications: + - target: {fileID: 2768318126099743920, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_Name + value: NPCPlayer_TEST + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.7323008 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.01 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.z + value: 6.34 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.3953389 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.91853535 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3139519740757176712, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6617796230276747589, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6617796230276747589, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.0000001872535 + objectReference: {fileID: 0} + - target: {fileID: 6617796230276747589, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.00000009778887 + objectReference: {fileID: 0} + - target: {fileID: 6617796230276747589, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.007854504 + objectReference: {fileID: 0} + - target: {fileID: 311276963454341652, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 311276963454341652, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000001872535 + objectReference: {fileID: 0} + - target: {fileID: 311276963454341652, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.00000017974526 + objectReference: {fileID: 0} + - target: {fileID: 311276963454341652, guid: 31f8e1759e035aa4a8a9c31218862977, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.007854589 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 31f8e1759e035aa4a8a9c31218862977, type: 3} --- !u!4 &522783394 stripped Transform: m_CorrespondingSourceObject: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, @@ -4589,7 +4729,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -4597,15 +4737,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: -6.64 + value: -14.048107 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.77 + value: -1.3416004 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 5.44 + value: -7.9084954 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -4613,11 +4753,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -4625,7 +4765,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 29 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4639,6 +4779,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -4866,8 +5014,8 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 3 - actionID: 1 + spotID: 13 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -4890,7 +5038,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1144117051} + m_TransformParent: {fileID: 1264901854} m_Modifications: - target: {fileID: 100000, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} propertyPath: m_Name @@ -4942,7 +5090,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4962,11 +5110,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} propertyPath: m_LocalScale.y - value: 0.99999994 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} propertyPath: m_LocalScale.z - value: 0.9999998 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2300004, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} propertyPath: m_Materials.Array.data[0] @@ -4982,81 +5130,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d129693156f99f40b3f90f83cdf6ae0, type: 3} ---- !u!1001 &558295859 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1505579321} - m_Modifications: - - target: {fileID: 100000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_Name - value: Drink_PreWorkOut - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalPosition.x - value: 21.76 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalPosition.y - value: 4.78 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalPosition.z - value: 9.54 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalRotation.y - value: -0.28657115 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalRotation.w - value: 0.958059 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -33.306 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalScale.x - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalScale.y - value: 2.5 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} - propertyPath: m_LocalScale.z - value: 2.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6507dfb1268ff4d48abffa85efbb9606, type: 3} ---- !u!4 &558295860 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 6507dfb1268ff4d48abffa85efbb9606, - type: 3} - m_PrefabInstance: {fileID: 558295859} - m_PrefabAsset: {fileID: 0} --- !u!1001 &561854895 PrefabInstance: m_ObjectHideFlags: 0 @@ -5107,7 +5180,7 @@ PrefabInstance: - target: {fileID: 7831370882953303270, guid: bbbe11efba4f94b228b978c67e9cc648, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7831370882953303270, guid: bbbe11efba4f94b228b978c67e9cc648, type: 3} @@ -5424,11 +5497,6 @@ PrefabInstance: propertyPath: state value: 6 objectReference: {fileID: 0} - - target: {fileID: 5105786211925052156, guid: 60efb4839362f4a89a682dcacc4ed593, - type: 3} - propertyPath: mode - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3159523895226436397, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} propertyPath: m_LocalPosition.x @@ -5484,9 +5552,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4049434663630432425, guid: 60efb4839362f4a89a682dcacc4ed593, + - target: {fileID: 5105786211925052156, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} - propertyPath: m_IsActive + propertyPath: mode value: 0 objectReference: {fileID: 0} - target: {fileID: 4049434664326887411, guid: 60efb4839362f4a89a682dcacc4ed593, @@ -5494,17 +5562,22 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4049434664954044221, guid: 60efb4839362f4a89a682dcacc4ed593, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6973026263860940960, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} propertyPath: GameSounds value: objectReference: {fileID: 11400000, guid: fd5428d4e6c1867408a794d77d546701, type: 2} + - target: {fileID: 4049434663630432425, guid: 60efb4839362f4a89a682dcacc4ed593, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4049434664954044221, guid: 60efb4839362f4a89a682dcacc4ed593, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} --- !u!1001 &587875771 @@ -5617,7 +5690,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 587875771} m_PrefabAsset: {fileID: 0} ---- !u!1 &597916726 +--- !u!1 &600508944 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5625,28 +5698,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 597916727} + - component: {fileID: 600508945} m_Layer: 0 - m_Name: Gravestone_Int + m_Name: Int7_YetiGift m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &597916727 +--- !u!4 &600508945 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 597916726} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 600508944} + 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_Children: - - {fileID: 633894461} - m_Father: {fileID: 1505579321} - m_RootOrder: 16 + - {fileID: 1182366863} + m_Father: {fileID: 1394429269} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &610366302 GameObject: @@ -5741,7 +5814,7 @@ Transform: m_Children: - {fileID: 1870319899} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &621913677 PrefabInstance: @@ -5874,7 +5947,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1336583494} + m_TransformParent: {fileID: 966573326} m_Modifications: - target: {fileID: 3076746802050413392, guid: fff76286ee852654491eff32fad1b07d, type: 3} @@ -5899,7 +5972,7 @@ PrefabInstance: - target: {fileID: 416336206170523351, guid: fff76286ee852654491eff32fad1b07d, type: 3} propertyPath: m_LocalPosition.z - value: 10.05 + value: 14.29 objectReference: {fileID: 0} - target: {fileID: 416336206170523351, guid: fff76286ee852654491eff32fad1b07d, type: 3} @@ -6533,8 +6606,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 11 + siteID: 0 + spotID: 5 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -6842,7 +6915,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_Name @@ -6850,15 +6923,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalPosition.x - value: -2.8038623 + value: -10.21197 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -3.1116004 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -13.3484955 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalRotation.x @@ -6878,7 +6951,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_RootOrder - value: 11 + value: 23 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6894,7 +6967,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalScale.x - value: 15.919998 + value: 15.920003 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalScale.y @@ -6902,7 +6975,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalScale.z - value: 15.919998 + value: 15.920003 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} @@ -7329,6 +7402,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1696777136} m_PrefabAsset: {fileID: 0} +--- !u!4 &750967132 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, + type: 3} + m_PrefabInstance: {fileID: 1166679676} + m_PrefabAsset: {fileID: 0} --- !u!1001 &759048927 PrefabInstance: m_ObjectHideFlags: 0 @@ -7444,7 +7523,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_Name @@ -7452,15 +7531,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.x - value: 3.76 + value: -3.6481078 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.y - value: 2.69 + value: -0.42160034 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.z - value: -14.55 + value: -27.898495 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalRotation.x @@ -7480,7 +7559,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_RootOrder - value: 24 + value: 16 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7504,7 +7583,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalScale.y - value: 0.64281 + value: 0.64280987 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_Materials.Array.data[0] @@ -7517,7 +7596,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 222814179} + m_TransformParent: {fileID: 1753204899} m_Modifications: - target: {fileID: 1071985817149319325, guid: 8b0370746a4e1c5489f8a6df8d5ab6f8, type: 3} @@ -7663,8 +7742,40 @@ Transform: - {fileID: 871895233} - {fileID: 110111655} - {fileID: 536883460} + - {fileID: 1753966717} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &800346073 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 800346074} + m_Layer: 0 + m_Name: Int0_Bush + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &800346074 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 800346073} + 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_Children: + - {fileID: 1980436923} + m_Father: {fileID: 1394429269} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &808610726 GameObject: @@ -7803,6 +7914,12 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 3cf6bb4db609cc541befcf544f8a3e81, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3292dfd3ace427b448a733b9cd37c657, type: 3} +--- !u!4 &831423443 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 1528293892} + m_PrefabAsset: {fileID: 0} --- !u!1 &849386139 GameObject: m_ObjectHideFlags: 0 @@ -7908,40 +8025,8 @@ Transform: m_Father: {fileID: 1907115580} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &849399887 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 849399888} - m_Layer: 0 - m_Name: Cryptid_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &849399888 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 849399887} - 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_Children: - - {fileID: 1743337241} - - {fileID: 1182366863} - m_Father: {fileID: 1505579321} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &850205899 -PrefabInstance: +--- !u!1001 &850205899 +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -8546,9 +8631,9 @@ MonoBehaviour: outlinePower: 0.8 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 11 - actionID: 1 + siteID: 0 + spotID: 15 + actionID: 0 defaultShader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} highlightShader: {fileID: 4800000, guid: 1890f8dccedbe2b428bb79bd5c1a62e7, type: 3} interactDistance: 2 @@ -8759,12 +8844,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 894491891} m_PrefabAsset: {fileID: 0} +--- !u!4 &895677133 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 125533689} + m_PrefabAsset: {fileID: 0} --- !u!1001 &900592810 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -8772,15 +8863,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 8.66 + value: 1.2518921 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 6.11 + value: -7.2384953 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -8788,11 +8879,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -8800,7 +8891,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 26 + value: 18 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8814,6 +8905,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -8903,95 +9002,95 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.44356 objectReference: {fileID: 0} - - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.x value: 0.36651435 objectReference: {fileID: 0} - - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.y value: 0.36651427 objectReference: {fileID: 0} - - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.z value: 0.36651435 objectReference: {fileID: 0} - - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.x value: -0.29000008 objectReference: {fileID: 0} - - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.z value: 0.0599987 objectReference: {fileID: 0} - - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.y - value: -0.29999983 + value: -0.07699981 objectReference: {fileID: 0} - - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.x - value: 0.36651435 + value: 0.36651427 objectReference: {fileID: 0} - - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.y value: 0.36651427 objectReference: {fileID: 0} - - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.z - value: 0.36651435 + value: 0.36651427 objectReference: {fileID: 0} - - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.x - value: -0.29000008 + value: -0.29 objectReference: {fileID: 0} - - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.z - value: 0.0599987 + value: 0.06 objectReference: {fileID: 0} - - target: {fileID: 2677812714253383485, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.y - value: -0.07699981 + value: -0.56 objectReference: {fileID: 0} - - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.x - value: 0.36651427 + value: 0.36651435 objectReference: {fileID: 0} - - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.y value: 0.36651427 objectReference: {fileID: 0} - - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalScale.z - value: 0.36651427 + value: 0.36651435 objectReference: {fileID: 0} - - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.x - value: -0.29 + value: -0.29000008 objectReference: {fileID: 0} - - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.z - value: 0.06 + value: 0.0599987 objectReference: {fileID: 0} - - target: {fileID: 2347394418422566594, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 2041604837914371890, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_LocalPosition.y - value: -0.56 + value: -0.29999983 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} @@ -9597,7 +9696,7 @@ PrefabInstance: - target: {fileID: 4010650855557408419, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4010650855557408419, guid: c1257323fb9b1491581df1856a5d6733, type: 3} @@ -9664,31 +9763,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2113433156851601028, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_Layer @@ -9729,11 +9803,36 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 237712980855701113, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 237712979517244297, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_Layer @@ -9751,7 +9850,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 2984297156967371396, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} @@ -9766,17 +9865,17 @@ PrefabInstance: - target: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} propertyPath: m_LocalPosition.x - value: -50.83 + value: -58.23811 objectReference: {fileID: 0} - target: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} propertyPath: m_LocalPosition.y - value: 76.5 + value: 73.3884 objectReference: {fileID: 0} - target: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} propertyPath: m_LocalPosition.z - value: 109.29 + value: 95.941505 objectReference: {fileID: 0} - target: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} @@ -9801,7 +9900,7 @@ PrefabInstance: - target: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} propertyPath: m_RootOrder - value: 14 + value: 28 objectReference: {fileID: 0} - target: {fileID: 2984297156967371393, guid: 6702a30018fd4d34bbb46a9a89ed99e4, type: 3} @@ -10032,6 +10131,37 @@ Transform: type: 3} m_PrefabInstance: {fileID: 931292105} m_PrefabAsset: {fileID: 0} +--- !u!1 &933178905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 933178906} + m_Layer: 0 + m_Name: Int8_PottedPlant + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &933178906 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 933178905} + 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_Children: + - {fileID: 146695308} + m_Father: {fileID: 1394429269} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &941349316 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, @@ -10198,7 +10328,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -10206,15 +10336,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 7.2325 + value: -0.17560768 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.8836 + value: -1.2280004 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: -5.53 + value: -18.878496 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -10222,11 +10352,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -10234,7 +10364,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 28 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10248,6 +10378,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -10305,7 +10443,7 @@ PrefabInstance: - target: {fileID: 2589751695326605292, guid: e0939b40e4ba8478b8f79315dab8581f, type: 3} propertyPath: m_RootOrder - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2589751695326605292, guid: e0939b40e4ba8478b8f79315dab8581f, type: 3} @@ -10379,37 +10517,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e0939b40e4ba8478b8f79315dab8581f, type: 3} ---- !u!1 &949040746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 949040747} - m_Layer: 0 - m_Name: Music_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &949040747 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 949040746} - 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_Children: - - {fileID: 1350911990} - m_Father: {fileID: 1505579321} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &953097227 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: ede3df81e712bf646a555da6eccdce0a, @@ -10521,51 +10628,114 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 13.5559635, y: 10.165564, z: 11.619182} m_Center: {x: -0.047512993, y: 1.5347455, z: -0.4752817} ---- !u!1001 &986738761 -PrefabInstance: +--- !u!1 &957926020 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 849386140} - m_Modifications: - - target: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_Name - value: CampTreePineA01 (3) - objectReference: {fileID: 0} - - target: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_StaticEditorFlags - value: 4294967295 - objectReference: {fileID: 0} - - target: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_NavMeshLayer - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_LocalPosition.x - value: -16.78 - objectReference: {fileID: 0} - - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.93 - objectReference: {fileID: 0} - - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_LocalPosition.z - value: 14.99 - objectReference: {fileID: 0} - - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, - type: 3} - propertyPath: m_LocalRotation.y + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 957926021} + m_Layer: 0 + m_Name: Int14_Sink + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &957926021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 957926020} + 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_Children: + - {fileID: 5401345332316387133} + m_Father: {fileID: 1394429269} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &966573325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 966573326} + m_Layer: 0 + m_Name: Int9_SwimmersTalk + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &966573326 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966573325} + 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_Children: + - {fileID: 450888661} + - {fileID: 1802368414} + m_Father: {fileID: 1394429269} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &986738761 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 849386140} + m_Modifications: + - target: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_Name + value: CampTreePineA01 (3) + objectReference: {fileID: 0} + - target: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 8861682140063543634, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_LocalPosition.x + value: -16.78 + objectReference: {fileID: 0} + - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.93 + objectReference: {fileID: 0} + - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_LocalPosition.z + value: 14.99 + objectReference: {fileID: 0} + - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, + type: 3} + propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - target: {fileID: 6629809990141723172, guid: 8c9a83111de60084fae0c1dcd8d6616e, @@ -10717,7 +10887,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 6 + spotID: 11 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -11270,7 +11440,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1481758880} + m_TransformParent: {fileID: 933178906} m_Modifications: - target: {fileID: 7239983331248841356, guid: e172ed7f44cd7f94baeefa47678d9de7, type: 3} @@ -11332,7 +11502,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_Name @@ -11340,15 +11510,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.x - value: -5.11 + value: -12.518108 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.y - value: 2.32 + value: -0.79160047 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.z - value: -14.6 + value: -27.948496 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalRotation.x @@ -11368,7 +11538,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_RootOrder - value: 23 + value: 15 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11419,7 +11589,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_Name @@ -11427,15 +11597,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.x - value: 47.3 + value: 39.89189 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.y - value: 0.3 + value: -2.8116004 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.z - value: -48.4 + value: -61.748497 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalRotation.x @@ -11455,7 +11625,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_RootOrder - value: 17 + value: 9 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11471,11 +11641,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.x - value: 6.454398 + value: 6.454399 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.y - value: 6.454398 + value: 6.454399 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.z @@ -11863,7 +12033,7 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 0} ---- !u!1 &1144117050 +--- !u!1 &1140324290 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11871,32 +12041,30 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1144117051} + - component: {fileID: 1140324291} m_Layer: 0 - m_Name: Snack_Int + m_Name: Int13_Gravestone m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1144117051 +--- !u!4 &1140324291 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144117050} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1140324290} + 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_Children: - - {fileID: 852541321} - - {fileID: 656046622} - - {fileID: 1197498328} - m_Father: {fileID: 1505579321} - m_RootOrder: 1 + - {fileID: 633894461} + m_Father: {fileID: 1394429269} + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1162764933 +--- !u!1 &1144117050 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11904,35 +12072,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1162764934} + - component: {fileID: 1144117051} m_Layer: 0 - m_Name: Well_Int + m_Name: Prop_Snacks m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1162764934 +--- !u!4 &1144117051 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1162764933} + m_GameObject: {fileID: 1144117050} 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_Children: - - {fileID: 886424043} - m_Father: {fileID: 1505579321} - m_RootOrder: 17 + - {fileID: 852541321} + - {fileID: 1197498328} + m_Father: {fileID: 1264901854} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1166679676 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_Name @@ -11940,15 +12109,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalPosition.x - value: -2.8038623 + value: -10.21197 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -3.1116004 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -13.3484955 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalRotation.x @@ -11968,7 +12137,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 24 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11984,7 +12153,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalScale.x - value: 41.044674 + value: 41.044685 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalScale.y @@ -11992,7 +12161,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} propertyPath: m_LocalScale.z - value: 41.044674 + value: 41.044685 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7318ef51591a5f6419da3f0b7713d33f, type: 3} @@ -12057,8 +12226,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 0 + siteID: 0 + spotID: 3 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -12104,11 +12273,11 @@ Transform: m_GameObject: {fileID: 1182366862} m_LocalRotation: {x: 0.022143627, y: -0.16126983, z: 0.022910604, w: 0.9863959} m_LocalPosition: {x: -8.41, y: 2.31, z: -12.98} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalScale: {x: 1.5, y: 1.4999999, z: 1.5000004} m_Children: - {fileID: 1920520588} - m_Father: {fileID: 849399888} - m_RootOrder: 1 + m_Father: {fileID: 600508945} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 2.9280002, y: -18.515001, z: 2.184} --- !u!65 &1182366864 BoxCollider: @@ -12173,7 +12342,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 7 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -12185,43 +12354,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 884521310} m_PrefabAsset: {fileID: 0} ---- !u!1 &1198243219 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1198243220} - m_Layer: 0 - m_Name: CampSink_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1198243220 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1198243219} - 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_Children: - - {fileID: 5401345332316387133} - m_Father: {fileID: 1505579321} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1201398727 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -12229,15 +12367,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: -0.84 + value: -8.248108 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 21.06 + value: 7.711504 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -12245,11 +12383,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -12257,7 +12395,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 18 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12271,6 +12409,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -12468,6 +12614,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1216068943} m_PrefabAsset: {fileID: 0} +--- !u!4 &1218474610 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, + type: 3} + m_PrefabInstance: {fileID: 1635883010} + m_PrefabAsset: {fileID: 0} --- !u!1 &1233189607 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1906957321224048, guid: aa27dd578d1964eb08181aef95a8c783, @@ -13031,6 +13183,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1262922781} m_Mesh: {fileID: 4300000, guid: 4fcf86a2a5f183b4481fc78819f1753f, type: 3} +--- !u!1 &1264901853 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1264901854} + m_Layer: 0 + m_Name: Int5_Snack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1264901854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1264901853} + 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_Children: + - {fileID: 656046622} + - {fileID: 1144117051} + m_Father: {fileID: 1394429269} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1270770926 GameObject: m_ObjectHideFlags: 0 @@ -13113,12 +13297,43 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1270770926} m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} +--- !u!1 &1278154900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1278154901} + m_Layer: 0 + m_Name: Int1_Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1278154901 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1278154900} + 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_Children: + - {fileID: 7461232657767406650} + m_Father: {fileID: 1394429269} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1296342599 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -13126,15 +13341,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 10.43 + value: 3.0218925 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: -1.56 + value: -14.908495 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -13142,11 +13357,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -13154,7 +13369,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 27 + value: 19 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13168,6 +13383,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -13235,6 +13458,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: 7c46b129b18e4d64d9460d6d68886b68, type: 3} +--- !u!4 &1310907016 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, + type: 3} + m_PrefabInstance: {fileID: 1810212403} + m_PrefabAsset: {fileID: 0} --- !u!1 &1327224645 GameObject: m_ObjectHideFlags: 0 @@ -13317,7 +13546,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_Name @@ -13325,15 +13554,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.x - value: 24.37 + value: 16.961893 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.y - value: 0.3 + value: -2.8116004 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.z - value: -60.74 + value: -74.0885 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalRotation.x @@ -13353,7 +13582,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_RootOrder - value: 16 + value: 8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13369,11 +13598,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.x - value: 6.454398 + value: 6.454399 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.y - value: 6.454398 + value: 6.454399 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.z @@ -13445,38 +13674,6 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} ---- !u!1 &1336583493 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1336583494} - m_Layer: 0 - m_Name: Swimmer_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1336583494 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336583493} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 4.24} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 450888661} - - {fileID: 1802368414} - m_Father: {fileID: 1505579321} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1342474948 GameObject: m_ObjectHideFlags: 0 @@ -13673,7 +13870,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 949040747} + m_TransformParent: {fileID: 223402186} m_Modifications: - target: {fileID: 1350911987, guid: 07746aa7f95fc4d43a70a0203d4a8030, type: 3} propertyPath: m_Name @@ -13738,11 +13935,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1350911990, guid: 07746aa7f95fc4d43a70a0203d4a8030, type: 3} propertyPath: m_LocalScale.x - value: 1.6 + value: 1.6000007 objectReference: {fileID: 0} - target: {fileID: 1350911990, guid: 07746aa7f95fc4d43a70a0203d4a8030, type: 3} propertyPath: m_LocalScale.z - value: 1.6 + value: 1.6000007 objectReference: {fileID: 0} - target: {fileID: 1350911990, guid: 07746aa7f95fc4d43a70a0203d4a8030, type: 3} propertyPath: m_LocalScale.y @@ -13891,8 +14088,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 6 + siteID: 0 + spotID: 4 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -14257,6 +14454,37 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1367822154} m_PrefabAsset: {fileID: 0} +--- !u!1 &1378092451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1378092452} + m_Layer: 0 + m_Name: Int6_Stump + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1378092452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1378092451} + 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_Children: + - {fileID: 1417165147} + m_Father: {fileID: 1394429269} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1380634477 GameObject: m_ObjectHideFlags: 0 @@ -14348,12 +14576,64 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1380634477} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1391947467 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 1416230069} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1394429268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1394429269} + m_Layer: 0 + m_Name: Interactables + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1394429269 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1394429268} + 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_Children: + - {fileID: 800346074} + - {fileID: 1278154901} + - {fileID: 1551673318} + - {fileID: 1987559776} + - {fileID: 223402186} + - {fileID: 1264901854} + - {fileID: 1378092452} + - {fileID: 600508945} + - {fileID: 933178906} + - {fileID: 966573326} + - {fileID: 1753204899} + - {fileID: 183299529} + - {fileID: 245495856} + - {fileID: 1140324291} + - {fileID: 957926021} + - {fileID: 1426764629} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1416230069 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -14361,15 +14641,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 7.51 + value: 0.10189247 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 13.84 + value: 0.49150467 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -14377,11 +14657,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -14389,7 +14669,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 20 + value: 12 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14403,6 +14683,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} --- !u!1 &1417165146 stripped @@ -14466,8 +14754,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 5 + siteID: 0 + spotID: 6 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -14486,6 +14774,43 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.7720988, y: 2.4206414, z: 1.7742791} m_Center: {x: 0.07715976, y: 0.7103207, z: 0.023903131} +--- !u!4 &1419073449 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, + type: 3} + m_PrefabInstance: {fileID: 778791090} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1426764628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426764629} + m_Layer: 0 + m_Name: Int15_Well + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1426764629 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426764628} + 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_Children: + - {fileID: 886424043} + m_Father: {fileID: 1394429269} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1426911273 GameObject: m_ObjectHideFlags: 0 @@ -14942,45 +15267,37 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -3.9930003 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalRotation.x - value: -0.2087445 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalRotation.y - value: -0.6855172 - objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalRotation.w - value: 0.6778384 + - target: {fileID: 100012, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_StaticEditorFlags + value: 8 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalPosition.x - value: 0.66 + - target: {fileID: 100012, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_NavMeshLayer + value: 1 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalPosition.y - value: 0.336 + - target: {fileID: 100014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_StaticEditorFlags + value: 8 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalPosition.z - value: 0.742 + - target: {fileID: 100014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_NavMeshLayer + value: 1 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 268.449 + - target: {fileID: 100018, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_StaticEditorFlags + value: 8 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalRotation.z - value: 0.16439946 + - target: {fileID: 100018, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_NavMeshLayer + value: 1 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -329.342 + - target: {fileID: 100020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_StaticEditorFlags + value: 8 objectReference: {fileID: 0} - - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -3.302 + - target: {fileID: 100020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_NavMeshLayer + value: 1 objectReference: {fileID: 0} - target: {fileID: 400014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_LocalRotation.x @@ -15022,54 +15339,58 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 74.340004 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 7a742a4d8cd10c54a93c659797589740, type: 2} - - target: {fileID: 100020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_StaticEditorFlags - value: 8 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalRotation.x + value: -0.2087445 objectReference: {fileID: 0} - - target: {fileID: 100020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_NavMeshLayer - value: 1 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalRotation.y + value: -0.6855172 objectReference: {fileID: 0} - - target: {fileID: 100018, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_StaticEditorFlags - value: 8 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6778384 objectReference: {fileID: 0} - - target: {fileID: 100018, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_NavMeshLayer - value: 1 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.66 objectReference: {fileID: 0} - - target: {fileID: 100012, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_StaticEditorFlags - value: 8 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.336 objectReference: {fileID: 0} - - target: {fileID: 100012, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_NavMeshLayer - value: 1 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalPosition.z + value: 0.742 objectReference: {fileID: 0} - - target: {fileID: 100014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_StaticEditorFlags - value: 8 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 268.449 objectReference: {fileID: 0} - - target: {fileID: 100014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} - propertyPath: m_NavMeshLayer - value: 1 + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalRotation.z + value: 0.16439946 objectReference: {fileID: 0} - - target: {fileID: 2300016, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -329.342 + objectReference: {fileID: 0} + - target: {fileID: 400020, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.302 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 7e88fe20ca48b21458c3a0451ab5973e, type: 2} - - target: {fileID: 2300012, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + objectReference: {fileID: 2100000, guid: 7a742a4d8cd10c54a93c659797589740, type: 2} + - target: {fileID: 2300002, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 86fe894a849f2784c8776986a00d0de1, type: 2} - - target: {fileID: 2300014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + objectReference: {fileID: 2100000, guid: e1e6296cd83be4340843e68166bc2d68, type: 2} + - target: {fileID: 2300006, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: fe2cf4613dc4ece489a1e497d71664d8, type: 2} + objectReference: {fileID: 2100000, guid: 7e88fe20ca48b21458c3a0451ab5973e, type: 2} - target: {fileID: 2300008, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -15078,14 +15399,18 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 7e88fe20ca48b21458c3a0451ab5973e, type: 2} - - target: {fileID: 2300006, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + - target: {fileID: 2300012, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 7e88fe20ca48b21458c3a0451ab5973e, type: 2} - - target: {fileID: 2300002, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + objectReference: {fileID: 2100000, guid: 86fe894a849f2784c8776986a00d0de1, type: 2} + - target: {fileID: 2300014, guid: 8d50e390a123aab43906fea98d61039f, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e1e6296cd83be4340843e68166bc2d68, type: 2} + objectReference: {fileID: 2100000, guid: fe2cf4613dc4ece489a1e497d71664d8, type: 2} + - target: {fileID: 2300016, guid: 8d50e390a123aab43906fea98d61039f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 7e88fe20ca48b21458c3a0451ab5973e, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8d50e390a123aab43906fea98d61039f, type: 3} --- !u!1001 &1458596635 @@ -15143,7 +15468,7 @@ PrefabInstance: - target: {fileID: 138245716538526188, guid: 70c082c534d6e4ba697693f5a980ec0d, type: 3} propertyPath: m_RootOrder - value: 5 + value: 2 objectReference: {fileID: 0} - target: {fileID: 138245716538526188, guid: 70c082c534d6e4ba697693f5a980ec0d, type: 3} @@ -15287,6 +15612,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 70c082c534d6e4ba697693f5a980ec0d, type: 3} +--- !u!4 &1459966805 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, + type: 3} + m_PrefabInstance: {fileID: 1333279421} + m_PrefabAsset: {fileID: 0} --- !u!4 &1467516671 stripped Transform: m_CorrespondingSourceObject: {fileID: 1305715097986007875, guid: 103942eb02a265d49a87b35370c7ba26, @@ -15355,7 +15686,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 7 + spotID: 10 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -15423,7 +15754,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1470026956, guid: 9bddc9315b8aaee49bc33836aca78901, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1470026956, guid: 9bddc9315b8aaee49bc33836aca78901, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15475,37 +15806,6 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 0} ---- !u!1 &1481758879 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1481758880} - m_Layer: 0 - m_Name: CampPlant_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1481758880 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1481758879} - 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_Children: - - {fileID: 146695308} - m_Father: {fileID: 1505579321} - m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1495970811 PrefabInstance: m_ObjectHideFlags: 0 @@ -15845,60 +16145,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} ---- !u!1 &1505579320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1505579321} - m_Layer: 0 - m_Name: Interactables - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1505579321 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1505579320} - 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_Children: - - {fileID: 2102981205} - - {fileID: 1144117051} - - {fileID: 7461232657231471731} - - {fileID: 6617766066562969706} - - {fileID: 849399888} - - {fileID: 1866350973} - - {fileID: 949040747} - - {fileID: 1610523501} - - {fileID: 1598077011} - - {fileID: 2096608973} - - {fileID: 558295860} - - {fileID: 222814179} - - {fileID: 1948214465} - - {fileID: 1198243220} - - {fileID: 1481758880} - - {fileID: 1336583494} - - {fileID: 597916727} - - {fileID: 1162764934} - m_Father: {fileID: 0} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1528293892 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -15906,15 +16158,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: -6.18 + value: -13.588108 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.77 + value: -1.3416004 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: -0.06 + value: -13.408496 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -15922,11 +16174,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -15934,7 +16186,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 30 + value: 22 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15948,6 +16200,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -15961,6 +16221,38 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2039641316} m_PrefabAsset: {fileID: 0} +--- !u!1 &1551673317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1551673318} + m_Layer: 0 + m_Name: Int2_Hobby + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1551673318 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551673317} + 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_Children: + - {fileID: 2073828400} + - {fileID: 1866350973} + m_Father: {fileID: 1394429269} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1556295694 PrefabInstance: m_ObjectHideFlags: 0 @@ -16103,15 +16395,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.x - value: -22.520294 + value: -14.477242 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.y - value: 24.7285 + value: 16.157724 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.z - value: 16.73776 + value: 13.868028 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalRotation.x @@ -16237,81 +16529,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} ---- !u!1 &1580930712 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 6507dfb1268ff4d48abffa85efbb9606, - type: 3} - m_PrefabInstance: {fileID: 558295859} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1580930715 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580930712} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c74d45b3e5e757f459d492bcc7a88370, type: 3} - m_Name: - m_EditorClassIdentifier: - stateData: {fileID: 11400000, guid: 277654609275448bc868a307884bcb99, type: 2} - interactableUI: - name: - fontSize: 36 - scaleSize: 1.5 - mode: 0 - useRotateToCamera: 1 - rotationOffset: {x: 0, y: 0, z: 0} - positionOffset: {x: -2, y: 0.5, z: 0} - debugActionUI: {fileID: 0} - interactableTracker: - positionOffset: {x: -1, y: 4.5, z: 0} - screenPositionOffset: {x: 0, y: 0} - screenWobbleDirection: {x: 0, y: 1} - screenRotation: 0 - interactablePreview: - scale: {x: 1, y: 1, z: 1} - position: {x: 0, y: -0.25, z: 0} - rotation: {x: -25, y: 0, z: 0} - useOrthographic: 1 - fieldOfView: 60 - orthographicSize: 1 - previewPrefab: {fileID: 0} - useRotate: 1 - rotateSpeed: 25 - interactableHighlights: - useHighlightsShader: 1 - highlightColor: {r: 1, g: 1, b: 1, a: 1} - highlightPower: 0.2 - rimColor: {r: 1, g: 1, b: 1, a: 1} - rimExponent: 3 - rimPower: 0.6 - outlineColor: {r: 1, g: 1, b: 1, a: 1} - outlineWidth: 0.02 - outlinePower: 0.2 - dynamicFlashSpeed: 0.5 - ID: - siteID: 1 - spotID: 4 - actionID: 0 - defaultShader: {fileID: 0} - highlightShader: {fileID: 0} - interactDistance: 2 - flagDeleteUI: 0 ---- !u!65 &1580930716 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580930712} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.0122206, y: 1.0243661, z: 0.6690061} - m_Center: {x: -0.16481209, y: 0.5121807, z: 0.036444068} --- !u!1001 &1588210104 PrefabInstance: m_ObjectHideFlags: 0 @@ -16743,7 +16960,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 11 + spotID: 12 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16762,37 +16979,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &1610523500 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1610523501} - m_Layer: 0 - m_Name: Stump_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1610523501 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1610523500} - 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_Children: - - {fileID: 1417165147} - m_Father: {fileID: 1505579321} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1614222248 GameObject: m_ObjectHideFlags: 0 @@ -16822,8 +17008,8 @@ Transform: m_LocalScale: {x: 1.4497001, y: 1.4497001, z: 1.4497001} m_Children: - {fileID: 1179178657} - m_Father: {fileID: 2102981205} - m_RootOrder: 1 + m_Father: {fileID: 1987559776} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1614222250 MonoBehaviour: @@ -17380,7 +17566,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_Name @@ -17388,19 +17574,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.x - value: 9.34 + value: 1.9318924 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990234 + value: -1.112577 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.z - value: 19.25 + value: 5.9015045 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalRotation.y @@ -17416,7 +17602,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_RootOrder - value: 1 + value: 25 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -17440,90 +17626,6 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 76161d0faf6e1fe449ac1cfccd076cab, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} ---- !u!1001 &1644540024 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7689651907291961766, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_Name - value: PlayerBase - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.7323008 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalPosition.y - value: 2.01 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalPosition.z - value: 6.34 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalRotation.y - value: -0.3953389 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.91853535 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9069888153672050503, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1941388449332123496, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.0035951268 - objectReference: {fileID: 0} - - target: {fileID: 1941388449332123496, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.1226947 - objectReference: {fileID: 0} - - target: {fileID: 1941388449332123496, guid: 4625cd85f35e0c541a0e50e8bf952dd9, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.047206387 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4625cd85f35e0c541a0e50e8bf952dd9, type: 3} --- !u!1 &1650450877 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 4fa21a43ed2bb614da920debd9abd6cd, @@ -18198,7 +18300,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 1 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -18576,6 +18678,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd1934aaebac97942bfdb7f07f468b70, type: 3} +--- !u!4 &1705011411 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 7318ef51591a5f6419da3f0b7713d33f, + type: 3} + m_PrefabInstance: {fileID: 698670820} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1706838680 PrefabInstance: m_ObjectHideFlags: 0 @@ -18896,7 +19004,7 @@ Transform: m_Children: - {fileID: 1233189608} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1728544784 PrefabInstance: @@ -19303,89 +19411,43 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1742794217} m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} ---- !u!1 &1743337240 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1743337241} - - component: {fileID: 1743337244} - - component: {fileID: 1743337243} - m_Layer: 0 - m_Name: Yeti_Box - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 1 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1743337241 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1743337240} - m_LocalRotation: {x: -0, y: -0, z: -9.313226e-10, w: 1} - m_LocalPosition: {x: -7.78, y: 4.18, z: 3.4066} - m_LocalScale: {x: 2.1811378, y: 4.1372275, z: 2.6582203} - m_Children: [] - m_Father: {fileID: 849399888} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1743337243 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1743337240} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 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 ---- !u!33 &1743337244 -MeshFilter: + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} +--- !u!1 &1753204898 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1743337240} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1753204899} + m_Layer: 0 + m_Name: Int10_Picnic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1753204899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1753204898} + 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_Children: + - {fileID: 1467576744} + m_Father: {fileID: 1394429269} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1753966716 GameObject: m_ObjectHideFlags: 0 @@ -19409,7 +19471,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1753966716} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: @@ -19428,8 +19490,8 @@ Transform: - {fileID: 1259198489} - {fileID: 808610727} - {fileID: 577158605} - m_Father: {fileID: 0} - m_RootOrder: 15 + m_Father: {fileID: 791146688} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1760886286 stripped Transform: @@ -19608,7 +19670,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_Name @@ -19616,15 +19678,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.x - value: 37.8 + value: 30.391891 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.y - value: 3.1 + value: -0.011600494 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalPosition.z - value: -53.4 + value: -66.7485 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalRotation.x @@ -19644,7 +19706,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_RootOrder - value: 3 + value: 27 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19660,11 +19722,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.x - value: 8.128453 + value: 8.128455 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.y - value: 8.128453 + value: 8.128455 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, type: 3} propertyPath: m_LocalScale.z @@ -19677,7 +19739,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1162764934} + m_TransformParent: {fileID: 1426764629} m_Modifications: - target: {fileID: 100000, guid: 6a1aff344311dec449c29ddd10feb7bf, type: 3} propertyPath: m_Name @@ -19741,11 +19803,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 6a1aff344311dec449c29ddd10feb7bf, type: 3} propertyPath: m_LocalScale.x - value: 1.273119 + value: 1.2731187 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 6a1aff344311dec449c29ddd10feb7bf, type: 3} propertyPath: m_LocalScale.z - value: 1.273119 + value: 1.2731187 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 6a1aff344311dec449c29ddd10feb7bf, type: 3} propertyPath: m_LocalScale.y @@ -20197,7 +20259,7 @@ GameObject: m_Component: - component: {fileID: 1866350973} m_Layer: 0 - m_Name: Drafting_Int + m_Name: Props_Hobby m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -20215,9 +20277,15 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 112596239} - m_Father: {fileID: 1505579321} - m_RootOrder: 5 + m_Father: {fileID: 1551673318} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1866540093 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 1201398727} + m_PrefabAsset: {fileID: 0} --- !u!4 &1870319899 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 8d50e390a123aab43906fea98d61039f, @@ -20475,7 +20543,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 100000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_Name @@ -20483,15 +20551,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.x - value: 5.19 + value: -2.2181077 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.y - value: 3.49 + value: 0.3783996 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalPosition.z - value: -9.5 + value: -22.848495 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalRotation.x @@ -20511,7 +20579,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_RootOrder - value: 22 + value: 14 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -20527,7 +20595,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_LocalScale.z - value: 1.0509 + value: 1.0508997 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 735aac4ff85d148a0889b186a4506895, type: 3} propertyPath: m_Materials.Array.data[0] @@ -20667,15 +20735,36 @@ Transform: - {fileID: 1760886286} - {fileID: 253710648} - {fileID: 1631939966} + - {fileID: 1459966805} + - {fileID: 2075687958} + - {fileID: 1866540093} + - {fileID: 895677133} + - {fileID: 1391947467} + - {fileID: 496394741} + - {fileID: 2066784128} + - {fileID: 266423572} + - {fileID: 1419073449} + - {fileID: 312231878} + - {fileID: 2070337414} + - {fileID: 318104734} + - {fileID: 1948190031} + - {fileID: 464721324} + - {fileID: 831423443} + - {fileID: 1705011411} + - {fileID: 750967132} + - {fileID: 1218474610} + - {fileID: 179465822} + - {fileID: 1310907016} + - {fileID: 291792859} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1908140515 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1336583494} + m_TransformParent: {fileID: 966573326} m_Modifications: - target: {fileID: 1146892914206294170, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} @@ -20695,7 +20784,7 @@ PrefabInstance: - target: {fileID: 5481901129729512355, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} propertyPath: m_LocalPosition.z - value: 7.6500006 + value: 11.89 objectReference: {fileID: 0} - target: {fileID: 5481901129729512355, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} @@ -21778,37 +21867,12 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: fda856e184be3144186c81e559d28fd6, type: 3} ---- !u!1 &1948214464 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1948214465} - m_Layer: 0 - m_Name: BodegaPet_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1948214465 +--- !u!4 &1948190031 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 943541885} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1948214464} - 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_Children: - - {fileID: 5111621357860423552} - m_Father: {fileID: 1505579321} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1952713135 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100280, guid: ce5eaa8a9befed24fb4c6279fb26b0d9, @@ -21910,8 +21974,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 1 + siteID: 0 + spotID: 0 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -21994,6 +22058,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1984985724} m_Mesh: {fileID: 4300000, guid: 4fcf86a2a5f183b4481fc78819f1753f, type: 3} +--- !u!1 &1987559775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1987559776} + m_Layer: 0 + m_Name: Int3_BearDreams + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1987559776 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1987559775} + 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_Children: + - {fileID: 1614222249} + - {fileID: 2102981205} + m_Father: {fileID: 1394429269} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1988650447 GameObject: m_ObjectHideFlags: 0 @@ -22587,7 +22683,7 @@ PrefabInstance: - target: {fileID: 6120462204411503799, guid: 022509ea5d46cbd43a71df30fffc76c4, type: 3} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6120462204411503799, guid: 022509ea5d46cbd43a71df30fffc76c4, type: 3} @@ -22656,6 +22752,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 022509ea5d46cbd43a71df30fffc76c4, type: 3} +--- !u!4 &2066784128 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 735aac4ff85d148a0889b186a4506895, + type: 3} + m_PrefabInstance: {fileID: 1893287324} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2070337414 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, + type: 3} + m_PrefabInstance: {fileID: 900592810} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2070454275 PrefabInstance: m_ObjectHideFlags: 0 @@ -22842,7 +22950,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 112596239} + m_TransformParent: {fileID: 1551673318} m_Modifications: - target: {fileID: 100000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_Name @@ -22858,35 +22966,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalPosition.x - value: -0.9800005 + value: 20.645819 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalPosition.y - value: 1.1846838 + value: 4.6200886 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalPosition.z - value: 0.21600056 + value: 15.884484 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalRotation.x - value: 0.46707025 + value: 0.362301 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0.5580455 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.2947755 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalRotation.w - value: 0.88422024 + value: 0.68587947 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -22902,11 +23010,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 1.3000007 objectReference: {fileID: 0} - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 1.3000008 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} + propertyPath: m_LocalScale.x + value: 1.3000014 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: fd9f99d200614384dbfd9a8da37a12e4, type: 3} propertyPath: m_Materials.Array.data[0] @@ -22969,8 +23081,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: 7 + siteID: 0 + spotID: 2 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -22989,6 +23101,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.8615637, y: 0.94567454, z: 1.3425983} m_Center: {x: 0.09378195, y: -0.11127464, z: 0.3192277} +--- !u!4 &2073828400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: fd9f99d200614384dbfd9a8da37a12e4, + type: 3} + m_PrefabInstance: {fileID: 2073828396} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2075687958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1ab43b3c36470674385ffaa62af14805, + type: 3} + m_PrefabInstance: {fileID: 1084831466} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2076902473 PrefabInstance: m_ObjectHideFlags: 0 @@ -23230,36 +23354,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 51328612} m_PrefabAsset: {fileID: 0} ---- !u!1 &2096608972 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2096608973} - m_Layer: 0 - m_Name: ============== - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2096608973 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2096608972} - 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_Children: [] - m_Father: {fileID: 1505579321} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2102981204 GameObject: m_ObjectHideFlags: 0 @@ -23270,7 +23364,7 @@ GameObject: m_Component: - component: {fileID: 2102981205} m_Layer: 0 - m_Name: Dream_Int + m_Name: Props_Bear m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -23283,14 +23377,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2102981204} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: - {fileID: 281163863} - - {fileID: 1614222249} - m_Father: {fileID: 1505579321} - m_RootOrder: 0 + m_Father: {fileID: 1987559776} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2104506655 GameObject: @@ -23389,7 +23482,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1907115580} m_Modifications: - target: {fileID: 1435467742513656, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Name @@ -23397,15 +23490,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.x - value: 7.51 + value: 0.10189247 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.y - value: 1.9990244 + value: -1.112576 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalPosition.z - value: 13.84 + value: 0.49150467 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.x @@ -23413,11 +23506,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalRotation.w @@ -23425,7 +23518,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_RootOrder - value: 21 + value: 13 objectReference: {fileID: 0} - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -23439,6 +23532,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.y + value: 1.500001 + objectReference: {fileID: 0} + - target: {fileID: 4945391837379990, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} + propertyPath: m_LocalScale.z + value: 1.500001 + objectReference: {fileID: 0} - target: {fileID: 23638501506627024, guid: 6f526ea80f2e4cadb14bd1d959c57dcf, type: 3} propertyPath: m_Materials.Array.data[0] @@ -23658,7 +23759,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 6617766066562969706} + m_TransformParent: {fileID: 800346074} m_Modifications: - target: {fileID: 765759730692422701, guid: 39e33fe473c22f8409ea2aec3218401b, type: 3} @@ -23700,6 +23801,21 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -9 objectReference: {fileID: 0} + - target: {fileID: 5959189707000753086, guid: 39e33fe473c22f8409ea2aec3218401b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5959189707000753086, guid: 39e33fe473c22f8409ea2aec3218401b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5959189707000753086, guid: 39e33fe473c22f8409ea2aec3218401b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4096988881285288639, guid: 39e33fe473c22f8409ea2aec3218401b, type: 3} propertyPath: m_Size.y @@ -23908,7 +24024,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1198243220} + m_TransformParent: {fileID: 957926021} m_Modifications: - target: {fileID: 6161106414982791869, guid: ebc1e9b7e862c8f45a834068a15c4e22, type: 3} @@ -24169,7 +24285,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1948214465} + m_TransformParent: {fileID: 183299529} m_Modifications: - target: {fileID: 1751768785083222839, guid: 1162a6c805a956340974085ee20628f5, type: 3} @@ -24234,7 +24350,7 @@ PrefabInstance: - target: {fileID: 688253243814552831, guid: 1162a6c805a956340974085ee20628f5, type: 3} propertyPath: m_LocalScale.x - value: 1.9726 + value: 1.9726002 objectReference: {fileID: 0} - target: {fileID: 688253243814552831, guid: 1162a6c805a956340974085ee20628f5, type: 3} @@ -24244,7 +24360,7 @@ PrefabInstance: - target: {fileID: 688253243814552831, guid: 1162a6c805a956340974085ee20628f5, type: 3} propertyPath: m_LocalScale.z - value: 1.9726 + value: 1.9726002 objectReference: {fileID: 0} - target: {fileID: 5049012469066471091, guid: 1162a6c805a956340974085ee20628f5, type: 3} @@ -24313,8 +24429,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 1 - spotID: -1 + siteID: 0 + spotID: 14 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -24333,68 +24449,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 3, y: 3, z: 1} m_Center: {x: 1.5, y: 0, z: -0.2} ---- !u!4 &6617766066562969706 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6617766066562969717} - 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_Children: - - {fileID: 1980436923} - m_Father: {fileID: 1505579321} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6617766066562969717 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6617766066562969706} - m_Layer: 0 - m_Name: Bush_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 1 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &7461232657231471724 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7461232657231471731} - m_Layer: 0 - m_Name: Car_Int - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7461232657231471731 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7461232657231471724} - 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_Children: - - {fileID: 7461232657767406650} - m_Father: {fileID: 1505579321} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &7461232657767406650 stripped Transform: m_CorrespondingSourceObject: {fileID: 2223619162707833376, guid: 467341a17588a724082d97c10ee7f2c6, @@ -24406,7 +24460,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7461232657231471731} + m_TransformParent: {fileID: 1278154901} m_Modifications: - target: {fileID: 8741625735846432610, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} @@ -24473,32 +24527,32 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.27400002 objectReference: {fileID: 0} - - target: {fileID: 8741625735846432608, guid: 467341a17588a724082d97c10ee7f2c6, + - target: {fileID: 6450487560169818200, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} propertyPath: m_StaticEditorFlags - value: 0 + value: 8 objectReference: {fileID: 0} - - target: {fileID: 8741625735846432608, guid: 467341a17588a724082d97c10ee7f2c6, + - target: {fileID: 6450487560169818200, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} propertyPath: m_NavMeshLayer value: 1 objectReference: {fileID: 0} - - target: {fileID: 8741625735846432614, guid: 467341a17588a724082d97c10ee7f2c6, + - target: {fileID: 8741625735846432608, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - - target: {fileID: 8741625735846432614, guid: 467341a17588a724082d97c10ee7f2c6, + - target: {fileID: 8741625735846432608, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} propertyPath: m_NavMeshLayer value: 1 objectReference: {fileID: 0} - - target: {fileID: 6450487560169818200, guid: 467341a17588a724082d97c10ee7f2c6, + - target: {fileID: 8741625735846432614, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} propertyPath: m_StaticEditorFlags - value: 8 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6450487560169818200, guid: 467341a17588a724082d97c10ee7f2c6, + - target: {fileID: 8741625735846432614, guid: 467341a17588a724082d97c10ee7f2c6, type: 3} propertyPath: m_NavMeshLayer value: 1 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/DinoSafari.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/DinoSafari.unity index cc23ccce..8b73c72f 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/DinoSafari.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/DinoSafari.unity @@ -1230,8 +1230,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 0 + siteID: 0 + spotID: 15 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -3148,8 +3148,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 1 + siteID: 0 + spotID: 3 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -3866,8 +3866,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 2 + siteID: 0 + spotID: 4 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -4894,8 +4894,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 3 + siteID: 0 + spotID: 14 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -9604,15 +9604,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2074839722, guid: 542db60eea31a4e4eb110be8517f1888, type: 3} propertyPath: m_LocalPosition.x - value: 13.632902 + value: 13.42297 objectReference: {fileID: 0} - target: {fileID: 2074839722, guid: 542db60eea31a4e4eb110be8517f1888, type: 3} propertyPath: m_LocalPosition.y - value: 24.45132 + value: 24.1994 objectReference: {fileID: 0} - target: {fileID: 2074839722, guid: 542db60eea31a4e4eb110be8517f1888, type: 3} propertyPath: m_LocalPosition.z - value: 7.253509 + value: 7.463439 objectReference: {fileID: 0} - target: {fileID: 2074839722, guid: 542db60eea31a4e4eb110be8517f1888, type: 3} propertyPath: m_LocalRotation.x @@ -9826,8 +9826,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 5 + siteID: 0 + spotID: 10 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -11391,8 +11391,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 6 + siteID: 0 + spotID: 7 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16651,8 +16651,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 7 + siteID: 0 + spotID: 12 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -19814,8 +19814,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 8 + siteID: 0 + spotID: 5 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -25226,8 +25226,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 9 + siteID: 0 + spotID: 0 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -25509,22 +25509,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 8365260494765910076, guid: c073b76d9c8bed5409d6faa1f8e5679a, + - target: {fileID: 4854250579102492707, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c91f01000210c31448718385029d98db, type: 2} - - target: {fileID: 4854250579102492707, guid: c073b76d9c8bed5409d6faa1f8e5679a, + - target: {fileID: 8365260494765910076, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c91f01000210c31448718385029d98db, type: 2} - - target: {fileID: 4981449980681734252, guid: c073b76d9c8bed5409d6faa1f8e5679a, + - target: {fileID: 1781255764957883413, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: c91f01000210c31448718385029d98db, type: 2} - - target: {fileID: 1781255764957883413, guid: c073b76d9c8bed5409d6faa1f8e5679a, + - target: {fileID: 4981449980681734252, guid: c073b76d9c8bed5409d6faa1f8e5679a, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -26063,8 +26063,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 10 + siteID: 0 + spotID: 9 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -26269,6 +26269,11 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 1.122695 objectReference: {fileID: 0} + - target: {fileID: 8611606552064052501, guid: 8b0370746a4e1c5489f8a6df8d5ab6f8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.98975 + objectReference: {fileID: 0} - target: {fileID: 4745047229128163078, guid: 8b0370746a4e1c5489f8a6df8d5ab6f8, type: 3} propertyPath: m_StaticEditorFlags @@ -26279,11 +26284,6 @@ PrefabInstance: propertyPath: m_NavMeshLayer value: 1 objectReference: {fileID: 0} - - target: {fileID: 8611606552064052501, guid: 8b0370746a4e1c5489f8a6df8d5ab6f8, - type: 3} - propertyPath: m_LocalScale.x - value: 0.98975 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b0370746a4e1c5489f8a6df8d5ab6f8, type: 3} --- !u!1 &4499198699974260345 stripped @@ -26341,8 +26341,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 11 + siteID: 0 + spotID: 8 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -26497,8 +26497,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 12 + siteID: 0 + spotID: 1 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -26660,8 +26660,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 13 + siteID: 0 + spotID: 2 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -26897,8 +26897,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 14 + siteID: 0 + spotID: 13 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -26972,8 +26972,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 4 - spotID: 15 + siteID: 0 + spotID: 6 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/NonnaBIG_ISO.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/NonnaBIG_ISO.unity index 56e2c88e..d0477423 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/NonnaBIG_ISO.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/NonnaBIG_ISO.unity @@ -354,7 +354,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 1 + spotID: 4 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -2206,8 +2206,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 9 - spotID: 12 + siteID: 0 + spotID: 15 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -3115,12 +3115,12 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.29 objectReference: {fileID: 0} - - target: {fileID: 4312264524660603573, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 7282003047455060737, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7282003047455060737, guid: 54e1f0f989440f44b81a3857eb97d09d, + - target: {fileID: 4312264524660603573, guid: 54e1f0f989440f44b81a3857eb97d09d, type: 3} propertyPath: m_IsActive value: 0 @@ -3731,7 +3731,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 12 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -4021,7 +4021,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 2 + spotID: 5 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -10802,6 +10802,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8526995312094152173, guid: a93254a9ad48b9b4eaef71164a0e4b98, + type: 3} + propertyPath: m_Lightmapping + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8526995312215466645, guid: a93254a9ad48b9b4eaef71164a0e4b98, + type: 3} + propertyPath: m_Lightmapping + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3849274648728049183, guid: a93254a9ad48b9b4eaef71164a0e4b98, type: 3} propertyPath: m_Layer @@ -10859,16 +10869,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 8526995312094152173, guid: a93254a9ad48b9b4eaef71164a0e4b98, - type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8526995312215466645, guid: a93254a9ad48b9b4eaef71164a0e4b98, - type: 3} - propertyPath: m_Lightmapping - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a93254a9ad48b9b4eaef71164a0e4b98, type: 3} --- !u!1001 &785413092 @@ -11559,7 +11559,7 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 9 + siteID: 0 spotID: 9 actionID: 0 defaultShader: {fileID: 0} @@ -12246,7 +12246,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 13 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -12754,7 +12754,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 7 + spotID: 14 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -13069,7 +13069,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 7 + spotID: 1 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -20292,8 +20292,8 @@ MonoBehaviour: outlinePower: 0 dynamicFlashSpeed: 0.5 ID: - siteID: 9 - spotID: 4 + siteID: 0 + spotID: 8 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -23183,8 +23183,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 9 - spotID: 10 + siteID: 0 + spotID: 7 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -23971,8 +23971,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 9 - spotID: 11 + siteID: 0 + spotID: 3 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -24898,7 +24898,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 4 + spotID: 0 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -24932,17 +24932,17 @@ PrefabInstance: - target: {fileID: 3713208563322224810, guid: 0f9a97e050f41e547a29c5924285ac9f, type: 3} propertyPath: m_LocalPosition.x - value: 7.932825 + value: 7.932831 objectReference: {fileID: 0} - target: {fileID: 3713208563322224810, guid: 0f9a97e050f41e547a29c5924285ac9f, type: 3} propertyPath: m_LocalPosition.y - value: 14.592139 + value: 14.592147 objectReference: {fileID: 0} - target: {fileID: 3713208563322224810, guid: 0f9a97e050f41e547a29c5924285ac9f, type: 3} propertyPath: m_LocalPosition.z - value: -6.5112295 + value: -6.511235 objectReference: {fileID: 0} - target: {fileID: 3713208563322224810, guid: 0f9a97e050f41e547a29c5924285ac9f, type: 3} @@ -25218,7 +25218,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 2 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -27257,7 +27257,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 15 + spotID: 10 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -27390,8 +27390,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 9 - spotID: 15 + siteID: 0 + spotID: 11 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/PirateShip_Wreck.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/PirateShip_Wreck.unity index 0fd8a9ed..78f3751e 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/PirateShip_Wreck.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/PirateShip_Wreck.unity @@ -1368,6 +1368,11 @@ PrefabInstance: propertyPath: mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 4049434664326887411, guid: 60efb4839362f4a89a682dcacc4ed593, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7853472701785297717, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} propertyPath: m_Layer @@ -1643,11 +1648,6 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 4049434664326887411, guid: 60efb4839362f4a89a682dcacc4ed593, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} --- !u!1001 &190843569 @@ -1792,8 +1792,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 1 + siteID: 0 + spotID: 4 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -2387,7 +2387,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 13 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -3106,8 +3106,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 1 + siteID: 0 + spotID: 10 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -3699,7 +3699,7 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 + siteID: 0 spotID: 3 actionID: 0 defaultShader: {fileID: 0} @@ -4563,7 +4563,7 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 + siteID: 0 spotID: 8 actionID: 0 defaultShader: {fileID: 0} @@ -5241,16 +5241,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.8780891 objectReference: {fileID: 0} - - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, + - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} - - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, + objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} --- !u!1001 &738868515 @@ -6877,16 +6877,16 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.8780891 objectReference: {fileID: 0} - - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, + - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} - - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, + objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} --- !u!1 &1066690520 stripped @@ -7012,8 +7012,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 5 + siteID: 0 + spotID: 1 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -8037,7 +8037,7 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 + siteID: 0 spotID: 6 actionID: 0 defaultShader: {fileID: 0} @@ -8721,7 +8721,7 @@ Transform: - {fileID: 1260577707} - {fileID: 1520029159} m_Father: {fileID: 1285697765} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 11.169001, y: 64.115005, z: 0} --- !u!1 &1258379699 GameObject: @@ -8878,8 +8878,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 808167411} - - {fileID: 2056507972} - {fileID: 1254629796} + - {fileID: 2056507972} - {fileID: 417693725} - {fileID: 1749926700} - {fileID: 882948327} @@ -9695,8 +9695,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 7 + siteID: 0 + spotID: 0 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -11441,7 +11441,7 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 + siteID: 0 spotID: 9 actionID: 0 defaultShader: {fileID: 0} @@ -14411,9 +14411,9 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 10 - actionID: 3 + siteID: 0 + spotID: 14 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -14752,8 +14752,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 11 + siteID: 0 + spotID: 12 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -14864,16 +14864,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, + - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} - - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, + objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} --- !u!1 &1549985730003087179 stripped @@ -14931,8 +14931,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 12 + siteID: 0 + spotID: 5 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -15176,15 +15176,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.x - value: 36.8211 + value: 36.820515 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.y - value: 19.8151 + value: 19.81451 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.z - value: -37.4811 + value: -37.480515 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalRotation.x @@ -15218,6 +15218,31 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: near clip plane + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: far clip plane + value: 500 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: field of view + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: orthographic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: m_ForceIntoRT + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4180337171827899489, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: smoothSpeed @@ -15248,31 +15273,6 @@ PrefabInstance: propertyPath: startingDistance value: 40 objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: near clip plane - value: 0.01 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: far clip plane - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: field of view - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: orthographic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: m_ForceIntoRT - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} --- !u!4 &2696214817383897303 stripped @@ -15634,8 +15634,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 13 + siteID: 0 + spotID: 11 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16403,16 +16403,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, + - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} - - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, + objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} --- !u!4 &5006512735231873217 @@ -16484,9 +16484,9 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 13 - actionID: 3 + siteID: 0 + spotID: 7 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -17039,16 +17039,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, + - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} - - target: {fileID: -1504981713932161579, guid: 85de5359c12d03d4bb03e3139da33335, + objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + - target: {fileID: -4838500963814908710, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2} + objectReference: {fileID: 2100000, guid: e9d1845fc2bb8654793febeab6e14be9, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85de5359c12d03d4bb03e3139da33335, type: 3} --- !u!33 &7672716331556496929 @@ -17215,9 +17215,9 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 - spotID: 14 - actionID: 2 + siteID: 0 + spotID: 2 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -17304,7 +17304,7 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 10 + siteID: 0 spotID: 15 actionID: 0 defaultShader: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SaloonBiggerISO.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SaloonBiggerISO.unity index 89b54599..f229af81 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SaloonBiggerISO.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SaloonBiggerISO.unity @@ -715,7 +715,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1695694275} + m_TransformParent: {fileID: 1882891219} m_Modifications: - target: {fileID: 1044594275, guid: 846719ebad3828b4ea34175f0e1037e4, type: 3} propertyPath: m_Name @@ -1222,8 +1222,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 0 + siteID: 0 + spotID: 15 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -1298,7 +1298,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 11 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -5872,7 +5872,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 13 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -10422,15 +10422,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.x - value: -17.82519 + value: -14.070531 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.y - value: 25.955265 + value: 20.698744 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.z - value: 18.02519 + value: 14.270531 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalRotation.x @@ -10464,6 +10464,31 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: orthographic size + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: m_ForceIntoRT + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: orthographic + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: near clip plane + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, + type: 3} + propertyPath: field of view + value: 39 + objectReference: {fileID: 0} - target: {fileID: -4180337171827899489, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: cameraDirection.x @@ -10499,31 +10524,6 @@ PrefabInstance: propertyPath: lookAtPeek value: 2 objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: orthographic size - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: m_ForceIntoRT - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: orthographic - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: near clip plane - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 20525739037215982, guid: aa27dd578d1964eb08181aef95a8c783, - type: 3} - propertyPath: field of view - value: 39 - objectReference: {fileID: 0} - target: {fileID: 114490321540450308, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: distance @@ -12251,12 +12251,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604167469} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: - {fileID: 2046339308388617537} - m_Father: {fileID: 1695694275} + m_Father: {fileID: 1882891219} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &607654791 stripped @@ -12314,8 +12314,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 3 + siteID: 0 + spotID: 8 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -15325,7 +15325,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 2 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -16271,8 +16271,8 @@ Transform: m_LocalPosition: {x: 1.2999997, y: 0, z: -2.6049995} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 864928218} - {fileID: 2621377708917000069} + - {fileID: 864928218} m_Father: {fileID: 1318287945} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -19433,7 +19433,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 9 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -20011,8 +20011,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 6 + siteID: 0 + spotID: 3 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -20958,8 +20958,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 7 + siteID: 0 + spotID: 4 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -31525,52 +31525,6 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 8c982fd13c0a90b468251c2a8379979b, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 979ccd8e04a3b934e8167872c9bd5d03, type: 3} ---- !u!1 &1695694274 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1695694275} - - component: {fileID: 1695694277} - m_Layer: 0 - m_Name: HatGuy_Interactable - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1695694275 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695694274} - 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_Children: - - {fileID: 1044594278} - - {fileID: 604167470} - m_Father: {fileID: 1882891219} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1695694277 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1695694274} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1696971493 PrefabInstance: m_ObjectHideFlags: 0 @@ -33735,7 +33689,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 1 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -34512,7 +34466,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 7 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -34756,7 +34710,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1695694275} + - {fileID: 1044594278} + - {fileID: 604167470} m_Father: {fileID: 2069423410} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -35357,7 +35312,7 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 0 + spotID: 6 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -36447,8 +36402,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 12 + siteID: 0 + spotID: 10 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -38609,8 +38564,8 @@ MonoBehaviour: dynamicFlashSpeed: 0.5 ID: siteID: 0 - spotID: 4 - actionID: 1 + spotID: 14 + actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} interactDistance: 2 @@ -39077,8 +39032,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 13 + siteID: 0 + spotID: 0 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -42716,7 +42671,7 @@ Transform: - {fileID: 2621377708601144347} - {fileID: 2621377709418300215} m_Father: {fileID: 826777572} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -179.608, z: 0} --- !u!33 &2621377709368857218 MeshFilter: @@ -43489,8 +43444,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 14 + siteID: 0 + spotID: 5 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} @@ -44351,8 +44306,8 @@ MonoBehaviour: outlinePower: 0.2 dynamicFlashSpeed: 0.5 ID: - siteID: 11 - spotID: 15 + siteID: 0 + spotID: 12 actionID: 0 defaultShader: {fileID: 0} highlightShader: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SorcererTower.unity b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SorcererTower.unity index afc4dd3a..0340c38a 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SorcererTower.unity +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Game_16/SorcererTower.unity @@ -2557,10 +2557,10 @@ Transform: m_LocalPosition: {x: -6.5, y: 0, z: -5.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 327144277} - {fileID: 1801531726} - {fileID: 2051826673} - {fileID: 1831490028} - - {fileID: 327144277} - {fileID: 592968662} - {fileID: 1022613939} m_Father: {fileID: 0} @@ -9724,7 +9724,7 @@ Transform: - {fileID: 44956944} - {fileID: 440594506} m_Father: {fileID: 50818695} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &330462924 GameObject: @@ -20773,15 +20773,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 473411882} - m_LocalRotation: {x: -0, y: -0.49508077, z: -0, w: 0.868847} - m_LocalPosition: {x: 12.84, y: -2.9400005, z: 18.56} + 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_Children: - {fileID: 1776077484} - {fileID: 5589388723474847893} m_Father: {fileID: 327144277} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: -59.350002, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &481061333 PrefabInstance: m_ObjectHideFlags: 0 @@ -24408,11 +24408,6 @@ PrefabInstance: propertyPath: mode value: 0 objectReference: {fileID: 0} - - target: {fileID: 4049434664326887411, guid: 60efb4839362f4a89a682dcacc4ed593, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3159523895226436397, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} propertyPath: m_LocalPosition.x @@ -24468,6 +24463,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4049434664326887411, guid: 60efb4839362f4a89a682dcacc4ed593, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 60efb4839362f4a89a682dcacc4ed593, type: 3} --- !u!1001 &669906423 @@ -44365,31 +44365,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalPosition.x - value: -15.24 + value: 11.694 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalPosition.y - value: 31.06 + value: 30.441 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalPosition.z - value: 27.46 + value: -30.376 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalRotation.x - value: 0.002719807 + value: 0.00086402334 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalRotation.y - value: 0.92967993 + value: 0.695019 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalRotation.z - value: 0.003912703 + value: 0.004686167 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalRotation.w - value: 0.36833757 + value: 0.71897554 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_RootOrder @@ -44401,7 +44401,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 136.772 + value: 88.05801 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1c93dee6cbf28a842a620c2a98b315f1, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -45863,6 +45863,31 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2113433156851601028, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_Layer @@ -45903,45 +45928,45 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 237712980855701113, guid: c1257323fb9b1491581df1856a5d6733, type: 3} - propertyPath: m_AnchorMax.x - value: 0 + propertyPath: m_Layer + value: 5 objectReference: {fileID: 0} - - target: {fileID: 237712979754575222, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 237712979517244297, guid: c1257323fb9b1491581df1856a5d6733, type: 3} - propertyPath: m_AnchorMax.y - value: 0 + propertyPath: m_Layer + value: 5 objectReference: {fileID: 0} - - target: {fileID: 237712980855701113, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 237712979754575223, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_Layer value: 5 objectReference: {fileID: 0} - - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 8796258935133183206, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 237712979517244296, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 8796258935133183206, guid: c1257323fb9b1491581df1856a5d6733, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 237712979517244297, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 4203676832289758519, guid: c1257323fb9b1491581df1856a5d6733, type: 3} - propertyPath: m_Layer - value: 5 + propertyPath: m_AnchorMin.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 237712979754575223, guid: c1257323fb9b1491581df1856a5d6733, + - target: {fileID: 4203676832289758519, guid: c1257323fb9b1491581df1856a5d6733, type: 3} - propertyPath: m_Layer - value: 5 + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4203676832289758519, guid: c1257323fb9b1491581df1856a5d6733, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c1257323fb9b1491581df1856a5d6733, type: 3} @@ -59463,7 +59488,7 @@ Transform: - {fileID: 1472079585} - {fileID: 2032514427} m_Father: {fileID: 50818695} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1802338450 GameObject: @@ -63639,7 +63664,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400056, guid: 1457a9a02068a8d45bd722549a5b9a4e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 400056, guid: 1457a9a02068a8d45bd722549a5b9a4e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -67060,7 +67085,7 @@ Transform: - {fileID: 679872311} - {fileID: 2018326862} m_Father: {fileID: 50818695} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2058816648 stripped Transform: @@ -73986,37 +74011,37 @@ PrefabInstance: - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalPosition.x - value: -17.76 + value: 10.75265 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalPosition.y - value: 33.365997 + value: 32.746998 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalPosition.z - value: 26.5 + value: -32.90306 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalRotation.x - value: 0.17392309 + value: 0.33968496 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalRotation.y - value: -0.21172623 + value: -0.5456916 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalRotation.z - value: -0.43945524 + value: -0.32861 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalRotation.w - value: 0.8554542 + value: 0.6919902 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} @@ -74031,7 +74056,7 @@ PrefabInstance: - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -31.221 + value: -79.935005 objectReference: {fileID: 0} - target: {fileID: 5589388723474847893, guid: dcb93de96e2a0b74191e8b2b15f96503, type: 3} @@ -74281,83 +74306,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3f526ae79bd8a894db1e14a8e60ca409, type: 3} ---- !u!114 &3851358208054823400 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3851358208880722108} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} - m_Name: - m_EditorClassIdentifier: - sharedProfile: {fileID: 11400000, guid: 58b8ad9834f09b64094094161204f5dc, type: 2} - isGlobal: 1 - blendDistance: 0 - weight: 1 - priority: 0 ---- !u!114 &3851358208054823401 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3851358208880722108} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: - volumeTrigger: {fileID: 0} - volumeLayer: - serializedVersion: 2 - m_Bits: 1 - stopNaNPropagation: 1 - finalBlitToCameraTarget: 1 - antialiasingMode: 0 - temporalAntialiasing: - jitterSpread: 0.75 - sharpness: 0.25 - stationaryBlending: 0.95 - motionBlending: 0.85 - subpixelMorphologicalAntialiasing: - quality: 2 - fastApproximateAntialiasing: - fastMode: 0 - keepAlpha: 0 - fog: - enabled: 1 - excludeSkybox: 1 - debugLayer: - lightMeter: - width: 512 - height: 256 - showCurves: 1 - histogram: - width: 512 - height: 256 - channel: 3 - waveform: - exposure: 0.12 - height: 256 - vectorscope: - size: 256 - exposure: 0.12 - overlaySettings: - linearDepth: 0 - motionColorIntensity: 4 - motionGridSize: 64 - colorBlindnessType: 0 - colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} - m_ShowToolkit: 0 - m_ShowCustomSorter: 0 - breakBeforeColorGrading: 0 - m_BeforeTransparentBundles: [] - m_BeforeStackBundles: [] - m_AfterStackBundles: [] --- !u!1001 &3851358208880722106 PrefabInstance: m_ObjectHideFlags: 0 @@ -74371,15 +74319,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.x - value: 19.751015 + value: 26.356833 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.y - value: 49.656208 + value: 55.484875 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalPosition.z - value: -39.3199 + value: -44.759987 objectReference: {fileID: 0} - target: {fileID: 4956191140654338, guid: aa27dd578d1964eb08181aef95a8c783, type: 3} propertyPath: m_LocalRotation.x @@ -74497,6 +74445,83 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 3851358208880722106} m_PrefabAsset: {fileID: 0} +--- !u!114 &3851358208880722109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3851358208880722108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 3851358208880722107} + volumeLayer: + serializedVersion: 2 + m_Bits: 0 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 1 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 1 + m_ShowCustomSorter: 1 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] +--- !u!114 &3851358208880722110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3851358208880722108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: b39b526d8a5ff434f9dcc5b31607968a, type: 2} + isGlobal: 0 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!4 &3851358209919747713 Transform: m_ObjectHideFlags: 0 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer 1.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Dirt.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer 1.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Dirt.terrainlayer index 2c935f78..4196c45a 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer 1.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Dirt.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 1 + m_Name: AD_Dirt m_DiffuseTexture: {fileID: 2800000, guid: 91a105955c1454440963becdad704a10, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer 1.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Dirt.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer 1.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Dirt.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Sand.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Sand.terrainlayer index 987dda41..206d9ded 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Sand.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer + m_Name: AD_Sand m_DiffuseTexture: {fileID: 2800000, guid: 3305cf1edf6f89441bcde034af50f402, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Sand.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/NewLayer.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Sand.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/AD_Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Terrain.asset similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/AD_Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Terrain.asset diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/AD_Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/ArabianDay/AD_Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/AD_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Geo/CampTerrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CampTerrain.asset similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Geo/CampTerrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CampTerrain.asset diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Geo/CampTerrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CampTerrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Geo/CampTerrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CampTerrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Dirt_Terrain_Layer.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Dirt_Terrain_Layer.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt.terrainlayer index 29d483c5..060a2cd6 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Dirt_Terrain_Layer.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Dirt_Terrain_Layer + m_Name: Camp_Dirt m_DiffuseTexture: {fileID: 2800000, guid: ae96d84d9764fe545836e22559601b87, type: 3} m_NormalMapTexture: {fileID: 0} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Dirt_Terrain_Layer.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Dirt_Terrain_Layer.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/RockTerrainLYR.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt2.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/RockTerrainLYR.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt2.terrainlayer index 2a7dd491..a2b5bd6b 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/RockTerrainLYR.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt2.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RockTerrainLYR + m_Name: Camp_Dirt2 m_DiffuseTexture: {fileID: 2800000, guid: 440eb36db91ca410f800ff3cfe43572f, type: 3} m_NormalMapTexture: {fileID: 0} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/RockTerrainLYR.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt2.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/RockTerrainLYR.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt2.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Dirt.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt3.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Dirt.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt3.terrainlayer index 259b922a..f19b15a4 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Dirt.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt3.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Terrain_Dirt + m_Name: Camp_Dirt3 m_DiffuseTexture: {fileID: 2800000, guid: ae96d84d9764fe545836e22559601b87, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Dirt.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt3.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Dirt.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt3.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_DirtRocky.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt4.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_DirtRocky.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt4.terrainlayer index 7efcb90c..e392a84d 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_DirtRocky.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt4.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Terrain_DirtRocky + m_Name: Camp_Dirt4 m_DiffuseTexture: {fileID: 2800000, guid: 440eb36db91ca410f800ff3cfe43572f, type: 3} m_NormalMapTexture: {fileID: 0} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_DirtRocky.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt4.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_DirtRocky.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Camp_Dirt4.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand01.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand01.terrainlayer index 0a4a451d..89eb6633 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand01.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer + m_Name: CastleBeach_Sand01 m_DiffuseTexture: {fileID: 2800000, guid: 3305cf1edf6f89441bcde034af50f402, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer 1.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand02.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer 1.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand02.terrainlayer index e19105d9..8eb119c2 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer 1.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand02.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 1 + m_Name: CastleBeach_Sand02 m_DiffuseTexture: {fileID: 2800000, guid: f2d93d80f81ca3e4292b2236bc8624c0, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer 1.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand02.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/NewLayer 1.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Sand02.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/New Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Terrain.asset similarity index 98% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/New Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Terrain.asset index da0a4e63..a368ba1d 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/New Terrain.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Terrain.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/New Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SeedQuestIslands/New Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/CastleBeach_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 4.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoDirt_01.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 4.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoDirt_01.terrainlayer index 3c37d37d..fb032a6b 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 4.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoDirt_01.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 4 + m_Name: DinnoDirt_01 m_DiffuseTexture: {fileID: 2800000, guid: 91a105955c1454440963becdad704a10, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 4.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoDirt_01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 4.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoDirt_01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/NewLayer.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoGrass_01.terrainlayer similarity index 74% rename from Unity/SeedQuest/Assets/NewLayer.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoGrass_01.terrainlayer index 98ea2018..7951165c 100644 --- a/Unity/SeedQuest/Assets/NewLayer.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoGrass_01.terrainlayer @@ -6,9 +6,9 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer - m_DiffuseTexture: {fileID: 2800000, guid: ae96d84d9764fe545836e22559601b87, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} + m_Name: DinnoGrass_01 + m_DiffuseTexture: {fileID: 2800000, guid: 49f94955e73d39642a81207b447eebae, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: a2d23115dea722d4ab474b68d7e86ce6, type: 3} m_MaskMapTexture: {fileID: 0} m_TileSize: {x: 8, y: 8} m_TileOffset: {x: 0, y: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 3.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoGrass_01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 3.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinnoGrass_01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/Geo/Env/DinoParkTerrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinoParkTerrain.asset similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/Geo/Env/DinoParkTerrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinoParkTerrain.asset diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/Geo/Env/DinoParkTerrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinoParkTerrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/Geo/Env/DinoParkTerrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/DinoParkTerrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 2.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Dirt.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 2.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Dirt.terrainlayer index 152f99ac..91541257 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 2.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Dirt.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 2 + m_Name: Farm_Dirt m_DiffuseTexture: {fileID: 2800000, guid: 91a105955c1454440963becdad704a10, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 2.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Dirt.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 2.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Dirt.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 1.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 1.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass.terrainlayer index 7461a0fc..2bd5e493 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 1.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 1 + m_Name: Farm_Grass m_DiffuseTexture: {fileID: 2800000, guid: f51620caae6b3034ea0ff6b5a19fb72d, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: ce267903e043a984ead0e45a13fe7bae, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 1.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 1.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 3.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass2.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 3.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass2.terrainlayer index 27719c64..5a469898 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 3.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass2.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 3 + m_Name: Farm_Grass2 m_DiffuseTexture: {fileID: 2800000, guid: 49f94955e73d39642a81207b447eebae, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: a2d23115dea722d4ab474b68d7e86ce6, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 3.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass2.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 3.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Grass2.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Terrain.asset new file mode 100644 index 00000000..4985c4c8 Binary files /dev/null and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Terrain.asset differ diff --git a/Unity/SeedQuest/Assets/New Terrain 1.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Terrain.asset.meta similarity index 79% rename from Unity/SeedQuest/Assets/New Terrain 1.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Terrain.asset.meta index 30959e84..ff958f1c 100644 --- a/Unity/SeedQuest/Assets/New Terrain 1.asset.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Farm_Terrain.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71ee92c495daeb94fa6f57248e006d8f +guid: cb3d8615efb2cae42bd967bf5ebb0c6e NativeFormatImporter: externalObjects: {} mainObjectFileID: 15600000 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE01.asset similarity index 99% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE01.asset index 93a3784f..82f12d0d 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE01.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE01.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE01.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE02.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE02.asset new file mode 100644 index 00000000..33124278 Binary files /dev/null and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE02.asset differ diff --git a/Unity/SeedQuest/Assets/New Terrain 2.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE02.asset.meta similarity index 79% rename from Unity/SeedQuest/Assets/New Terrain 2.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE02.asset.meta index 136d4d81..8fc3bece 100644 --- a/Unity/SeedQuest/Assets/New Terrain 2.asset.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NOTSURE02.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb35b0c3d87255b4788a52148cf8fb87 +guid: 408a19ea9da50ee48a9d10ffb830f931 NativeFormatImporter: externalObjects: {} mainObjectFileID: 15600000 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/New LightmapParameters.giparams b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New LightmapParameters.giparams similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/New LightmapParameters.giparams rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New LightmapParameters.giparams diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/New LightmapParameters.giparams.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New LightmapParameters.giparams.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/New LightmapParameters.giparams.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New LightmapParameters.giparams.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset index aa38d5a9..f6266839 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset.meta index ff958f1c..30959e84 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cb3d8615efb2cae42bd967bf5ebb0c6e +guid: 71ee92c495daeb94fa6f57248e006d8f NativeFormatImporter: externalObjects: {} mainObjectFileID: 15600000 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset index 05aaa6ef..2520330d 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset.meta index 8fc3bece..136d4d81 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 2.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 408a19ea9da50ee48a9d10ffb830f931 +guid: cb35b0c3d87255b4788a52148cf8fb87 NativeFormatImporter: externalObjects: {} mainObjectFileID: 15600000 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewBrush.brush b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewBrush.brush deleted file mode 100644 index 798164e1..00000000 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewBrush.brush +++ /dev/null @@ -1,43 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12146, guid: 0000000000000000e000000000000000, type: 0} - m_Name: NewBrush - m_EditorClassIdentifier: - m_Mask: {fileID: 2800000, guid: f51620caae6b3034ea0ff6b5a19fb72d, type: 3} - m_Falloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_RadiusScale: 1.4849247 - m_BlackWhiteRemapMin: 0 - m_BlackWhiteRemapMax: 1 - m_InvertRemapRange: 0 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewBrush.brush.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewBrush.brush.meta deleted file mode 100644 index 3f6c1235..00000000 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewBrush.brush.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19d05cf1f95451a45b5e5cffb33cc267 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer index 1d7d721a..5c7e4d4b 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer @@ -7,15 +7,15 @@ TerrainLayer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NewLayer 4 - m_DiffuseTexture: {fileID: 2800000, guid: 3305cf1edf6f89441bcde034af50f402, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} + m_DiffuseTexture: {fileID: 2800000, guid: 6b94cc5cca635fb41ae280f500cfcbf8, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: d5ff7715dda4dd649bcaba36e83e8d94, type: 3} m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 10, y: 10} + m_TileSize: {x: 3, y: 3} m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Specular: {r: 1, g: 1, b: 1, a: 0} m_Metallic: 0 - m_Smoothness: 0.084 - m_NormalScale: 1.41 + m_Smoothness: 1 + m_NormalScale: 1 m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer.meta index 38cf1c8d..08ecb056 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 4.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: be639c7c1dee3084da8efbda08046c8c +guid: 5933758f0d66b894fbd27bc4c5fc2c45 NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer index 7451d276..9545d669 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer @@ -7,15 +7,15 @@ TerrainLayer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NewLayer 5 - m_DiffuseTexture: {fileID: 2800000, guid: f2d93d80f81ca3e4292b2236bc8624c0, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} + m_DiffuseTexture: {fileID: 2800000, guid: a221de6a82f604d48a78393db6179dd0, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: a648a512ba50d3c42a567c72bb81eb3c, type: 3} m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 10, y: 10} - m_TileOffset: {x: 6.73, y: 1.89} - m_Specular: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 0} + m_TileSize: {x: 2, y: 2} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} m_Metallic: 0 m_Smoothness: 0 - m_NormalScale: 0.72 + m_NormalScale: 1 m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer.meta index 975fb0f9..174aecd9 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 5.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 904162bbb40ac244a8bdce25b246ab19 +guid: 03b90639c661bc348beeb6119ca2835f NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer index 38b4114e..e586ffdc 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer @@ -7,10 +7,10 @@ TerrainLayer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NewLayer 6 - m_DiffuseTexture: {fileID: 2800000, guid: 49f94955e73d39642a81207b447eebae, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: a2d23115dea722d4ab474b68d7e86ce6, type: 3} + m_DiffuseTexture: {fileID: 2800000, guid: 6b94cc5cca635fb41ae280f500cfcbf8, type: 3} + m_NormalMapTexture: {fileID: 0} m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 8, y: 8} + m_TileSize: {x: 2, y: 2} m_TileOffset: {x: 0, y: 0} m_Specular: {r: 0, g: 0, b: 0, a: 0} m_Metallic: 0 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer.meta index a54c40df..1f1c6c5d 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 6.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 340a122c0f42a9241953fc48e6e09f9a +guid: 4cdfe3f58d8ada443aedeb5e47283a79 NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer index bbf213e1..ea2ee16a 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer @@ -7,14 +7,14 @@ TerrainLayer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NewLayer 7 - m_DiffuseTexture: {fileID: 2800000, guid: f51620caae6b3034ea0ff6b5a19fb72d, type: 3} - m_NormalMapTexture: {fileID: 2800000, guid: ce267903e043a984ead0e45a13fe7bae, type: 3} + m_DiffuseTexture: {fileID: 2800000, guid: ab44671cf9d74544c8bb2fcfccabf496, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: d5ff7715dda4dd649bcaba36e83e8d94, type: 3} m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 8, y: 8} + m_TileSize: {x: 3, y: 3} m_TileOffset: {x: 0, y: 0} m_Specular: {r: 0, g: 0, b: 0, a: 0} m_Metallic: 0 - m_Smoothness: 0.302 + m_Smoothness: 0 m_NormalScale: 1 m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer.meta index 5d20acd2..5f54acd6 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer 7.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa5ff257d27246a45bd48d9ee7cec08a +guid: e0aa961c9dfc5464685a19549ec59add NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer index 70c0caec..98ea2018 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer @@ -7,10 +7,10 @@ TerrainLayer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NewLayer - m_DiffuseTexture: {fileID: 0} - m_NormalMapTexture: {fileID: 0} + m_DiffuseTexture: {fileID: 2800000, guid: ae96d84d9764fe545836e22559601b87, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 2, y: 2} + m_TileSize: {x: 8, y: 8} m_TileOffset: {x: 0, y: 0} m_Specular: {r: 0, g: 0, b: 0, a: 0} m_Metallic: 0 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer.meta index cdcb6959..075f396d 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/NewLayer.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14f7cb36d490498438038b513d9fb78b +guid: 5a0557e433f8db745a422c1c57ee2ca9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Textures/Nonna_TerrainLyr_Grass.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass.terrainlayer similarity index 95% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Textures/Nonna_TerrainLyr_Grass.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass.terrainlayer index 97bf41a0..f6355e31 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Textures/Nonna_TerrainLyr_Grass.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Nonna_TerrainLyr_Grass + m_Name: Nonna_Grass m_DiffuseTexture: {fileID: 2800000, guid: 3fa05baedd8543f4d8da0b7012d9f4e7, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: ce267903e043a984ead0e45a13fe7bae, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Textures/Nonna_TerrainLyr_Grass.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Textures/Nonna_TerrainLyr_Grass.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 3.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass2.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 3.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass2.terrainlayer index 17514b1b..c55f5ad3 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/DinoSafari/NewLayer 3.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass2.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 3 + m_Name: Nonna_Grass2 m_DiffuseTexture: {fileID: 2800000, guid: 49f94955e73d39642a81207b447eebae, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: a2d23115dea722d4ab474b68d7e86ce6, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/NewLayer 4.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass2.terrainlayer.meta similarity index 80% rename from Unity/SeedQuest/Assets/NewLayer 4.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass2.terrainlayer.meta index 08ecb056..a54c40df 100644 --- a/Unity/SeedQuest/Assets/NewLayer 4.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Grass2.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5933758f0d66b894fbd27bc4c5fc2c45 +guid: 340a122c0f42a9241953fc48e6e09f9a NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Nonna_Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Terrain.asset similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Nonna_Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Terrain.asset diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Nonna_Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/NonnaISO/Nonna_Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Nonna_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Grass.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Grass.terrainlayer new file mode 100644 index 00000000..626f6131 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Grass.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pirates_Grass + m_DiffuseTexture: {fileID: 2800000, guid: f51620caae6b3034ea0ff6b5a19fb72d, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: ce267903e043a984ead0e45a13fe7bae, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 8, y: 8} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0.302 + m_NormalScale: 1 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer 6.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Grass.terrainlayer.meta similarity index 80% rename from Unity/SeedQuest/Assets/NewLayer 6.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Grass.terrainlayer.meta index 1f1c6c5d..5d20acd2 100644 --- a/Unity/SeedQuest/Assets/NewLayer 6.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Grass.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4cdfe3f58d8ada443aedeb5e47283a79 +guid: aa5ff257d27246a45bd48d9ee7cec08a NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand.terrainlayer new file mode 100644 index 00000000..ffb10a01 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pirates_Sand + m_DiffuseTexture: {fileID: 2800000, guid: 3305cf1edf6f89441bcde034af50f402, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 10, y: 10} + m_TileOffset: {x: 0, y: 0} + m_Specular: {r: 0, g: 0, b: 0, a: 0} + m_Metallic: 0 + m_Smoothness: 0.084 + m_NormalScale: 1.41 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer 5.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand.terrainlayer.meta similarity index 80% rename from Unity/SeedQuest/Assets/NewLayer 5.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand.terrainlayer.meta index 174aecd9..38cf1c8d 100644 --- a/Unity/SeedQuest/Assets/NewLayer 5.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 03b90639c661bc348beeb6119ca2835f +guid: be639c7c1dee3084da8efbda08046c8c NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand2.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand2.terrainlayer new file mode 100644 index 00000000..c0edd0b1 --- /dev/null +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand2.terrainlayer @@ -0,0 +1,22 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1953259897 &8574412962073106934 +TerrainLayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pirates_Sand2 + m_DiffuseTexture: {fileID: 2800000, guid: f2d93d80f81ca3e4292b2236bc8624c0, type: 3} + m_NormalMapTexture: {fileID: 2800000, guid: 0a1c9fdd66c90b343a3927a13f01617a, type: 3} + m_MaskMapTexture: {fileID: 0} + m_TileSize: {x: 10, y: 10} + m_TileOffset: {x: 6.73, y: 1.89} + m_Specular: {r: 0.7075472, g: 0.7075472, b: 0.7075472, a: 0} + m_Metallic: 0 + m_Smoothness: 0 + m_NormalScale: 0.72 + m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} + m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Unity/SeedQuest/Assets/NewLayer 7.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand2.terrainlayer.meta similarity index 80% rename from Unity/SeedQuest/Assets/NewLayer 7.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand2.terrainlayer.meta index 5f54acd6..975fb0f9 100644 --- a/Unity/SeedQuest/Assets/NewLayer 7.terrainlayer.meta +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Sand2.terrainlayer.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0aa961c9dfc5464685a19549ec59add +guid: 904162bbb40ac244a8bdce25b246ab19 NativeFormatImporter: externalObjects: {} mainObjectFileID: 8574412962073106934 diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 3.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Terrain.asset similarity index 99% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 3.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Terrain.asset index e7d92cc9..b708bc22 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 3.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Terrain.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 3.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/New Terrain 3.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Pirates_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/NewLayer 2.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Dirt01.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/NewLayer 2.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Dirt01.terrainlayer index 192b102b..034a093d 100644 --- a/Unity/SeedQuest/Assets/NewLayer 2.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Dirt01.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 2 + m_Name: ST_Dirt01 m_DiffuseTexture: {fileID: 2800000, guid: 91a105955c1454440963becdad704a10, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/NewLayer 2.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Dirt01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/NewLayer 2.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Dirt01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/NewLayer 1.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Grass01.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/NewLayer 1.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Grass01.terrainlayer index 2e3b5f75..f36697ab 100644 --- a/Unity/SeedQuest/Assets/NewLayer 1.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Grass01.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 1 + m_Name: ST_Grass01 m_DiffuseTexture: {fileID: 2800000, guid: f51620caae6b3034ea0ff6b5a19fb72d, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: ce267903e043a984ead0e45a13fe7bae, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/NewLayer 1.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Grass01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/NewLayer 1.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Grass01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/NewLayer 3.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Rock.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/NewLayer 3.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Rock.terrainlayer index f7b253a0..39998e54 100644 --- a/Unity/SeedQuest/Assets/NewLayer 3.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Rock.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 3 + m_Name: ST_Rock m_DiffuseTexture: {fileID: 2800000, guid: 2d627f438c13ad441bf8101493c06b6e, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: a28c30234fbc27d4db3caf6a8781ca25, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/NewLayer 3.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Rock.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/NewLayer 3.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/ST_Rock.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Saloon_Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_Terrain.asset similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Saloon_Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_Terrain.asset diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Saloon_Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Saloon_Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_.terrainlayer diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_Dirt.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_Dirt.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_Dirt.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_Dirt.terrainlayer diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_Dirt.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_Dirt.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_Dirt.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_Dirt.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_DirtRock.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_DirtRock.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_DirtRock.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_DirtRock.terrainlayer diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_DirtRock.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_DirtRock.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/FlatLands/Saloon/Textures/Saloon_TerrainLyr_DirtRock.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Saloon_TerrainLyr_DirtRock.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow01.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow01.terrainlayer index d38b029f..8c2a19c1 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow01.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer + m_Name: SnowLandsSnow01 m_DiffuseTexture: {fileID: 2800000, guid: 48db6bd2b1275e74c873996e0d582e0d, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 57a872298e9438a43a4d8d34e3dfc0b8, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 1.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow02.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 1.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow02.terrainlayer index 36bb24c2..00563271 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 1.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow02.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 1 + m_Name: SnowLandsSnow02 m_DiffuseTexture: {fileID: 2800000, guid: a6d6b54914a7eb54796b2c376906f59d, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 3a252e63e6e440746b7b724600c06ee7, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 1.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow02.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 1.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow02.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 2.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow03.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 2.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow03.terrainlayer index 9eadf9d4..0c798ca9 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 2.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow03.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 2 + m_Name: SnowLandsSnow03 m_DiffuseTexture: {fileID: 2800000, guid: 3bce165e8aa11b4499df97c9d65b4221, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 57a872298e9438a43a4d8d34e3dfc0b8, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 2.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow03.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/NewLayer 2.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsSnow03.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/New Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsTerrain.asset similarity index 98% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/New Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsTerrain.asset index d13963bb..e1ee985c 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/New Terrain.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsTerrain.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/New Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsTerrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/SnowLand/New Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SnowLandsTerrain.asset.meta diff --git a/Unity/SeedQuest/Assets/New Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SourcerersTower_Terrain.asset similarity index 98% rename from Unity/SeedQuest/Assets/New Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SourcerersTower_Terrain.asset index e490f87d..a1d3ca9d 100644 Binary files a/Unity/SeedQuest/Assets/New Terrain.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SourcerersTower_Terrain.asset differ diff --git a/Unity/SeedQuest/Assets/New Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SourcerersTower_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/New Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SourcerersTower_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/NewLayer 2.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SpaceGrass.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/NewLayer 2.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SpaceGrass.terrainlayer index 864e8d2e..e0e51cda 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/NewLayer 2.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SpaceGrass.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 2 + m_Name: SpaceGrass m_DiffuseTexture: {fileID: 2800000, guid: fabc48e7dd48fd4428af6d94c7c4d4df, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/NewLayer 2.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SpaceGrass.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/NewLayer 2.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SpaceGrass.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/New Terrain 1.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Space_Terrain.asset similarity index 99% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/New Terrain 1.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Space_Terrain.asset index 3a7f5171..bcb3995c 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/New Terrain 1.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Space_Terrain.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/New Terrain 1.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Space_Terrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Space/New Terrain 1.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Space_Terrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/New Terrain.asset b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SportsTerrain.asset similarity index 98% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/New Terrain.asset rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SportsTerrain.asset index 673456bc..317899d5 100644 Binary files a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/New Terrain.asset and b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SportsTerrain.asset differ diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/New Terrain.asset.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SportsTerrain.asset.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/New Terrain.asset.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/SportsTerrain.asset.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 3.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Dirt.terrainlayer similarity index 97% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 3.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Dirt.terrainlayer index f4067ca6..1df66b70 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 3.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Dirt.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 3 + m_Name: Sports_Dirt m_DiffuseTexture: {fileID: 2800000, guid: 91a105955c1454440963becdad704a10, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: 1710a73ae482aa04799a8501a2dc01e4, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 3.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Dirt.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 3.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Dirt.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 4.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Grass02.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 4.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Grass02.terrainlayer index 08356f4d..e55dfac1 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 4.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Grass02.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 4 + m_Name: Sports_Grass02 m_DiffuseTexture: {fileID: 2800000, guid: f51620caae6b3034ea0ff6b5a19fb72d, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: ce267903e043a984ead0e45a13fe7bae, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 4.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Grass02.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 4.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Sports_Grass02.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Grass.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Terrain_Grass.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Grass.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Terrain_Grass.terrainlayer diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Grass.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Terrain_Grass.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Camp/Textures/Terrain/Terrain_Grass.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/Terrain_Grass.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(0.600,0.600)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Grass_AGrass_N(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_Sand_basecolorSand_normal(1.000,1.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(0.400,0.400)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_rock_drock_n(10.000,10.000)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/_TerrainAutoUpgrade/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/layer_snow_albedosnow_normal(0.200,0.200)(0.000,0.000)(0.000,0.000,0.000),0.000,0.000.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 2.terrainlayer b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/sports_Grass01.terrainlayer similarity index 96% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 2.terrainlayer rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/sports_Grass01.terrainlayer index 3f950d6c..ba42c73b 100644 --- a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 2.terrainlayer +++ b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/sports_Grass01.terrainlayer @@ -6,7 +6,7 @@ TerrainLayer: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: NewLayer 2 + m_Name: sports_Grass01 m_DiffuseTexture: {fileID: 2800000, guid: 49f94955e73d39642a81207b447eebae, type: 3} m_NormalMapTexture: {fileID: 2800000, guid: a2d23115dea722d4ab474b68d7e86ce6, type: 3} m_MaskMapTexture: {fileID: 0} diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 2.terrainlayer.meta b/Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/sports_Grass01.terrainlayer.meta similarity index 100% rename from Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Sports/NewLayer 2.terrainlayer.meta rename to Unity/SeedQuest/Assets/SeedQuestPrototype/Scenes/Terrain/sports_Grass01.terrainlayer.meta diff --git a/Unity/SeedQuest/Assets/SeedQuestSandbox/Scripts/HUD/HUDManager.cs b/Unity/SeedQuest/Assets/SeedQuestSandbox/Scripts/HUD/HUDManager.cs index ae89bdf4..f2a69ec9 100644 --- a/Unity/SeedQuest/Assets/SeedQuestSandbox/Scripts/HUD/HUDManager.cs +++ b/Unity/SeedQuest/Assets/SeedQuestSandbox/Scripts/HUD/HUDManager.cs @@ -48,8 +48,11 @@ public void Awake() { public void InstantiateHUDElement(HUDItemProps props) { if(props.use && props.prefab != null && GetComponentInChildren(true) == null) { - PrefabUtility.InstantiatePrefab(props.prefab, transform); - //Instantiate(props.prefab, transform); + #if UNITY_EDITOR + PrefabUtility.InstantiatePrefab(props.prefab, transform); + #else + Instantiate(props.prefab, transform); + #endif } } @@ -60,8 +63,11 @@ static public void InstantiateHUDElement() { HUDItemProps props = Instance.GetProps(); if (props.prefab != null && Instance.GetComponentInChildren(true) == null) { - PrefabUtility.InstantiatePrefab(props.prefab, Instance.transform); - //Instantiate(props.prefab, Instance.transform); + #if UNITY_EDITOR + PrefabUtility.InstantiatePrefab(props.prefab, Instance.transform); + #else + Instantiate(props.prefab, Instance.transform); + #endif } } diff --git a/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools.meta b/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools.meta deleted file mode 100644 index 4e4aee00..00000000 --- a/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 05bd070de1fde9b43b08b87e369929f0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools/GroupSelected_Script.cs b/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools/GroupSelected_Script.cs deleted file mode 100644 index e2200d44..00000000 --- a/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools/GroupSelected_Script.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEditor; -using UnityEngine; - -public static class GroupCommand -{ - [MenuItem("GameObject/Group Selected %g")] - private static void GroupSelected() - { - if (!Selection.activeTransform) return; - var go = new GameObject(Selection.activeTransform.name + "_GRP"); - Undo.RegisterCreatedObjectUndo(go, "Group Selected"); - go.transform.SetParent(Selection.activeTransform.parent, false); - foreach (var transform in Selection.transforms) Undo.SetTransformParent(transform, go.transform, "Group Selected"); - Selection.activeGameObject = go; - } -} \ No newline at end of file diff --git a/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools/GroupSelected_Script.cs.meta b/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools/GroupSelected_Script.cs.meta deleted file mode 100644 index 2236db0e..00000000 --- a/Unity/SeedQuest/Assets/ThirdPartyLibraries/Tools/GroupSelected_Script.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9667406385752cb418c3de7a6274cbad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade.meta b/Unity/SeedQuest/Assets/_TerrainAutoUpgrade.meta deleted file mode 100644 index 02bd209c..00000000 --- a/Unity/SeedQuest/Assets/_TerrainAutoUpgrade.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 60a3ea647e53b9d409443be36a3456bb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/SeedQuest/ProjectSettings/ProjectSettings.asset b/Unity/SeedQuest/ProjectSettings/ProjectSettings.asset index d36ffb7f..f8038731 100644 --- a/Unity/SeedQuest/ProjectSettings/ProjectSettings.asset +++ b/Unity/SeedQuest/ProjectSettings/ProjectSettings.asset @@ -122,7 +122,7 @@ PlayerSettings: 16:10: 0 16:9: 1 Others: 0 - bundleVersion: 0.2.6.1 + bundleVersion: 0.2.6.2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0