Sfoglia il codice sorgente

Revert "Added apple crates to kraken v1"

This reverts commit 67e012a40a3b8b07bbc6f9001c8793b48aaded23.
Adam Dabrowski 2 anni fa
parent
commit
8a808aa6f8

+ 0 - 87
Project/Assets/Kraken/apple_kraken_v1/apple_kraken_v1.prefab

@@ -4313,92 +4313,5 @@
                 }
             }
         }
-    },
-    "Instances": {
-        "Instance_[15809790840954]": {
-            "Source": "Prefabs/Apple_Crate_empty.prefab",
-            "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Parent Entity",
-                    "value": "../Entity_[126373983206044]"
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Translate/0",
-                    "value": 0.5687007904052734
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Translate/1",
-                    "value": 0.000003814697265625
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Translate/2",
-                    "value": 0.6364383697509766
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Rotate/2",
-                    "value": 90.00000762939453
-                }
-            ]
-        },
-        "Instance_[16591474888826]": {
-            "Source": "Prefabs/Apple_Crate_empty.prefab",
-            "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Parent Entity",
-                    "value": "../Entity_[126373983206044]"
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Translate/0",
-                    "value": 0.15843963623046875
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Translate/2",
-                    "value": 0.6364374160766602
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[14744176274437433019]/Transform Data/Rotate/2",
-                    "value": -90.0
-                }
-            ]
-        },
-        "Instance_[16621539659898]": {
-            "Source": "Prefabs/Apple_Crate.prefab",
-            "Patches": [
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[15224001494745498459]/Parent Entity",
-                    "value": "../Entity_[126373983206044]"
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[15224001494745498459]/Transform Data/Translate/0",
-                    "value": -0.2532958984375
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[15224001494745498459]/Transform Data/Translate/1",
-                    "value": 0.000003814697265625
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[15224001494745498459]/Transform Data/Translate/2",
-                    "value": 0.635009765625
-                },
-                {
-                    "op": "replace",
-                    "path": "/ContainerEntity/Components/Component_[15224001494745498459]/Transform Data/Rotate/2",
-                    "value": 90.00000762939453
-                }
-            ]
-        }
     }
 }

+ 1 - 1
Project/Prefabs/Apple_Crate.prefab

@@ -275,7 +275,7 @@
                         "Translate": [
                             0.0,
                             0.0,
-                            -0.07135677337646484
+                            -0.033247172832489014
                         ]
                     },
                     "IsStatic": true

+ 0 - 188
Project/Prefabs/Apple_Crate_empty.prefab

@@ -1,188 +0,0 @@
-{
-    "ContainerEntity": {
-        "Id": "ContainerEntity",
-        "Name": "Apple_Crate_empty",
-        "Components": {
-            "Component_[10500435141876749543]": {
-                "$type": "EditorPrefabComponent",
-                "Id": 10500435141876749543
-            },
-            "Component_[13219244507659109505]": {
-                "$type": "EditorEntitySortComponent",
-                "Id": 13219244507659109505,
-                "Child Entity Order": [
-                    "Entity_[4752236637435]"
-                ]
-            },
-            "Component_[14744176274437433019]": {
-                "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                "Id": 14744176274437433019,
-                "Parent Entity": ""
-            },
-            "Component_[15997853056622150220]": {
-                "$type": "EditorPendingCompositionComponent",
-                "Id": 15997853056622150220
-            },
-            "Component_[16260322733702707360]": {
-                "$type": "EditorDisabledCompositionComponent",
-                "Id": 16260322733702707360
-            },
-            "Component_[16370124873718181668]": {
-                "$type": "EditorLockComponent",
-                "Id": 16370124873718181668
-            },
-            "Component_[275298596182513649]": {
-                "$type": "EditorOnlyEntityComponent",
-                "Id": 275298596182513649
-            },
-            "Component_[3742981526396069698]": {
-                "$type": "EditorVisibilityComponent",
-                "Id": 3742981526396069698
-            },
-            "Component_[5052183535419524745]": {
-                "$type": "EditorInspectorComponent",
-                "Id": 5052183535419524745
-            },
-            "Component_[9499472053985704658]": {
-                "$type": "EditorEntityIconComponent",
-                "Id": 9499472053985704658
-            }
-        }
-    },
-    "Entities": {
-        "Entity_[4752236637435]": {
-            "Id": "Entity_[4752236637435]",
-            "Name": "Apple_Crate",
-            "Components": {
-                "Component_[11032823860518593082]": {
-                    "$type": "EditorOnlyEntityComponent",
-                    "Id": 11032823860518593082
-                },
-                "Component_[14063829758759983448]": {
-                    "$type": "{27F1E1A1-8D9D-4C3B-BD3A-AFB9762449C0} TransformComponent",
-                    "Id": 14063829758759983448,
-                    "Parent Entity": "ContainerEntity",
-                    "IsStatic": true
-                },
-                "Component_[16325347661556016829]": {
-                    "$type": "EditorDisabledCompositionComponent",
-                    "Id": 16325347661556016829
-                },
-                "Component_[16860679445705058947]": {
-                    "$type": "EditorVisibilityComponent",
-                    "Id": 16860679445705058947
-                },
-                "Component_[1699735674964201617]": {
-                    "$type": "EditorEntitySortComponent",
-                    "Id": 1699735674964201617
-                },
-                "Component_[17515991116920437105]": {
-                    "$type": "EditorEntityIconComponent",
-                    "Id": 17515991116920437105
-                },
-                "Component_[6131507114438886105]": {
-                    "$type": "EditorColliderComponent",
-                    "Id": 6131507114438886105,
-                    "ColliderConfiguration": {
-                        "MaterialSlots": {
-                            "Slots": [
-                                {
-                                    "Name": "DefaultMaterial"
-                                }
-                            ]
-                        }
-                    },
-                    "ShapeConfiguration": {
-                        "PhysicsAsset": {
-                            "Asset": {
-                                "assetId": {
-                                    "guid": "{4B118B91-95F2-51D3-89FF-B3295ACF5544}",
-                                    "subId": 1435810015
-                                },
-                                "assetHint": "assets/apple_crate/apple_crate.pxmesh"
-                            },
-                            "Configuration": {
-                                "PhysicsAsset": {
-                                    "assetId": {
-                                        "guid": "{4B118B91-95F2-51D3-89FF-B3295ACF5544}",
-                                        "subId": 1435810015
-                                    },
-                                    "loadBehavior": "QueueLoad",
-                                    "assetHint": "assets/apple_crate/apple_crate.pxmesh"
-                                }
-                            }
-                        }
-                    }
-                },
-                "Component_[6965830782696864825]": {
-                    "$type": "EditorLockComponent",
-                    "Id": 6965830782696864825
-                },
-                "Component_[8205517628188817334]": {
-                    "$type": "EditorMaterialComponent",
-                    "Id": 8205517628188817334,
-                    "Controller": {
-                        "Configuration": {
-                            "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 1574106304
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{2547663B-752C-5C7A-BF44-7288D95A7B21}"
-                                            },
-                                            "assetHint": "assets/apple_crate/apple_crate_cratemat.azmaterial"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                },
-                "Component_[8819040866776028521]": {
-                    "$type": "AZ::Render::EditorMeshComponent",
-                    "Id": 8819040866776028521,
-                    "Controller": {
-                        "Configuration": {
-                            "ModelAsset": {
-                                "assetId": {
-                                    "guid": "{4B118B91-95F2-51D3-89FF-B3295ACF5544}",
-                                    "subId": 270483317
-                                },
-                                "assetHint": "assets/apple_crate/apple_crate.azmodel"
-                            },
-                            "IsRayTracingEnabled": false
-                        }
-                    }
-                },
-                "Component_[9008534885754287450]": {
-                    "$type": "EditorInspectorComponent",
-                    "Id": 9008534885754287450,
-                    "ComponentOrderEntryArray": [
-                        {
-                            "ComponentId": 14063829758759983448
-                        },
-                        {
-                            "ComponentId": 8819040866776028521,
-                            "SortIndex": 1
-                        },
-                        {
-                            "ComponentId": 8205517628188817334,
-                            "SortIndex": 2
-                        },
-                        {
-                            "ComponentId": 6131507114438886105,
-                            "SortIndex": 3
-                        }
-                    ]
-                },
-                "Component_[9070077239474304225]": {
-                    "$type": "EditorPendingCompositionComponent",
-                    "Id": 9070077239474304225
-                }
-            }
-        }
-    }
-}