Browse Source

[WarehouseAssets] Remove leftover material slot overrides (#932)

* Remove leftover material slot overrides
* Update gem.json

Signed-off-by: Aleksander Kamiński <[email protected]>
Signed-off-by: Jan Hanca <[email protected]>
Co-authored-by: Jan Hanca <[email protected]>
Aleksander Kamiński 1 week ago
parent
commit
e92fd73539

+ 25 - 16
Gems/ROS2SampleRobots/Assets/RosbotXL/ROSbotXL.prefab

@@ -602,16 +602,20 @@
                     "Id": 2016576711781101659,
                     "Controller": {
                         "Configuration": {
-                            "materials": {
-                                "{}": {
-                                    "MaterialAsset": {
-                                        "assetId": {
-                                            "guid": "{5B369E33-6E01-5794-9DB2-7CEFC2B205D5}"
-                                        },
-                                        "assetHint": "rosbotxl/models/materials/rosbotxl_antenna_plasticmatteblack.azmaterial"
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 3551515046
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{BC08A50C-9CCD-587F-B2B5-9DB0EF6907DF}"
+                                            }
+                                        }
                                     }
                                 }
-                            }
+                            ]
                         }
                     }
                 }
@@ -1452,16 +1456,21 @@
                     "Id": 17880601295840825835,
                     "Controller": {
                         "Configuration": {
-                            "materials": {
-                                "{}": {
-                                    "MaterialAsset": {
-                                        "assetId": {
-                                            "guid": "{5B369E33-6E01-5794-9DB2-7CEFC2B205D5}"
-                                        },
-                                        "assetHint": "rosbotxl/models/materials/rosbotxl_antenna_plasticmatteblack.azmaterial"
+                            "materials": [
+                                {
+                                    "Key": {
+                                        "materialSlotStableId": 2725144250
+                                    },
+                                    "Value": {
+                                        "MaterialAsset": {
+                                            "assetId": {
+                                                "guid": "{5B369E33-6E01-5794-9DB2-7CEFC2B205D5}"
+                                            },
+                                            "assetHint": "rosbotxl/models/materials/rosbotxl_antenna_plasticmatteblack.azmaterial"
+                                        }
                                     }
                                 }
-                            }
+                            ]
                         }
                     }
                 }

+ 2 - 2
Gems/ROS2SampleRobots/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "ROS2SampleRobots",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "display_name": "ROS2 Sample Robots",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -30,5 +30,5 @@
     ],
     "engine_api_dependencies": [],
     "restricted": "ROS2SampleRobots",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2samplerobots-1.0.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/ros2samplerobots-1.0.1-gem.zip"
 }

+ 0 - 13
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox1.prefab

@@ -98,19 +98,6 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
-                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 4100903441

+ 0 - 13
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox2.prefab

@@ -110,19 +110,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

+ 0 - 13
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox3.prefab

@@ -110,19 +110,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

+ 0 - 13
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Components/WarehouseBox4.prefab

@@ -122,19 +122,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 2919702015
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{5468360F-1789-50A3-96FF-118192B81B48}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehouseboxes.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

+ 0 - 13
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab

@@ -88,19 +88,6 @@
                                             "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
                                         }
                                     }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 3528137216
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{B59DB34C-8CCC-5B6A-8F32-749689632151}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
-                                        }
-                                    }
                                 }
                             ]
                         }

+ 0 - 26
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Walls.prefab

@@ -170,32 +170,6 @@
                     "Controller": {
                         "Configuration": {
                             "materials": [
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 103484566
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{9FF0270B-8936-528A-89EC-3E73A01AF755}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousemodules.azmaterial"
-                                        }
-                                    }
-                                },
-                                {
-                                    "Key": {
-                                        "materialSlotStableId": 745211904
-                                    },
-                                    "Value": {
-                                        "MaterialAsset": {
-                                            "assetId": {
-                                                "guid": "{06298918-E750-5053-B55B-10D158B1ED8C}"
-                                            },
-                                            "assetHint": "assets/warehouse/materials/mwarehousegate.azmaterial"
-                                        }
-                                    }
-                                },
                                 {
                                     "Key": {
                                         "materialSlotStableId": 3367833104

+ 2 - 2
Gems/WarehouseAssets/gem.json

@@ -1,6 +1,6 @@
 {
     "gem_name": "WarehouseAssets",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "display_name": "WarehouseAssets",
     "license": "Apache-2.0 or MIT",
     "license_url": "https://opensource.org/licenses/Apache-2.0",
@@ -28,5 +28,5 @@
     "engine_api_dependencies": [],
     "repo_uri": "https://raw.githubusercontent.com/o3de/o3de-extras/development",
     "restricted": "",
-    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseassets-2.0.0-gem.zip"
+    "download_source_uri": "https://github.com/o3de/o3de-extras/releases/download/2.0/warehouseassets-2.0.1-gem.zip"
 }