diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index e9a5f044..3cc1e693 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bfe8c7161a4c7eeb2ea3c73057e6e54b09e655af052321f65e1696f1fffd025a +oid sha256:b99ad6ef10073663352d82df427be79474f17790ee616b79c35d76e959db5d6c size 1997 diff --git a/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs b/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs index 628020fd..f6e4af5e 100644 --- a/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs +++ b/Assets/_PROJECT/Components/Bow/Scripts/ArcheryRange.cs @@ -132,8 +132,10 @@ public class ArcheryRange : NetworkBehaviour { var targetObject = Instantiate(targetPrefab, randomPos, Quaternion.identity, null); string targetModelPath = modelGenerationBox.LastModelPath; - GameObject targetReplacement = await PipelineManager.Instance.SpawnModel(targetModelPath); - // TODO: replace target prefab's child with the generated model + + // Replace target prefab's child with the generated model + GameObject targetReplacement = await PipelineManager.Instance.SpawnModel(targetModelPath, false); + Destroy(targetObject.transform.GetChild(0).gameObject); targetReplacement.transform.parent = targetObject.transform; targetReplacement.transform.position = targetObject.transform.position; diff --git a/Assets/_PROJECT/Components/Portals2/TargetUFO Variant.prefab b/Assets/_PROJECT/Components/Portals2/TargetUFO Variant.prefab index 28f49a36..f147b87e 100644 --- a/Assets/_PROJECT/Components/Portals2/TargetUFO Variant.prefab +++ b/Assets/_PROJECT/Components/Portals2/TargetUFO Variant.prefab @@ -47,32 +47,42 @@ PrefabInstance: type: 3} propertyPath: _networkBehaviours.Array.data[0] value: - objectReference: {fileID: 5202846571429040564} + objectReference: {fileID: 0} - target: {fileID: 1047001759896168042, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _networkBehaviours.Array.data[1] value: - objectReference: {fileID: 1679634901522453674} + objectReference: {fileID: 0} - target: {fileID: 1047001759896168042, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _networkBehaviours.Array.data[2] value: - objectReference: {fileID: 6661770736086048195} + objectReference: {fileID: 0} - target: {fileID: 1047001759896168042, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _networkBehaviours.Array.data[3] value: - objectReference: {fileID: 2131991500650195796} + objectReference: {fileID: 0} - target: {fileID: 1047001759896168042, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _networkBehaviours.Array.data[4] value: - objectReference: {fileID: 427371208704957824} + objectReference: {fileID: 0} - target: {fileID: 1047001759896168042, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _sceneNetworkObjects.Array.data[0] value: - objectReference: {fileID: 9003568064594053937} + objectReference: {fileID: 0} + - target: {fileID: 2689384198849609103, guid: ffcd2a74c5d65454eb9a9df7cdee282d, + type: 3} + propertyPath: k__BackingField + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2689384198849609103, guid: ffcd2a74c5d65454eb9a9df7cdee282d, + type: 3} + propertyPath: k__BackingField + value: 11307787013377802985 + objectReference: {fileID: 0} - target: {fileID: 3316891016740450456, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _componentIndexCache @@ -88,6 +98,11 @@ PrefabInstance: propertyPath: _componentIndexCache value: 1 objectReference: {fileID: 0} + - target: {fileID: 7983999977322064054, guid: ffcd2a74c5d65454eb9a9df7cdee282d, + type: 3} + propertyPath: m_Name + value: TargetUFO Variant + objectReference: {fileID: 0} - target: {fileID: 8062271296867124751, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} propertyPath: _componentIndexCache @@ -157,108 +172,5 @@ PrefabInstance: - {fileID: 3572526038880022669, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 93219228833127587, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - insertIndex: -1 - addedObject: {fileID: 8322216027534318572} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ffcd2a74c5d65454eb9a9df7cdee282d, type: 3} ---- !u!114 &427371208704957824 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8618473685913268443, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1679634901522453674 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7294680161384397297, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2131991500650195796 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8062271296867124751, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5202846571429040564 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4197516043068701935, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8304503138865017336} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6661770736086048195 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3316891016740450456, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &8304503138865017336 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 93219228833127587, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} ---- !u!95 &8322216027534318572 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8304503138865017336} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 36e85fed2c7547d4f8c33da43172c8e7, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &9003568064594053937 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1047001759896168042, guid: ffcd2a74c5d65454eb9a9df7cdee282d, - type: 3} - m_PrefabInstance: {fileID: 8247405925049036123} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8304503138865017336} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab b/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab index 79824a27..44feff9b 100644 --- a/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab +++ b/Assets/_PROJECT/Prefabs/XR/Bow/TargetUFO.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &93219228833127587 +--- !u!1 &3508152469845169189 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,214 +8,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8461444523124913307} - - component: {fileID: 3572526038880022669} - - component: {fileID: 3766976745949113692} - - component: {fileID: 1047001759896168042} - - component: {fileID: 4197516043068701935} - - component: {fileID: 8992144926730888769} - - component: {fileID: 2113851326702507156} - m_Layer: 0 - m_Name: TargetUFO - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8461444523124913307 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.398, y: 1.1, z: 8.292} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7933779445518253981} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3572526038880022669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b311379c72a5ae4b8936e3b7283dd7a, type: 3} - m_Name: - m_EditorClassIdentifier: - _componentIndexCache: 0 - _addedNetworkObject: {fileID: 1047001759896168042} - _networkObjectCache: {fileID: 1047001759896168042} - pointsText: {fileID: 1237163760934993282, guid: 105635d7165dacd47956f38546d4a2ea, - type: 3} - endPosition: {x: 0, y: 0, z: 0} - forwardSpeed: 2 - minRandomOffset: {x: 0, y: 0, z: 0} - maxRandomOffset: {x: 0, y: 0, z: 0} ---- !u!54 &3766976745949113692 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 126 - m_CollisionDetection: 0 ---- !u!114 &1047001759896168042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} - m_Name: - m_EditorClassIdentifier: - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - _networkBehaviours: - - {fileID: 3572526038880022669} - - {fileID: 4197516043068701935} - - {fileID: 7294680161384397297} - - {fileID: 3316891016740450456} - - {fileID: 8062271296867124751} - - {fileID: 8618473685913268443} - k__BackingField: {fileID: 0} - k__BackingField: [] - _isNetworked: 1 - _isGlobal: 0 - _initializeOrder: 0 - _defaultDespawnType: 1 - NetworkObserver: {fileID: 0} - k__BackingField: 9 - k__BackingField: 0 - _scenePathHash: 0 - k__BackingField: 0 - k__BackingField: 12713957617246967544 - _sceneNetworkObjects: [] ---- !u!114 &4197516043068701935 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: - _componentIndexCache: 1 - _addedNetworkObject: {fileID: 1047001759896168042} - _networkObjectCache: {fileID: 1047001759896168042} - _synchronizeParent: 0 - _packing: - Position: 1 - Rotation: 1 - Scale: 0 - _interpolation: 2 - _extrapolation: 2 - _enableTeleport: 0 - _teleportThreshold: 1 - _clientAuthoritative: 1 - _sendToOwner: 1 - _synchronizePosition: 1 - _positionSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeRotation: 1 - _rotationSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeScale: 1 - _scaleSnapping: - X: 0 - Y: 0 - Z: 0 ---- !u!136 &8992144926730888769 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 1.07 - m_Height: 0.97 - m_Direction: 1 - m_Center: {x: 0.16, y: -0.51, z: 0} ---- !u!65 &2113851326702507156 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93219228833127587} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 4.5, y: 0.5, z: 3.77} - m_Center: {x: 0.12, y: -0.24, z: 0.06} ---- !u!1 &1503281482029840645 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7933779445518253981} - - component: {fileID: 7294680161384397297} + - component: {fileID: 3337587390139541606} + - component: {fileID: 627565954663756710} m_Layer: 0 m_Name: SportModel m_TagString: Untagged @@ -223,39 +17,39 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7933779445518253981 +--- !u!4 &3337587390139541606 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503281482029840645} + m_GameObject: {fileID: 3508152469845169189} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.24, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7485665512278860578} - - {fileID: 4684626877529458816} - - {fileID: 7773470377489803008} - m_Father: {fileID: 8461444523124913307} + - {fileID: 4011537191296717654} + - {fileID: 2406214921254263651} + - {fileID: 1251512755648678878} + m_Father: {fileID: 7527508320363503049} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7294680161384397297 +--- !u!114 &627565954663756710 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503281482029840645} + m_GameObject: {fileID: 3508152469845169189} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} m_Name: m_EditorClassIdentifier: _componentIndexCache: 2 - _addedNetworkObject: {fileID: 1047001759896168042} - _networkObjectCache: {fileID: 1047001759896168042} + _addedNetworkObject: {fileID: 2689384198849609103} + _networkObjectCache: {fileID: 2689384198849609103} _synchronizeParent: 0 _packing: Position: 1 @@ -282,7 +76,7 @@ MonoBehaviour: X: 0 Y: 0 Z: 0 ---- !u!1 &1632486231925472392 +--- !u!1 &6744593628588765187 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -290,135 +84,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7485665512278860578} - - component: {fileID: 3926456361165891691} - - component: {fileID: 371703801869909332} - - component: {fileID: 3316891016740450456} - m_Layer: 0 - m_Name: BezierCurve.005 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7485665512278860578 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1632486231925472392} - m_LocalRotation: {x: 0.00000031987892, y: 0, z: -0, w: 1} - m_LocalPosition: {x: 0.5, y: 0.3, z: 0.3} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7933779445518253981} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3926456361165891691 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1632486231925472392} - m_Mesh: {fileID: 2876602339255033164, guid: e2b74575a515c794786457a323da7b69, type: 3} ---- !u!23 &371703801869909332 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1632486231925472392} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a3ce1b39b1e52c94398a08157fda1dff, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &3316891016740450456 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1632486231925472392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} - m_Name: - m_EditorClassIdentifier: - _componentIndexCache: 3 - _addedNetworkObject: {fileID: 1047001759896168042} - _networkObjectCache: {fileID: 1047001759896168042} - _synchronizeParent: 0 - _packing: - Position: 1 - Rotation: 1 - Scale: 0 - _interpolation: 2 - _extrapolation: 2 - _enableTeleport: 0 - _teleportThreshold: 1 - _clientAuthoritative: 1 - _sendToOwner: 1 - _synchronizePosition: 1 - _positionSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeRotation: 1 - _rotationSnapping: - X: 0 - Y: 0 - Z: 0 - _synchronizeScale: 1 - _scaleSnapping: - X: 0 - Y: 0 - Z: 0 ---- !u!1 &5151923169000496226 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7773470377489803008} - - component: {fileID: 2351792501279987261} - - component: {fileID: 6736142794574324875} - - component: {fileID: 8618473685913268443} + - component: {fileID: 1251512755648678878} + - component: {fileID: 4963625795242203983} + - component: {fileID: 5457198189491340073} + - component: {fileID: 8959643074287331097} m_Layer: 0 m_Name: BezierCurve.007 m_TagString: Untagged @@ -426,36 +95,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7773470377489803008 +--- !u!4 &1251512755648678878 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5151923169000496226} + m_GameObject: {fileID: 6744593628588765187} m_LocalRotation: {x: 0.00000031987892, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.5, y: -1.2, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7933779445518253981} + m_Father: {fileID: 3337587390139541606} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2351792501279987261 +--- !u!33 &4963625795242203983 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5151923169000496226} + m_GameObject: {fileID: 6744593628588765187} m_Mesh: {fileID: 7696143681509816967, guid: e2b74575a515c794786457a323da7b69, type: 3} ---- !u!23 &6736142794574324875 +--- !u!23 &5457198189491340073 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5151923169000496226} + m_GameObject: {fileID: 6744593628588765187} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -492,21 +161,21 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8618473685913268443 +--- !u!114 &8959643074287331097 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5151923169000496226} + m_GameObject: {fileID: 6744593628588765187} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} m_Name: m_EditorClassIdentifier: _componentIndexCache: 5 - _addedNetworkObject: {fileID: 1047001759896168042} - _networkObjectCache: {fileID: 1047001759896168042} + _addedNetworkObject: {fileID: 2689384198849609103} + _networkObjectCache: {fileID: 2689384198849609103} _synchronizeParent: 0 _packing: Position: 1 @@ -533,7 +202,7 @@ MonoBehaviour: X: 0 Y: 0 Z: 0 ---- !u!1 &8543541715831694094 +--- !u!1 &7680366769166628765 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -541,47 +210,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4684626877529458816} - - component: {fileID: 5669060522451679251} - - component: {fileID: 1061113289265401427} - - component: {fileID: 8062271296867124751} + - component: {fileID: 4011537191296717654} + - component: {fileID: 1910778184414920112} + - component: {fileID: 363608006073787400} + - component: {fileID: 4439869206153374580} m_Layer: 0 - m_Name: BezierCurve.006 + m_Name: BezierCurve.005 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4684626877529458816 +--- !u!4 &4011537191296717654 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543541715831694094} - m_LocalRotation: {x: -0.00000015993946, y: 0.86602545, z: -0.00000027702328, w: -0.49999997} - m_LocalPosition: {x: 0.5, y: -3.4, z: 0.3} + m_GameObject: {fileID: 7680366769166628765} + m_LocalRotation: {x: 0.00000031987892, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.5, y: 0.3, z: 0.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7933779445518253981} - m_RootOrder: 1 + m_Father: {fileID: 3337587390139541606} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5669060522451679251 +--- !u!33 &1910778184414920112 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543541715831694094} - m_Mesh: {fileID: 2026425019520300902, guid: e2b74575a515c794786457a323da7b69, type: 3} ---- !u!23 &1061113289265401427 + m_GameObject: {fileID: 7680366769166628765} + m_Mesh: {fileID: 2876602339255033164, guid: e2b74575a515c794786457a323da7b69, type: 3} +--- !u!23 &363608006073787400 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543541715831694094} + m_GameObject: {fileID: 7680366769166628765} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -617,21 +286,350 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &8062271296867124751 +--- !u!114 &4439869206153374580 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8543541715831694094} + m_GameObject: {fileID: 7680366769166628765} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} m_Name: m_EditorClassIdentifier: - _componentIndexCache: 4 - _addedNetworkObject: {fileID: 1047001759896168042} - _networkObjectCache: {fileID: 1047001759896168042} + _componentIndexCache: 3 + _addedNetworkObject: {fileID: 2689384198849609103} + _networkObjectCache: {fileID: 2689384198849609103} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!1 &7983999977322064054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7527508320363503049} + - component: {fileID: 4850307641519017041} + - component: {fileID: 8954823527229761837} + - component: {fileID: 2689384198849609103} + - component: {fileID: 1843883317757509263} + - component: {fileID: 7451921017238644471} + - component: {fileID: 2131608416831220487} + m_Layer: 0 + m_Name: TargetUFO + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7527508320363503049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.398, y: 1.1, z: 8.292} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3337587390139541606} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4850307641519017041 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b311379c72a5ae4b8936e3b7283dd7a, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 0 + _addedNetworkObject: {fileID: 2689384198849609103} + _networkObjectCache: {fileID: 2689384198849609103} + pointsText: {fileID: 1237163760934993282, guid: 105635d7165dacd47956f38546d4a2ea, + type: 3} + endPosition: {x: 0, y: 0, z: 0} + forwardSpeed: 2 +--- !u!54 &8954823527229761837 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &2689384198849609103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + _networkBehaviours: + - {fileID: 4850307641519017041} + - {fileID: 1843883317757509263} + - {fileID: 627565954663756710} + - {fileID: 4439869206153374580} + - {fileID: 6540522042633253623} + - {fileID: 8959643074287331097} + k__BackingField: {fileID: 0} + k__BackingField: [] + _isNetworked: 1 + _isGlobal: 0 + _initializeOrder: 0 + _defaultDespawnType: 1 + NetworkObserver: {fileID: 0} + k__BackingField: 9 + k__BackingField: 0 + _scenePathHash: 0 + k__BackingField: 0 + k__BackingField: 12713957617246967544 + _sceneNetworkObjects: [] +--- !u!114 &1843883317757509263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 1 + _addedNetworkObject: {fileID: 2689384198849609103} + _networkObjectCache: {fileID: 2689384198849609103} + _synchronizeParent: 0 + _packing: + Position: 1 + Rotation: 1 + Scale: 0 + _interpolation: 2 + _extrapolation: 2 + _enableTeleport: 0 + _teleportThreshold: 1 + _clientAuthoritative: 1 + _sendToOwner: 1 + _synchronizePosition: 1 + _positionSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeRotation: 1 + _rotationSnapping: + X: 0 + Y: 0 + Z: 0 + _synchronizeScale: 1 + _scaleSnapping: + X: 0 + Y: 0 + Z: 0 +--- !u!136 &7451921017238644471 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 1.07 + m_Height: 0.97 + m_Direction: 1 + m_Center: {x: 0.16, y: -0.51, z: 0} +--- !u!65 &2131608416831220487 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7983999977322064054} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 4.5, y: 0.5, z: 3.77} + m_Center: {x: 0.12, y: -0.24, z: 0.06} +--- !u!1 &8462201784916155029 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2406214921254263651} + - component: {fileID: 6767210086105080178} + - component: {fileID: 3766991064380355318} + - component: {fileID: 6540522042633253623} + m_Layer: 0 + m_Name: BezierCurve.006 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2406214921254263651 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8462201784916155029} + m_LocalRotation: {x: -0.00000015993946, y: 0.86602545, z: -0.00000027702328, w: -0.49999997} + m_LocalPosition: {x: 0.5, y: -3.4, z: 0.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3337587390139541606} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6767210086105080178 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8462201784916155029} + m_Mesh: {fileID: 2026425019520300902, guid: e2b74575a515c794786457a323da7b69, type: 3} +--- !u!23 &3766991064380355318 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8462201784916155029} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a3ce1b39b1e52c94398a08157fda1dff, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &6540522042633253623 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8462201784916155029} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 4 + _addedNetworkObject: {fileID: 2689384198849609103} + _networkObjectCache: {fileID: 2689384198849609103} _synchronizeParent: 0 _packing: Position: 1 diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ModelGenerationBox.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ModelGenerationBox.cs index 2fb9ff1b..20358f79 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ModelGenerationBox.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ModelGenerationBox.cs @@ -48,7 +48,7 @@ public class ModelGenerationBox : MonoBehaviour string modelPath = await PipelineManager.Instance.GenerateModelAsync(inputPrompt); lastModelPath = modelPath; - GameObject spawnedObject = await PipelineManager.Instance.SpawnModel(modelPath); + GameObject spawnedObject = await PipelineManager.Instance.SpawnModel(modelPath, true); spawnedObject.transform.parent = modelSpawnPoint; spawnedObject.transform.position = modelSpawnPoint.position; diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/PipelineManager.cs b/Assets/_PROJECT/Scripts/ModeGeneration/PipelineManager.cs index e871e47b..30fa0fd3 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/PipelineManager.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/PipelineManager.cs @@ -75,7 +75,7 @@ public class PipelineManager : MonoBehaviour }); } - public async Task SpawnModel(string modelPath) + public async Task SpawnModel(string modelPath, bool addRigidBody) { var gltf = new GltfImport(); bool loadSuccess = await gltf.Load(modelPath); @@ -93,7 +93,10 @@ public class PipelineManager : MonoBehaviour MeshRenderer renderer = spawnedObjectBody.GetComponent(); renderer.material.SetFloat("metallicFactor", 0); - spawnedObjectMainTransform.gameObject.AddComponent(); + if (addRigidBody) + { + spawnedObjectMainTransform.gameObject.AddComponent(); + } return spawnedObject; }