Hotfix: exported fbx for kickout_hole

2025-01-22 07:08:51 -05:00 · 2024-04-16 15:49:32 -04:00 · 2024-04-16 15:49:32 -04:00 · 1db33f4af1
commit 1db33f4af1
parent 434f0dd5fc
7 changed files with 255 additions and 126 deletions
--- a/Assets/Models/Kickout_hole/kickout_hole.fbx
+++ b/Assets/Models/Kickout_hole/kickout_hole.fbx
--- a/Assets/Models/Kickout_hole/kickout_hole.fbx.meta
+++ b/Assets/Models/Kickout_hole/kickout_hole.fbx.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 6b24a6542985c4f43b20c439fbb0b7ac
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 100
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 0
+    importBlendShapes: 0
+    importCameras: 0
+    importLights: 0
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 0
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 0
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/Kickout_hole/kickout_hole.prefab
+++ b/Assets/Models/Kickout_hole/kickout_hole.prefab
@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!1001 &6917295946865632963
+--- !u!1001 &1959017946972741074
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@ -8,101 +8,83 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0
+      value: -0.75
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.7071068
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: f6f39945fe91b48d2a9182765972f232,
+    - target: {fileID: -8679921383154817045, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 6b24a6542985c4f43b20c439fbb0b7ac,
        type: 3}
      propertyPath: m_Name
      value: kickout_hole
      objectReference: {fileID: 0}
-    - target: {fileID: 5172715805845752147, guid: f6f39945fe91b48d2a9182765972f232,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 81e0575eb4e054fcca9dae8f31677450, type: 2}
    m_RemovedComponents: []
-    m_RemovedGameObjects:
-    - {fileID: 283394856936899292, guid: f6f39945fe91b48d2a9182765972f232, type: 3}
+    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: -7669501749573117343, guid: f6f39945fe91b48d2a9182765972f232,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 3978469811640096739}
-  m_SourcePrefab: {fileID: 100100000, guid: f6f39945fe91b48d2a9182765972f232, type: 3}
--- !u!1 &5363603299441966242 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: -7669501749573117343, guid: f6f39945fe91b48d2a9182765972f232,
-    type: 3}
-  m_PrefabInstance: {fileID: 6917295946865632963}
-  m_PrefabAsset: {fileID: 0}
--- !u!64 &3978469811640096739
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5363603299441966242}
-  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: 5
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 1875637569288839456, guid: f6f39945fe91b48d2a9182765972f232, type: 3}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6b24a6542985c4f43b20c439fbb0b7ac, type: 3}
--- a/Assets/Prefabs/Hole/Hole.prefab
+++ b/Assets/Prefabs/Hole/Hole.prefab
@ -1,5 +1,36 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1455082168975920177
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7492627932365574004}
+  m_Layer: 0
+  m_Name: GoalTrigger
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7492627932365574004
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1455082168975920177}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8649987843805268783}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6121683813469744371
 GameObject:
  m_ObjectHideFlags: 0
@ -30,8 +61,9 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 84093497478952920}
-  - {fileID: 7868759862830558622}
+  - {fileID: 7564410484071446836}
  - {fileID: 6595505223521729305}
+  - {fileID: 7492627932365574004}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6783148664893773472
@ -44,7 +76,7 @@ GameObject:
  m_Component:
  - component: {fileID: 6595505223521729305}
  - component: {fileID: 6980139100923930458}
-  - component: {fileID: 2781607421383488419}
+  - component: {fileID: 8299546483346534859}
  m_Layer: 7
  m_Name: Trigger
  m_TagString: Untagged
@ -90,7 +122,7 @@ CapsuleCollider:
  m_Height: 3
  m_Direction: 1
  m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &2781607421383488419
+--- !u!114 &8299546483346534859
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -797,7 +829,7 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7537082131774610123}
  m_Mesh: {fileID: 0}
--- !u!1001 &3839008728624688310
+--- !u!1001 &8385493930287825677
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
@ -805,84 +837,81 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 8649987843805268783}
    m_Modifications:
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
+    - target: {fileID: 931754535986020694, guid: cb3c691652b7146dcaccc4e8a98551ca,
        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 342461334014583538, guid: cb3c691652b7146dcaccc4e8a98551ca,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1120123520660977736, guid: cb3c691652b7146dcaccc4e8a98551ca,
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 81e0575eb4e054fcca9dae8f31677450, type: 2}
+    - target: {fileID: 1724524203864088707, guid: cb3c691652b7146dcaccc4e8a98551ca,
        type: 3}
      propertyPath: m_Name
      value: kickout_hole
      objectReference: {fileID: 0}
-    - target: {fileID: 1120123520660977736, guid: cb3c691652b7146dcaccc4e8a98551ca,
+    - target: {fileID: 2064175906742712889, guid: cb3c691652b7146dcaccc4e8a98551ca,
        type: 3}
-      propertyPath: m_Layer
-      value: 7
+      propertyPath: m_LocalPosition.x
+      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 1646742355395911544, guid: cb3c691652b7146dcaccc4e8a98551ca,
+    - target: {fileID: 2064175906742712889, guid: cb3c691652b7146dcaccc4e8a98551ca,
        type: 3}
-      propertyPath: m_Layer
-      value: 7
+      propertyPath: m_LocalPosition.z
+      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4936857954541341770, guid: cb3c691652b7146dcaccc4e8a98551ca,
+    - target: {fileID: 2064175906742712889, guid: cb3c691652b7146dcaccc4e8a98551ca,
        type: 3}
-      propertyPath: m_CastShadows
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 2064175906742712889, guid: cb3c691652b7146dcaccc4e8a98551ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2064175906742712889, guid: cb3c691652b7146dcaccc4e8a98551ca,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 1724524203864088707, guid: cb3c691652b7146dcaccc4e8a98551ca,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 377964915585004073}
  m_SourcePrefab: {fileID: 100100000, guid: cb3c691652b7146dcaccc4e8a98551ca, type: 3}
--- !u!4 &7868759862830558622 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6374165219661414696, guid: cb3c691652b7146dcaccc4e8a98551ca,
+--- !u!1 &7183804275160638350 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1724524203864088707, guid: cb3c691652b7146dcaccc4e8a98551ca,
    type: 3}
-  m_PrefabInstance: {fileID: 3839008728624688310}
+  m_PrefabInstance: {fileID: 8385493930287825677}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &377964915585004073
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7183804275160638350}
+  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: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 1875637569288839456, guid: 6b24a6542985c4f43b20c439fbb0b7ac, type: 3}
+--- !u!4 &7564410484071446836 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2064175906742712889, guid: cb3c691652b7146dcaccc4e8a98551ca,
+    type: 3}
+  m_PrefabInstance: {fileID: 8385493930287825677}
  m_PrefabAsset: {fileID: 0}
--- a/Assets/Scripts/DeactivateColliderOnTrigger.cs
+++ b/Assets/Scripts/DeactivateColliderOnTrigger.cs
@ -1,11 +1,9 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;

 namespace MAVRIC.GEEKCup
 {
-    public class DeactivateColliderOnTrigger : MonoBehaviour
+    public class OnColliderTrigger : MonoBehaviour
    {
        // TODO: Update this to use a UnityAtoms BoolReference
        [SerializeField] private UnityEvent<bool> onTrigger;
--- a/Assets/Scripts/DeactivateColliderOnTrigger.cs.meta
+++ b/Assets/Scripts/DeactivateColliderOnTrigger.cs.meta
--- a/Assets/Textures.meta
+++ b/Assets/Textures.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2086f6c9183b4c789c1f5de99bc735e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: