From b65b45c062b592d9039895985b936bcd0aa62afe Mon Sep 17 00:00:00 2001 From: CortexCore <2630229280@qq.com> Date: Thu, 14 Nov 2024 17:17:46 +0800 Subject: [PATCH] 1 --- .../New Universal Render Pipeline Asset.asset | 2 +- ...ersal Render Pipeline Asset_Renderer.asset | 4 +- Assets/Artists/Scenes/map_new_menu.unity | 365 --------------- Assets/Artists/Scripts/Program.cs | 4 + .../Scripts/Weather/ScriptableWeather.cs | 17 - .../Materials/M_billboard_phone.mat | 2 +- .../Materials/M_billboard_videogame_02.mat | 4 +- .../Arts/Anime Tokyo/Materials/M_dark 2.mat | 2 +- .../Anime Tokyo/Materials/M_guardrails.mat | 2 +- .../Materials/M_pavingstone_01 1.mat | 6 +- .../Anime Tokyo/Materials/M_wall_stone 2.mat | 4 +- .../Textures/Bricks071_1K_NormalDX.png | Bin .../{Materials => }/Textures/CHV.png | Bin .../Textures/M_LED_TV_BaseMap.png | Bin .../Textures/M_LED_TV_MaskMap.png | Bin .../Textures/M_LED_TV_Normal.png | Bin .../Textures/M_LED_emmision.png | Bin .../Textures/M_adboard_base_normal.png | Bin .../Textures/M_aircon_BaseMap.png | Bin .../Textures/M_aircon_MaskMap.png | Bin .../Textures/M_aircon_Normal.png | Bin .../Textures/M_asphalt_01_Normal.png | Bin .../Textures/M_asphalt_02_diff.png | Bin .../Textures/M_attachments_light_BaseMap.png | Bin .../Textures/M_attachments_light_Emissive.png | Bin .../Textures/M_attachments_light_MaskMap.png | Bin .../Textures/M_attachments_light_Normal.png | Bin .../M_attachments_residental_BaseMap.png | Bin .../M_attachments_residental_MaskMap.png | Bin .../M_attachments_residental_Normal.png | Bin .../Textures/M_bark_01_BaseColor.png | Bin .../Textures/M_bark_01_Normal.png | Bin .../Textures/M_basetexture_stylized_02.png | Bin .../Textures/M_beams_Normal.png | Bin .../Textures/M_beams_black_BaseMap.png | Bin .../Textures/M_beams_black_MaskMap.png | Bin .../Textures/M_beams_brown_BaseMap.png | Bin .../Textures/M_beams_metal_BaseMap.png | Bin .../Textures/M_beams_metal_MaskMap.png | Bin .../Textures/M_beams_red_BaseMap.png | Bin .../Textures/M_beams_red_MaskMap.png | Bin .../Textures/M_beams_white_BaseMap.png | Bin .../Textures/M_beams_white_MaskMap.png | Bin .../Textures/M_beams_wood_BaseMap.png | Bin .../Textures/M_beams_wood_Normal.png | Bin .../Textures/M_beamsbrown_MaskMap.png | Bin .../Textures/M_billboard_bookstore.png | Bin .../Textures/M_billgoard_videogame_01.png | Bin .../Textures/M_billgoard_videogame_02.png | Bin .../Textures/M_blindguidance_BaseMap.png | Bin .../Textures/M_blindguidance_MaskMap.png | Bin .../Textures/M_blindguidance_Normal.png | Bin .../Textures/M_border_walls_BaseMap.png | Bin .../Textures/M_border_walls_Normal.png | Bin .../Textures/M_bottles_BaseMap.png | Bin .../Textures/M_bottles_MaskMap.png | Bin .../Textures/M_bottles_Normal.png | Bin .../Textures/M_bricks_wall_03_BaseColor.png | Bin .../Textures/M_bricks_wall_03_roughness.png | Bin .../Textures/M_bricks_wall_red_Normal.png | Bin .../M_car_sport_attachments_BaseMap.png | Bin .../M_car_sport_attachments_MaskMap.png | Bin .../M_car_sport_attachments_Normal.png | Bin .../Textures/M_car_sport_base_BaseMap.png | Bin .../Textures/M_car_sport_base_MaskMap.png | Bin .../Textures/M_car_sport_base_Normal 1.png | Bin .../Textures/M_car_sport_base_Normal.png | Bin .../Textures/M_car_sport_base_varBaseMap.png | Bin .../M_car_sport_base_varMaskMap 1.png | Bin .../Textures/M_car_sport_base_varMaskMap.png | Bin .../Textures/M_coil_BaseMap.png | Bin .../Textures/M_coil_MaskMap.png | Bin .../Textures/M_coil_Normal.png | Bin .../M_cosmeticstore_wordsign_BaseMap.png | Bin .../Textures/M_curbstones_BaseMap.png | Bin .../Textures/M_curbstones_MaskMap.png | Bin .../Textures/M_curbstones_Normal.png | Bin .../{Materials => }/Textures/M_decal_01.png | Bin .../{Materials => }/Textures/M_decal_30.png | Bin .../Textures/M_decal_arrow_right.png | Bin .../Textures/M_decal_arrow_straight.png | Bin .../Textures/M_decal_noparking.png | Bin .../Textures/M_decal_parking.png | Bin .../Textures/M_decal_slowdown.png | Bin .../Textures/M_decal_stripes.png | Bin .../Textures/M_doors_residental_02BaseMap.png | Bin .../Textures/M_doors_residental_02MaskMap.png | Bin .../Textures/M_doors_residental_BaseMap.png | Bin .../Textures/M_doors_residental_MaskMap.png | Bin .../Textures/M_doors_residental_Normal.png | Bin .../Textures/M_emergencysigns_BaseMap.png | Bin .../Textures/M_emergencysigns_Emissive.png | Bin .../Textures/M_emergencysigns_MaskMap.png | Bin .../Textures/M_emergencysigns_Normal.png | Bin .../Textures/M_fence_Normal.png | Bin .../Textures/M_fence_basecolor.png | Bin .../Textures/M_fences_01_BaseMap.png | Bin .../Textures/M_fences_01_MaskMap.png | Bin .../Textures/M_fences_01_Normal.png | Bin .../Textures/M_fences_suburbs_BaseMap.png | Bin .../Textures/M_fences_suburbs_MaskMap.png | Bin .../Textures/M_fences_suburbs_Normal.png | Bin .../{Materials => }/Textures/M_floortiles.png | Bin .../Textures/M_floortiles_nrm.png | Bin .../{Materials => }/Textures/M_flower_01.png | Bin .../{Materials => }/Textures/M_flower_02.png | Bin .../Textures/M_flowerpots_BaseMap.png | Bin .../Textures/M_flowerpots_MaskMap.png | Bin .../Textures/M_flowerpots_Normal.png | Bin .../Textures/M_fuseboxes_01_BaseMap.png | Bin .../Textures/M_fuseboxes_01_MaskMap.png | Bin .../Textures/M_fuseboxes_01_Normal.png | Bin .../Textures/M_garagedoor_BaseMap.png | Bin .../Textures/M_garagedoor_MaskMap.png | Bin .../Textures/M_garagedoor_Normal.png | Bin .../Textures/M_gate_citycenter_BaseMap.png | Bin .../Textures/M_gate_citycenter_Emissive.png | Bin .../Textures/M_gate_citycenter_MaskMap.png | Bin .../Textures/M_gate_citycenter_Normal.png | Bin .../Textures/M_grungemap_01.png | Bin .../Textures/M_guardrails_BaseMap.png | Bin .../Textures/M_guardrails_MaskMap.png | Bin .../Textures/M_guardrails_Normal.png | Bin .../Textures/M_konbinientrance_2_BaseMap.png | Bin .../Textures/M_konbinientrance_BaseMap.png | Bin .../Textures/M_konbinientrance_MaskMap.png | Bin .../Textures/M_konbinientrance_Normal.png | Bin .../Textures/M_lamppole_BaseMap.png | Bin .../Textures/M_lamppole_MaskMap.png | Bin .../Textures/M_lamppole_Normal.png | Bin .../Textures/M_lanterns_extra_BaseMap.png | Bin .../Textures/M_lanterns_extra_MaskMap.png | Bin .../Textures/M_lanterns_extra_Normal.png | Bin .../{Materials => }/Textures/M_leaf_01.png | Bin .../Textures/M_leaves_tree.png | Bin .../Textures/M_licenseplate_BaseMap.png | Bin .../Textures/M_licenseplate_MaskMap.png | Bin .../Textures/M_licenseplate_Normal.png | Bin .../Textures/M_lights_billboard_BaseMap.png | Bin .../Textures/M_lights_billboard_Emissive.png | Bin .../Textures/M_lights_billboard_MaskMap.png | Bin .../Textures/M_lights_billboard_Normal.png | Bin .../{Materials => }/Textures/M_line_decal.png | Bin .../Textures/M_line_decal_02.png | Bin .../Textures/M_lines_vertical_Diff.png | Bin .../Textures/M_lines_vertical_Normal.png | Bin .../Textures/M_metroentrance_sign_BaseMap.png | Bin .../M_metroentrance_sign_Emissive.png | Bin .../Textures/M_metroentrance_sign_MaskMap.png | Bin .../Textures/M_neonsigns_BaseMap.png | Bin .../Textures/M_neonsigns_Emissive.png | Bin .../Textures/M_neonsigns_Normal.png | Bin .../M_parasols_storefront_BaseMap.png | Bin .../M_parasols_storefront_MaskMap.png | Bin .../Textures/M_parasols_storefront_Normal.png | Bin .../Textures/M_pavingstones_01_Basecolor.png | Bin .../Textures/M_pavingstones_01_Normal.png.png | Bin .../Textures/M_pavingstones_02_Normal.png | Bin .../Textures/M_pavingstones_03_BaseColor.png | Bin .../Textures/M_pavingstones_03_Normal.png | Bin .../Textures/M_pavingstones_03_color.png | Bin .../Textures/M_pedestriancrossing.png | Bin .../Textures/M_pedestriancrossing2.png | Bin .../Textures/M_pedestriancrossing3.png | Bin .../Textures/M_pedestriancrossing4.png | Bin .../Textures/M_pillar_edges_metro_BaseMap.png | Bin .../Textures/M_pillar_edges_metro_MaskMap.png | Bin .../Textures/M_pillar_edges_metro_Normal.png | Bin .../Textures/M_pillar_metal_metro_BaseMap.png | Bin .../Textures/M_pillar_metal_metro_MaskMap.png | Bin .../Textures/M_pillar_metal_metro_Normal.png | Bin .../Textures/M_pipes_01_BaseMap.png | Bin .../Textures/M_pipes_01_MaskMap.png | Bin .../Textures/M_pipes_01_Normal.png | Bin .../Textures/M_plaster_01_BaseColor.png | Bin .../Textures/M_plaster_01_Normal.png | Bin .../Textures/M_plastic_Normal.png | Bin .../Textures/M_plastic_roughness.png | Bin .../Textures/M_posters_wall2_BaseMap.png | Bin .../Textures/M_posters_wall_03_BaseMap.png | Bin .../Textures/M_posters_wall_BaseMap.png | Bin .../Textures/M_posters_wall_MaskMap.png | Bin .../Textures/M_posters_wall_Normal.png | Bin .../Textures/M_powerpole_extras_BaseMap.png | Bin .../Textures/M_powerpole_extras_MaskMap.png | Bin .../Textures/M_powerpole_extras_Normal.png | Bin .../Textures/M_props_street_01_BaseMap.png | Bin .../Textures/M_props_street_01_MaskMap.png | Bin .../Textures/M_props_street_01_Normal.png | Bin .../Textures/M_recyclingbin_BaseMap.png | Bin .../Textures/M_recyclingbin_MaskMap.png | Bin .../Textures/M_recyclingbin_Normal.png | Bin .../Textures/M_road_decal_BaseColor.png | Bin .../Textures/M_road_decal_Normal.png | Bin .../Textures/M_rooftiles_01_BaseColor.png | Bin .../Textures/M_rooftiles_01_Normal.png | Bin .../Textures/M_roundmirror_02BaseMap.png | Bin .../Textures/M_roundmirror_BaseMap.png | Bin .../Textures/M_roundmirror_MaskMap.png | Bin .../Textures/M_roundmirror_Normal.png | Bin .../Textures/M_sign_firehydrant_BaseMap.png | Bin .../Textures/M_sign_firehydrant_MaskMap.png | Bin .../Textures/M_sign_firehydrant_Normal.png | Bin .../Textures/M_sign_satsupirisu_BaseMap.png | Bin .../Textures/M_signboard_borders_BaseMap.png | Bin .../Textures/M_signboard_borders_MaskMap.png | Bin .../Textures/M_signboard_borders_Normal.png | Bin .../M_signboard_storefront2_BaseMap.png | Bin .../M_signboard_storefront_BaseMap.png | Bin .../M_signboard_storefront_MaskMap.png | Bin .../M_signboard_storefront_Normal.png | Bin .../M_signboards_tokyo_02_BaseMap.png | Bin .../M_signboards_tokyo_02_BaseMap_var.png | Bin .../M_signboards_tokyo_03_BaseMap.png | Bin .../M_signboards_tokyo_04_BaseMap.png | Bin .../M_signboards_tokyo_05_BaseMap.png | Bin .../Textures/M_signboards_tokyo_BaseMap.png | Bin .../Textures/M_signboards_tokyo_MaskMap.png | Bin .../M_signboards_tokyo_horiyontal2BaseMap.png | Bin .../M_signboards_tokyo_horizontalBaseMap.png | Bin .../Textures/M_signs_highway_BaseMap.png | Bin .../Textures/M_signs_highway_MaskMap.png | Bin .../Textures/M_signs_metro_BaseMap.png | Bin .../Textures/M_signs_metro_MaskMap.png | Bin .../Textures/M_signs_suburbs_BaseMap.png | Bin .../Textures/M_signs_suburbs_MaskMap.png | Bin .../Textures/M_signs_suburbs_Normal.png | Bin .../Textures/M_skybox_clouds.png | Bin .../Textures/M_skybox_cloudy.png | Bin .../Textures/M_skybox_sunset.png | Bin .../M_storeboards_traditional_BaseMap.png | Bin .../M_storeboards_traditional_MaskMap.png | Bin .../M_storeboards_traditional_Normal.png | Bin .../Textures/M_storefront_tofu_BaseMap.png | Bin .../Textures/M_storefront_tofu_MaskMap.png | Bin .../Textures/M_storefront_tofu_Normal.png | Bin .../M_storefront_traditional_BaseMap.png | Bin .../M_storefront_traditional_MaskMap.png | Bin .../M_storefront_traditional_Normal.png | Bin .../M_storefronts_japan_02_BaseMap.png | Bin .../M_storefronts_japan_02_MaskMap.png | Bin .../Textures/M_storefronts_japan_BaseMap.png | Bin .../Textures/M_storefronts_japan_MaskMap.png | Bin .../Textures/M_storefronts_japan_Normal.png | Bin .../Textures/M_streetlamp_BaseMap.png | Bin .../Textures/M_streetlamp_MaskMap.png | Bin .../Textures/M_streetlamp_Normal.png | Bin .../Textures/M_ticketgate_japan_BaseMap.png | Bin .../Textures/M_ticketgate_japan_Emissive.png | Bin .../Textures/M_ticketgate_japan_MaskMap.png | Bin .../Textures/M_ticketgate_japan_Normal.png | Bin .../Textures/M_tiles_large_Base.png | Bin .../Textures/M_tiles_large_nrm.png | Bin .../Textures/M_tomare_decal 1.png | Bin .../Textures/M_tomare_decal.png | Bin .../Textures/M_toorigate_BaseMap.png | Bin .../Textures/M_toorigate_MaskMap.png | Bin .../Textures/M_toorigate_Normal.png | Bin .../Textures/M_toorigate_stoneBaseMap.png | Bin .../Textures/M_toorigate_stoneMaskMap.png | Bin .../Textures/M_toorigate_stoneNormal.png | Bin .../Textures/M_toorigate_woodBaseMap.png | Bin .../Textures/M_toorigate_woodMaskMap.png | Bin .../Textures/M_toorigate_woodNormal.png | Bin .../Textures/M_trafficlights2_BaseMap.png | Bin .../Textures/M_trafficlights2_Emissive.png | Bin .../Textures/M_trafficlights2_MaskMap.png | Bin .../Textures/M_trafficlights_BaseMap.png | Bin .../Textures/M_trafficlights_Emissive.png | Bin .../Textures/M_trafficlights_MaskMap.png | Bin .../Textures/M_trafficlights_Normal.png | Bin .../Textures/M_trafficpylons_BaseMap.png | Bin .../Textures/M_trafficpylons_MaskMap.png | Bin .../Textures/M_trafficpylons_Normal.png | Bin .../Textures/M_trafficsigns_BaseMap.png | Bin .../Textures/M_trafficsigns_MaskMap.png | Bin .../Textures/M_trafficsigns_Normal.png | Bin .../Textures/M_vendingmachine_02_BaseMap.png | Bin .../Textures/M_vendingmachine_03_BaseMap.png | Bin .../Textures/M_vendingmachine_BaseMap.png | Bin .../Textures/M_vendingmachine_Emissive.png | Bin .../Textures/M_vendingmachine_MaskMap.png | Bin .../Textures/M_vendingmachine_Normal.png | Bin .../Textures/M_vent_BaseMap.png | Bin .../Textures/M_vent_MaskMap.png | Bin .../Textures/M_vent_Normal.png | Bin .../Textures/M_wall_linepattern2_diff.png | Bin .../Textures/M_wall_linepattern_02.png | Bin .../Textures/M_wall_linepattern_02_Normal.png | Bin .../Textures/M_wall_linepattern_nrm.png | Bin .../Textures/M_wall_plaster_BaseColor.png | Bin .../Textures/M_wall_plaster_Normal.png | Bin .../Textures/M_wallblocks_BaseMap.png | Bin .../Textures/M_wallblocks_MaskMap.png | Bin .../Textures/M_wallblocks_Normal.png | Bin .../Textures/M_walls_01_suburbsNormal.png | Bin .../Textures/M_walls_01_suburbs_BaseMap.png | Bin .../Textures/M_walls_suburbs_02_BaseMap.png | Bin .../Textures/M_walls_suburbs_02_Normal.png | Bin .../Textures/M_walls_suburbs_03Normal.png | Bin .../Textures/M_walls_suburbs_03_BaseMap.png | Bin .../Textures/M_warningsigns_BaseMap.png | Bin .../Textures/M_warningsigns_MaskMap.png | Bin .../Textures/M_warningsigns_Normal.png | Bin .../Textures/M_wheel_car_BaseMap.png | Bin .../Textures/M_wheel_car_MaskMap.png | Bin .../Textures/M_wheel_car_Normal.png | Bin .../M_windows_residential_BaseMap.png | Bin .../M_windows_residential_MaskMap.png | Bin .../Textures/M_windows_residential_Normal.png | Bin .../M_windows_residential_white_BaseMap.png | Bin .../M_windows_residential_white_MaskMap.png | Bin .../M_windows_residential_wood_BaseMap.png | Bin .../M_windows_residential_wood_MaskMap.png | Bin .../Textures/M_wordsigns_01_BaseMap.png | Bin .../Textures/M_wordsigns_01_MaskMap.png | Bin .../Textures/M_wordsigns_02_BaseMap.png | Bin .../Textures/M_wordsigns_02_Emissive.png | Bin .../Textures/M_wordsigns_02_MaskMap.png | Bin .../Textures/M_wordsigns_03_BaseMap.png | Bin .../Textures/M_wordsigns_03_MaskMap.png | Bin .../Textures/M_wordsigns_04_BaseMap.png | Bin .../Textures/M_wordsigns_04_MaskMap.png | Bin .../Textures/billboard_airline.png | Bin .../Textures/billboard_arcadecenter.png | Bin .../Textures/billboard_baristacoffee.png | Bin .../Textures/billboard_beer_01.png | Bin .../Textures/billboard_beer_02.png | Bin .../Textures/billboard_cosmetics_01.png | Bin .../Textures/billboard_girl.png | Bin .../Textures/billboard_girl_03.png | Bin .../Textures/billboard_girl_04.png | Bin .../Textures/billboard_hostclub_01.png | Bin .../Textures/billboard_inforcenter.png | Bin .../Textures/billboard_izakaya.png | Bin .../Textures/billboard_izakaya_02.png | Bin .../Textures/billboard_kimane.png | Bin .../Textures/billboard_kotososervices.png | Bin .../Textures/billboard_man_01.png | Bin .../Textures/billboard_monja.png | Bin .../Textures/billboard_phone.png | Bin .../Textures/billboard_realestate_01.png | Bin .../Textures/billboard_realestate_02.png | Bin .../Textures/billboard_sushi.png | Bin .../Textures/billboard_videogamecenter.png | Bin .../Textures/billboard_videogamecenter02.png | Bin .../Textures/billboard_water.png | Bin .../Textures/billboard_wifi.png | Bin .../Textures/echowavekaraoke.png | Bin .../Textures/echowavekaraoke2.png | Bin Assets/AssetBundleCollectorSetting.asset | 22 +- .../Core/StateMachine/AsyncStateMachine.cs | 1 - .../Scripts/Assets/YooAssetMaterialFix.cs | 49 ++ Assets/MyShaderVariants.json | 434 ++++++++++++++++++ Assets/MyShaderVariants.shadervariants | 148 ++++++ .../Scripts/Editor/CustomPackRule.cs | 50 ++ .../PackageComparatorWindow.cs | 138 ++++++ .../PackageImporter/PackageImporterWindow.cs | 91 ++++ .../ShaderVariantCollectionHelper.cs | 38 ++ .../ShaderVariantCollectionManifest.cs | 146 ++++++ .../ShaderVariantCollector.cs | 256 +++++++++++ .../ShaderVariantCollectorSetting.cs | 29 ++ .../ShaderVariantCollectorWindow.cs | 150 ++++++ .../ShaderVariantCollectorWindow.uxml | 11 + .../Runtime/AssetOperationHandleExtension.cs | 16 + .../Runtime/GameObjectAssetReference.cs | 73 +++ .../Runtime/LoadAssetsByTagOperation.cs | 117 +++++ ProjectSettings/ProjectSettings.asset | 4 +- 368 files changed, 1785 insertions(+), 400 deletions(-) delete mode 100644 Assets/Artists/Scenes/map_new_menu.unity rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/Bricks071_1K_NormalDX.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/CHV.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_LED_TV_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_LED_TV_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_LED_TV_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_LED_emmision.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_adboard_base_normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_aircon_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_aircon_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_aircon_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_asphalt_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_asphalt_02_diff.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_light_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_light_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_light_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_light_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_residental_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_residental_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_attachments_residental_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bark_01_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bark_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_basetexture_stylized_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_black_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_black_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_brown_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_metal_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_metal_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_red_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_red_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_white_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_white_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_wood_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beams_wood_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_beamsbrown_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_billboard_bookstore.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_billgoard_videogame_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_billgoard_videogame_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_blindguidance_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_blindguidance_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_blindguidance_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_border_walls_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_border_walls_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bottles_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bottles_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bottles_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bricks_wall_03_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bricks_wall_03_roughness.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_bricks_wall_red_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_attachments_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_attachments_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_attachments_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_Normal 1.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_varBaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_varMaskMap 1.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_car_sport_base_varMaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_coil_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_coil_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_coil_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_cosmeticstore_wordsign_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_curbstones_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_curbstones_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_curbstones_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_30.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_arrow_right.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_arrow_straight.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_noparking.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_parking.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_slowdown.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_decal_stripes.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_doors_residental_02BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_doors_residental_02MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_doors_residental_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_doors_residental_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_doors_residental_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_emergencysigns_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_emergencysigns_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_emergencysigns_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_emergencysigns_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fence_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fence_basecolor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fences_01_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fences_01_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fences_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fences_suburbs_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fences_suburbs_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fences_suburbs_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_floortiles.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_floortiles_nrm.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_flower_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_flower_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_flowerpots_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_flowerpots_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_flowerpots_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fuseboxes_01_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fuseboxes_01_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_fuseboxes_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_garagedoor_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_garagedoor_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_garagedoor_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_gate_citycenter_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_gate_citycenter_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_gate_citycenter_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_gate_citycenter_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_grungemap_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_guardrails_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_guardrails_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_guardrails_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_konbinientrance_2_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_konbinientrance_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_konbinientrance_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_konbinientrance_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lamppole_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lamppole_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lamppole_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lanterns_extra_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lanterns_extra_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lanterns_extra_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_leaf_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_leaves_tree.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_licenseplate_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_licenseplate_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_licenseplate_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lights_billboard_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lights_billboard_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lights_billboard_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lights_billboard_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_line_decal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_line_decal_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lines_vertical_Diff.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_lines_vertical_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_metroentrance_sign_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_metroentrance_sign_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_metroentrance_sign_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_neonsigns_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_neonsigns_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_neonsigns_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_parasols_storefront_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_parasols_storefront_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_parasols_storefront_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pavingstones_01_Basecolor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pavingstones_01_Normal.png.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pavingstones_02_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pavingstones_03_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pavingstones_03_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pavingstones_03_color.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pedestriancrossing.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pedestriancrossing2.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pedestriancrossing3.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pedestriancrossing4.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pillar_edges_metro_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pillar_edges_metro_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pillar_edges_metro_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pillar_metal_metro_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pillar_metal_metro_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pillar_metal_metro_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pipes_01_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pipes_01_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_pipes_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_plaster_01_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_plaster_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_plastic_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_plastic_roughness.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_posters_wall2_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_posters_wall_03_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_posters_wall_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_posters_wall_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_posters_wall_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_powerpole_extras_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_powerpole_extras_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_powerpole_extras_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_props_street_01_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_props_street_01_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_props_street_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_recyclingbin_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_recyclingbin_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_recyclingbin_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_road_decal_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_road_decal_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_rooftiles_01_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_rooftiles_01_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_roundmirror_02BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_roundmirror_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_roundmirror_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_roundmirror_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_sign_firehydrant_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_sign_firehydrant_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_sign_firehydrant_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_sign_satsupirisu_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_borders_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_borders_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_borders_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_storefront2_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_storefront_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_storefront_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboard_storefront_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_02_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_02_BaseMap_var.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_03_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_04_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_05_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_horiyontal2BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signboards_tokyo_horizontalBaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_highway_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_highway_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_metro_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_metro_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_suburbs_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_suburbs_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_signs_suburbs_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_skybox_clouds.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_skybox_cloudy.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_skybox_sunset.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storeboards_traditional_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storeboards_traditional_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storeboards_traditional_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefront_tofu_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefront_tofu_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefront_tofu_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefront_traditional_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefront_traditional_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefront_traditional_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefronts_japan_02_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefronts_japan_02_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefronts_japan_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefronts_japan_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_storefronts_japan_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_streetlamp_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_streetlamp_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_streetlamp_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_ticketgate_japan_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_ticketgate_japan_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_ticketgate_japan_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_ticketgate_japan_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_tiles_large_Base.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_tiles_large_nrm.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_tomare_decal 1.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_tomare_decal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_stoneBaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_stoneMaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_stoneNormal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_woodBaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_woodMaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_toorigate_woodNormal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights2_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights2_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights2_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficlights_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficpylons_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficpylons_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficpylons_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficsigns_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficsigns_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_trafficsigns_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vendingmachine_02_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vendingmachine_03_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vendingmachine_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vendingmachine_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vendingmachine_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vendingmachine_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vent_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vent_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_vent_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wall_linepattern2_diff.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wall_linepattern_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wall_linepattern_02_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wall_linepattern_nrm.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wall_plaster_BaseColor.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wall_plaster_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wallblocks_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wallblocks_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wallblocks_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_walls_01_suburbsNormal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_walls_01_suburbs_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_walls_suburbs_02_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_walls_suburbs_02_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_walls_suburbs_03Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_walls_suburbs_03_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_warningsigns_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_warningsigns_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_warningsigns_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wheel_car_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wheel_car_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wheel_car_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_Normal.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_white_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_white_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_wood_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_windows_residential_wood_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_01_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_01_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_02_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_02_Emissive.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_02_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_03_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_03_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_04_BaseMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/M_wordsigns_04_MaskMap.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_airline.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_arcadecenter.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_baristacoffee.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_beer_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_beer_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_cosmetics_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_girl.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_girl_03.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_girl_04.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_hostclub_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_inforcenter.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_izakaya.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_izakaya_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_kimane.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_kotososervices.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_man_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_monja.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_phone.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_realestate_01.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_realestate_02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_sushi.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_videogamecenter.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_videogamecenter02.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_water.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/billboard_wifi.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/echowavekaraoke.png (100%) rename Assets/Arts/Anime Tokyo/{Materials => }/Textures/echowavekaraoke2.png (100%) create mode 100644 Assets/BITKit/Unity/Scripts/Assets/YooAssetMaterialFix.cs create mode 100644 Assets/MyShaderVariants.json create mode 100644 Assets/MyShaderVariants.shadervariants create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/CustomPackRule.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageComparator/PackageComparatorWindow.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageImporter/PackageImporterWindow.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollector.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.uxml create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Runtime/AssetOperationHandleExtension.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Runtime/GameObjectAssetReference.cs create mode 100644 Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Runtime/LoadAssetsByTagOperation.cs diff --git a/Assets/Artists/Configs/New Universal Render Pipeline Asset.asset b/Assets/Artists/Configs/New Universal Render Pipeline Asset.asset index d14fa0515..7a78314c9 100644 --- a/Assets/Artists/Configs/New Universal Render Pipeline Asset.asset +++ b/Assets/Artists/Configs/New Universal Render Pipeline Asset.asset @@ -87,7 +87,7 @@ MonoBehaviour: m_PrefilteringModeAdditionalLightShadows: 0 m_PrefilterXRKeywords: 1 m_PrefilteringModeForwardPlus: 0 - m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeDeferredRendering: 2 m_PrefilteringModeScreenSpaceOcclusion: 0 m_PrefilterDebugKeywords: 1 m_PrefilterWriteRenderingLayers: 1 diff --git a/Assets/Artists/Configs/New Universal Render Pipeline Asset_Renderer.asset b/Assets/Artists/Configs/New Universal Render Pipeline Asset_Renderer.asset index 5b5086d18..6b3094c61 100644 --- a/Assets/Artists/Configs/New Universal Render Pipeline Asset_Renderer.asset +++ b/Assets/Artists/Configs/New Universal Render Pipeline Asset_Renderer.asset @@ -70,8 +70,8 @@ MonoBehaviour: failOperation: 0 zFailOperation: 0 m_ShadowTransparentReceive: 1 - m_RenderingMode: 0 - m_DepthPrimingMode: 0 + m_RenderingMode: 1 + m_DepthPrimingMode: 1 m_CopyDepthMode: 1 m_AccurateGbufferNormals: 0 m_IntermediateTextureMode: 1 diff --git a/Assets/Artists/Scenes/map_new_menu.unity b/Assets/Artists/Scenes/map_new_menu.unity deleted file mode 100644 index 1f8b26dfb..000000000 --- a/Assets/Artists/Scenes/map_new_menu.unity +++ /dev/null @@ -1,365 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 512 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 256 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 1 - m_PVRDenoiserTypeDirect: 1 - m_PVRDenoiserTypeIndirect: 1 - m_PVRDenoiserTypeAO: 1 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 0} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &919876299 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 919876301} - - component: {fileID: 919876300} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &919876300 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 919876299} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &919876301 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 919876299} - serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &1561544559 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1561544562} - - component: {fileID: 1561544561} - - component: {fileID: 1561544560} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1561544560 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561544559} - m_Enabled: 1 ---- !u!20 &1561544561 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561544559} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1561544562 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1561544559} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1931016184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1931016186} - - component: {fileID: 1931016185} - m_Layer: 0 - m_Name: UI Document - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1931016185 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931016184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_PanelSettings: {fileID: 11400000, guid: 64cd93f02c042ad43a96d66da32f0c6c, type: 2} - m_ParentUI: {fileID: 0} - sourceAsset: {fileID: 9197481963319205126, guid: 216e5666776eb9d4f9ff1391e0cff039, type: 3} - m_SortingOrder: 0 ---- !u!4 &1931016186 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931016184} - 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: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 1561544562} - - {fileID: 919876301} - - {fileID: 1931016186} diff --git a/Assets/Artists/Scripts/Program.cs b/Assets/Artists/Scripts/Program.cs index f262092c7..8dc9c5125 100644 --- a/Assets/Artists/Scripts/Program.cs +++ b/Assets/Artists/Scripts/Program.cs @@ -110,6 +110,8 @@ namespace Net.Like.Xue.Tokyo //生成玩家 serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); + //获取服务提供者 var serviceProvider = serviceCollection.BuildServiceProvider(); @@ -156,6 +158,8 @@ namespace Net.Like.Xue.Tokyo serviceProvider.GetRequiredService(); + serviceProvider.GetRequiredService(); + Application.targetFrameRate = 90; await destroyCancellationToken.WaitUntilCanceled(); diff --git a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs b/Assets/Artists/Scripts/Weather/ScriptableWeather.cs index 0443d4363..2c592de7f 100644 --- a/Assets/Artists/Scripts/Weather/ScriptableWeather.cs +++ b/Assets/Artists/Scripts/Weather/ScriptableWeather.cs @@ -3,17 +3,10 @@ using System.Collections.Generic; using BITKit; using UnityEngine; -#if UNITY_EDITOR -using UnityEditor; -#endif - namespace Net.Like.Xue.Tokyo.Weather { public class ScriptableWeather : ScriptableObject { - #if UNITY_EDITOR - [SerializeField] private LightingDataAsset lightingDataAsset; - #endif [SerializeField] private Vector3 sunLightDirection = new Vector3(0, 1, 0); [SerializeField] private Color sunLightColor; [SerializeField] private float sunLightIntensity = 1; @@ -25,10 +18,6 @@ namespace Net.Like.Xue.Tokyo.Weather [BIT] public void Save() { -#if UNITY_EDITOR - lightingDataAsset = Lightmapping.lightingDataAsset; - #endif - sunLightDirection = RenderSettings.sun.transform.eulerAngles; sunLightIntensity = RenderSettings.sun.intensity; sunLightColor = RenderSettings.sun.color; @@ -38,17 +27,11 @@ namespace Net.Like.Xue.Tokyo.Weather fogMode = RenderSettings.fogMode; fogColor = RenderSettings.fogColor; fogDensity = RenderSettings.fogDensity; -#if UNITY_EDITOR - EditorUtility.SetDirty(this); - #endif } [BIT] public void Load() { -#if UNITY_EDITOR - Lightmapping.lightingDataAsset = lightingDataAsset; - #endif RenderSettings.sun.transform.eulerAngles = sunLightDirection; RenderSettings.sun.intensity = sunLightIntensity; RenderSettings.skybox = skyboxMaterial; diff --git a/Assets/Arts/Anime Tokyo/Materials/M_billboard_phone.mat b/Assets/Arts/Anime Tokyo/Materials/M_billboard_phone.mat index 39b146554..7c5d40444 100644 --- a/Assets/Arts/Anime Tokyo/Materials/M_billboard_phone.mat +++ b/Assets/Arts/Anime Tokyo/Materials/M_billboard_phone.mat @@ -64,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5dfbdea9b35b1b842a25de267120dc75, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Arts/Anime Tokyo/Materials/M_billboard_videogame_02.mat b/Assets/Arts/Anime Tokyo/Materials/M_billboard_videogame_02.mat index 35e884c8b..c9e8fcb00 100644 --- a/Assets/Arts/Anime Tokyo/Materials/M_billboard_videogame_02.mat +++ b/Assets/Arts/Anime Tokyo/Materials/M_billboard_videogame_02.mat @@ -64,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 204058911901c7f4796e1f3e14e7d0e4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -131,7 +131,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.7830188, g: 0.7830188, b: 0.7830188, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.7830188, g: 0.7830188, b: 0.7830188, a: 1} - _EmissionColor: {r: 1.1317791, g: 1.1317791, b: 1.1317791, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Arts/Anime Tokyo/Materials/M_dark 2.mat b/Assets/Arts/Anime Tokyo/Materials/M_dark 2.mat index 0497c385a..4a36bd1ea 100644 --- a/Assets/Arts/Anime Tokyo/Materials/M_dark 2.mat +++ b/Assets/Arts/Anime Tokyo/Materials/M_dark 2.mat @@ -116,7 +116,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Arts/Anime Tokyo/Materials/M_guardrails.mat b/Assets/Arts/Anime Tokyo/Materials/M_guardrails.mat index ab9e2534d..53cbdc1d2 100644 --- a/Assets/Arts/Anime Tokyo/Materials/M_guardrails.mat +++ b/Assets/Arts/Anime Tokyo/Materials/M_guardrails.mat @@ -52,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 63bc2cc92a31cda4cbf7583d770c4565, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Arts/Anime Tokyo/Materials/M_pavingstone_01 1.mat b/Assets/Arts/Anime Tokyo/Materials/M_pavingstone_01 1.mat index 01f65144d..6b307a72b 100644 --- a/Assets/Arts/Anime Tokyo/Materials/M_pavingstone_01 1.mat +++ b/Assets/Arts/Anime Tokyo/Materials/M_pavingstone_01 1.mat @@ -63,8 +63,8 @@ Material: m_Scale: {x: 1.5, y: 1.5} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: a47aed59ca9724041b2364d4598511ca, type: 3} + m_Scale: {x: 1.5, y: 1.5} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -130,7 +130,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0.735849, g: 0.48940897, b: 0.4954689, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.735849, g: 0.4894089, b: 0.49546885, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Arts/Anime Tokyo/Materials/M_wall_stone 2.mat b/Assets/Arts/Anime Tokyo/Materials/M_wall_stone 2.mat index 0040247b6..af59afd5e 100644 --- a/Assets/Arts/Anime Tokyo/Materials/M_wall_stone 2.mat +++ b/Assets/Arts/Anime Tokyo/Materials/M_wall_stone 2.mat @@ -63,7 +63,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: aaba07b8516f6f34e97166378131e3e9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -130,7 +130,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 0.94376385, b: 0.8443396, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0.94376385, b: 0.8443396, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/Bricks071_1K_NormalDX.png b/Assets/Arts/Anime Tokyo/Textures/Bricks071_1K_NormalDX.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/Bricks071_1K_NormalDX.png rename to Assets/Arts/Anime Tokyo/Textures/Bricks071_1K_NormalDX.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/CHV.png b/Assets/Arts/Anime Tokyo/Textures/CHV.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/CHV.png rename to Assets/Arts/Anime Tokyo/Textures/CHV.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_TV_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_LED_TV_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_TV_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_LED_TV_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_TV_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_LED_TV_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_TV_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_LED_TV_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_TV_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_LED_TV_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_TV_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_LED_TV_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_emmision.png b/Assets/Arts/Anime Tokyo/Textures/M_LED_emmision.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_LED_emmision.png rename to Assets/Arts/Anime Tokyo/Textures/M_LED_emmision.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_adboard_base_normal.png b/Assets/Arts/Anime Tokyo/Textures/M_adboard_base_normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_adboard_base_normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_adboard_base_normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_aircon_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_aircon_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_aircon_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_aircon_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_aircon_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_aircon_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_aircon_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_aircon_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_aircon_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_aircon_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_aircon_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_aircon_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_asphalt_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_asphalt_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_asphalt_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_asphalt_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_asphalt_02_diff.png b/Assets/Arts/Anime Tokyo/Textures/M_asphalt_02_diff.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_asphalt_02_diff.png rename to Assets/Arts/Anime Tokyo/Textures/M_asphalt_02_diff.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_light_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_light_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_light_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_light_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_light_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_light_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_light_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_light_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_light_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_residental_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_residental_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_residental_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_residental_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_residental_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_residental_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_residental_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_residental_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_residental_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_attachments_residental_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_attachments_residental_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_attachments_residental_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bark_01_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_bark_01_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bark_01_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_bark_01_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bark_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_bark_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bark_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_bark_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_basetexture_stylized_02.png b/Assets/Arts/Anime Tokyo/Textures/M_basetexture_stylized_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_basetexture_stylized_02.png rename to Assets/Arts/Anime Tokyo/Textures/M_basetexture_stylized_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_black_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_black_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_black_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_black_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_black_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_black_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_black_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_black_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_brown_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_brown_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_brown_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_brown_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_metal_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_metal_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_metal_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_metal_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_metal_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_metal_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_metal_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_metal_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_red_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_red_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_red_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_red_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_red_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_red_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_red_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_red_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_white_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_white_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_white_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_white_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_white_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_white_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_white_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_white_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_wood_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_wood_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_wood_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_wood_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_wood_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_beams_wood_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beams_wood_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_beams_wood_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_beamsbrown_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_beamsbrown_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_beamsbrown_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_beamsbrown_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_billboard_bookstore.png b/Assets/Arts/Anime Tokyo/Textures/M_billboard_bookstore.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_billboard_bookstore.png rename to Assets/Arts/Anime Tokyo/Textures/M_billboard_bookstore.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_billgoard_videogame_01.png b/Assets/Arts/Anime Tokyo/Textures/M_billgoard_videogame_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_billgoard_videogame_01.png rename to Assets/Arts/Anime Tokyo/Textures/M_billgoard_videogame_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_billgoard_videogame_02.png b/Assets/Arts/Anime Tokyo/Textures/M_billgoard_videogame_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_billgoard_videogame_02.png rename to Assets/Arts/Anime Tokyo/Textures/M_billgoard_videogame_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_blindguidance_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_blindguidance_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_blindguidance_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_blindguidance_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_blindguidance_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_blindguidance_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_blindguidance_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_blindguidance_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_blindguidance_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_blindguidance_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_blindguidance_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_blindguidance_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_border_walls_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_border_walls_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_border_walls_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_border_walls_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_border_walls_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_border_walls_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_border_walls_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_border_walls_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bottles_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_bottles_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bottles_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_bottles_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bottles_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_bottles_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bottles_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_bottles_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bottles_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_bottles_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bottles_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_bottles_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bricks_wall_03_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_bricks_wall_03_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bricks_wall_03_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_bricks_wall_03_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bricks_wall_03_roughness.png b/Assets/Arts/Anime Tokyo/Textures/M_bricks_wall_03_roughness.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bricks_wall_03_roughness.png rename to Assets/Arts/Anime Tokyo/Textures/M_bricks_wall_03_roughness.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_bricks_wall_red_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_bricks_wall_red_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_bricks_wall_red_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_bricks_wall_red_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_attachments_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_attachments_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_attachments_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_attachments_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_attachments_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_attachments_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_attachments_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_attachments_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_attachments_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_attachments_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_attachments_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_attachments_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_Normal 1.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_Normal 1.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_Normal 1.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_Normal 1.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_varBaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_varBaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_varBaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_varBaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_varMaskMap 1.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_varMaskMap 1.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_varMaskMap 1.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_varMaskMap 1.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_varMaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_varMaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_car_sport_base_varMaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_car_sport_base_varMaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_coil_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_coil_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_coil_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_coil_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_coil_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_coil_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_coil_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_coil_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_coil_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_coil_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_coil_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_coil_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_cosmeticstore_wordsign_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_cosmeticstore_wordsign_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_cosmeticstore_wordsign_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_cosmeticstore_wordsign_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_curbstones_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_curbstones_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_curbstones_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_curbstones_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_curbstones_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_curbstones_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_curbstones_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_curbstones_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_curbstones_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_curbstones_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_curbstones_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_curbstones_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_01.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_01.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_30.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_30.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_30.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_30.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_arrow_right.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_arrow_right.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_arrow_right.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_arrow_right.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_arrow_straight.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_arrow_straight.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_arrow_straight.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_arrow_straight.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_noparking.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_noparking.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_noparking.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_noparking.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_parking.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_parking.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_parking.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_parking.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_slowdown.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_slowdown.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_slowdown.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_slowdown.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_stripes.png b/Assets/Arts/Anime Tokyo/Textures/M_decal_stripes.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_decal_stripes.png rename to Assets/Arts/Anime Tokyo/Textures/M_decal_stripes.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_02BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_doors_residental_02BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_02BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_doors_residental_02BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_02MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_doors_residental_02MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_02MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_doors_residental_02MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_doors_residental_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_doors_residental_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_doors_residental_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_doors_residental_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_doors_residental_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_doors_residental_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_doors_residental_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_emergencysigns_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_emergencysigns_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fence_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_fence_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fence_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_fence_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fence_basecolor.png b/Assets/Arts/Anime Tokyo/Textures/M_fence_basecolor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fence_basecolor.png rename to Assets/Arts/Anime Tokyo/Textures/M_fence_basecolor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_01_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_fences_01_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_01_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_fences_01_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_01_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_fences_01_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_01_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_fences_01_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_fences_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_fences_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_suburbs_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_fences_suburbs_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_suburbs_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_fences_suburbs_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_suburbs_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_fences_suburbs_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_suburbs_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_fences_suburbs_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_suburbs_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_fences_suburbs_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fences_suburbs_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_fences_suburbs_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_floortiles.png b/Assets/Arts/Anime Tokyo/Textures/M_floortiles.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_floortiles.png rename to Assets/Arts/Anime Tokyo/Textures/M_floortiles.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_floortiles_nrm.png b/Assets/Arts/Anime Tokyo/Textures/M_floortiles_nrm.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_floortiles_nrm.png rename to Assets/Arts/Anime Tokyo/Textures/M_floortiles_nrm.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_flower_01.png b/Assets/Arts/Anime Tokyo/Textures/M_flower_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_flower_01.png rename to Assets/Arts/Anime Tokyo/Textures/M_flower_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_flower_02.png b/Assets/Arts/Anime Tokyo/Textures/M_flower_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_flower_02.png rename to Assets/Arts/Anime Tokyo/Textures/M_flower_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_flowerpots_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_flowerpots_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_flowerpots_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_flowerpots_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_flowerpots_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_flowerpots_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_flowerpots_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_flowerpots_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_flowerpots_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_flowerpots_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_flowerpots_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_flowerpots_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fuseboxes_01_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_fuseboxes_01_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fuseboxes_01_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_fuseboxes_01_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fuseboxes_01_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_fuseboxes_01_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fuseboxes_01_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_fuseboxes_01_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_fuseboxes_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_fuseboxes_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_fuseboxes_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_fuseboxes_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_garagedoor_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_garagedoor_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_garagedoor_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_garagedoor_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_garagedoor_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_garagedoor_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_garagedoor_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_garagedoor_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_garagedoor_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_garagedoor_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_garagedoor_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_garagedoor_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_gate_citycenter_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_gate_citycenter_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_grungemap_01.png b/Assets/Arts/Anime Tokyo/Textures/M_grungemap_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_grungemap_01.png rename to Assets/Arts/Anime Tokyo/Textures/M_grungemap_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_guardrails_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_guardrails_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_guardrails_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_guardrails_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_guardrails_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_guardrails_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_guardrails_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_guardrails_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_guardrails_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_guardrails_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_guardrails_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_guardrails_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_2_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_2_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_2_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_2_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_konbinientrance_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_konbinientrance_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lamppole_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_lamppole_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lamppole_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_lamppole_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lamppole_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_lamppole_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lamppole_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_lamppole_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lamppole_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_lamppole_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lamppole_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_lamppole_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lanterns_extra_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_lanterns_extra_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lanterns_extra_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_lanterns_extra_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lanterns_extra_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_lanterns_extra_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lanterns_extra_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_lanterns_extra_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lanterns_extra_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_lanterns_extra_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lanterns_extra_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_lanterns_extra_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_leaf_01.png b/Assets/Arts/Anime Tokyo/Textures/M_leaf_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_leaf_01.png rename to Assets/Arts/Anime Tokyo/Textures/M_leaf_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_leaves_tree.png b/Assets/Arts/Anime Tokyo/Textures/M_leaves_tree.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_leaves_tree.png rename to Assets/Arts/Anime Tokyo/Textures/M_leaves_tree.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_licenseplate_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_licenseplate_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_licenseplate_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_licenseplate_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_licenseplate_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_licenseplate_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_licenseplate_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_licenseplate_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_licenseplate_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_licenseplate_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_licenseplate_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_licenseplate_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lights_billboard_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_lights_billboard_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_line_decal.png b/Assets/Arts/Anime Tokyo/Textures/M_line_decal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_line_decal.png rename to Assets/Arts/Anime Tokyo/Textures/M_line_decal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_line_decal_02.png b/Assets/Arts/Anime Tokyo/Textures/M_line_decal_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_line_decal_02.png rename to Assets/Arts/Anime Tokyo/Textures/M_line_decal_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lines_vertical_Diff.png b/Assets/Arts/Anime Tokyo/Textures/M_lines_vertical_Diff.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lines_vertical_Diff.png rename to Assets/Arts/Anime Tokyo/Textures/M_lines_vertical_Diff.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_lines_vertical_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_lines_vertical_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_lines_vertical_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_lines_vertical_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_metroentrance_sign_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_metroentrance_sign_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_metroentrance_sign_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_metroentrance_sign_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_metroentrance_sign_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_metroentrance_sign_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_metroentrance_sign_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_neonsigns_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_neonsigns_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_neonsigns_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_neonsigns_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_neonsigns_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_neonsigns_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_neonsigns_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_neonsigns_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_neonsigns_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_neonsigns_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_neonsigns_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_neonsigns_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_parasols_storefront_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_parasols_storefront_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_parasols_storefront_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_parasols_storefront_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_parasols_storefront_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_parasols_storefront_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_parasols_storefront_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_parasols_storefront_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_parasols_storefront_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_parasols_storefront_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_parasols_storefront_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_parasols_storefront_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_01_Basecolor.png b/Assets/Arts/Anime Tokyo/Textures/M_pavingstones_01_Basecolor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_01_Basecolor.png rename to Assets/Arts/Anime Tokyo/Textures/M_pavingstones_01_Basecolor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_01_Normal.png.png b/Assets/Arts/Anime Tokyo/Textures/M_pavingstones_01_Normal.png.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_01_Normal.png.png rename to Assets/Arts/Anime Tokyo/Textures/M_pavingstones_01_Normal.png.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_02_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_pavingstones_02_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_02_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_pavingstones_02_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_03_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_pavingstones_03_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_03_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_pavingstones_03_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_03_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_pavingstones_03_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_03_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_pavingstones_03_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_03_color.png b/Assets/Arts/Anime Tokyo/Textures/M_pavingstones_03_color.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pavingstones_03_color.png rename to Assets/Arts/Anime Tokyo/Textures/M_pavingstones_03_color.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing.png b/Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing.png rename to Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing2.png b/Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing2.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing2.png rename to Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing2.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing3.png b/Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing3.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing3.png rename to Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing3.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing4.png b/Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing4.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pedestriancrossing4.png rename to Assets/Arts/Anime Tokyo/Textures/M_pedestriancrossing4.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_edges_metro_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_pillar_edges_metro_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_edges_metro_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_pillar_edges_metro_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_edges_metro_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_pillar_edges_metro_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_edges_metro_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_pillar_edges_metro_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_edges_metro_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_pillar_edges_metro_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_edges_metro_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_pillar_edges_metro_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_metal_metro_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_pillar_metal_metro_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_metal_metro_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_pillar_metal_metro_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_metal_metro_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_pillar_metal_metro_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_metal_metro_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_pillar_metal_metro_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_metal_metro_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_pillar_metal_metro_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pillar_metal_metro_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_pillar_metal_metro_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pipes_01_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_pipes_01_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pipes_01_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_pipes_01_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pipes_01_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_pipes_01_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pipes_01_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_pipes_01_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_pipes_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_pipes_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_pipes_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_pipes_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_plaster_01_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_plaster_01_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_plaster_01_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_plaster_01_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_plaster_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_plaster_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_plaster_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_plaster_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_plastic_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_plastic_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_plastic_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_plastic_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_plastic_roughness.png b/Assets/Arts/Anime Tokyo/Textures/M_plastic_roughness.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_plastic_roughness.png rename to Assets/Arts/Anime Tokyo/Textures/M_plastic_roughness.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall2_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_posters_wall2_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall2_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_posters_wall2_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_posters_wall_03_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_03_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_posters_wall_03_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_posters_wall_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_posters_wall_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_posters_wall_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_posters_wall_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_posters_wall_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_posters_wall_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_posters_wall_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_powerpole_extras_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_powerpole_extras_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_powerpole_extras_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_powerpole_extras_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_powerpole_extras_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_powerpole_extras_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_powerpole_extras_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_powerpole_extras_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_powerpole_extras_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_powerpole_extras_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_powerpole_extras_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_powerpole_extras_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_props_street_01_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_props_street_01_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_props_street_01_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_props_street_01_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_props_street_01_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_props_street_01_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_props_street_01_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_props_street_01_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_props_street_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_props_street_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_props_street_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_props_street_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_recyclingbin_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_recyclingbin_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_recyclingbin_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_recyclingbin_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_recyclingbin_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_recyclingbin_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_recyclingbin_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_recyclingbin_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_recyclingbin_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_recyclingbin_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_recyclingbin_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_recyclingbin_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_road_decal_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_road_decal_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_road_decal_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_road_decal_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_road_decal_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_road_decal_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_road_decal_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_road_decal_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_rooftiles_01_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_rooftiles_01_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_rooftiles_01_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_rooftiles_01_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_rooftiles_01_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_rooftiles_01_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_rooftiles_01_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_rooftiles_01_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_02BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_roundmirror_02BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_02BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_roundmirror_02BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_roundmirror_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_roundmirror_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_roundmirror_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_roundmirror_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_roundmirror_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_roundmirror_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_roundmirror_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_sign_firehydrant_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_sign_firehydrant_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_sign_firehydrant_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_sign_firehydrant_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_sign_firehydrant_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_firehydrant_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_sign_firehydrant_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_satsupirisu_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_sign_satsupirisu_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_sign_satsupirisu_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_sign_satsupirisu_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_borders_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_borders_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_borders_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_borders_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_borders_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_borders_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_borders_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_borders_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_borders_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_borders_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_borders_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_borders_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront2_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront2_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront2_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront2_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboard_storefront_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboard_storefront_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_02_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_02_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap_var.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_02_BaseMap_var.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_02_BaseMap_var.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_02_BaseMap_var.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_03_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_03_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_03_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_04_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_04_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_04_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_04_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_05_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_05_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_05_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_05_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horiyontal2BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_horiyontal2BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horiyontal2BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_horiyontal2BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horizontalBaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_horizontalBaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signboards_tokyo_horizontalBaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signboards_tokyo_horizontalBaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_highway_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_highway_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_highway_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_highway_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_highway_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_highway_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_highway_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_highway_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_metro_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_metro_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_metro_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_metro_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_metro_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_suburbs_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_suburbs_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_suburbs_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_suburbs_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_suburbs_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_suburbs_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_suburbs_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_suburbs_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_suburbs_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_signs_suburbs_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_signs_suburbs_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_signs_suburbs_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_skybox_clouds.png b/Assets/Arts/Anime Tokyo/Textures/M_skybox_clouds.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_skybox_clouds.png rename to Assets/Arts/Anime Tokyo/Textures/M_skybox_clouds.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_skybox_cloudy.png b/Assets/Arts/Anime Tokyo/Textures/M_skybox_cloudy.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_skybox_cloudy.png rename to Assets/Arts/Anime Tokyo/Textures/M_skybox_cloudy.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_skybox_sunset.png b/Assets/Arts/Anime Tokyo/Textures/M_skybox_sunset.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_skybox_sunset.png rename to Assets/Arts/Anime Tokyo/Textures/M_skybox_sunset.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storeboards_traditional_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storeboards_traditional_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storeboards_traditional_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storeboards_traditional_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_storeboards_traditional_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storeboards_traditional_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_storeboards_traditional_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_tofu_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefront_tofu_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_tofu_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefront_tofu_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_tofu_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefront_tofu_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_tofu_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefront_tofu_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_tofu_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_storefront_tofu_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_tofu_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefront_tofu_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_traditional_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefront_traditional_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_traditional_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefront_traditional_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_traditional_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefront_traditional_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_traditional_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefront_traditional_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_traditional_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_storefront_traditional_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefront_traditional_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefront_traditional_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_02_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_02_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_02_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_02_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_02_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_02_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_02_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_02_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_storefronts_japan_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_storefronts_japan_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_streetlamp_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_streetlamp_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_streetlamp_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_streetlamp_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_streetlamp_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_streetlamp_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_streetlamp_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_streetlamp_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_streetlamp_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_streetlamp_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_streetlamp_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_streetlamp_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_ticketgate_japan_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_ticketgate_japan_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_tiles_large_Base.png b/Assets/Arts/Anime Tokyo/Textures/M_tiles_large_Base.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_tiles_large_Base.png rename to Assets/Arts/Anime Tokyo/Textures/M_tiles_large_Base.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_tiles_large_nrm.png b/Assets/Arts/Anime Tokyo/Textures/M_tiles_large_nrm.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_tiles_large_nrm.png rename to Assets/Arts/Anime Tokyo/Textures/M_tiles_large_nrm.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_tomare_decal 1.png b/Assets/Arts/Anime Tokyo/Textures/M_tomare_decal 1.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_tomare_decal 1.png rename to Assets/Arts/Anime Tokyo/Textures/M_tomare_decal 1.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_tomare_decal.png b/Assets/Arts/Anime Tokyo/Textures/M_tomare_decal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_tomare_decal.png rename to Assets/Arts/Anime Tokyo/Textures/M_tomare_decal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_stoneBaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_stoneBaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_stoneBaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_stoneBaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_stoneMaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_stoneMaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_stoneMaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_stoneMaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_stoneNormal.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_stoneNormal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_stoneNormal.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_stoneNormal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_woodBaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_woodBaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_woodBaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_woodBaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_woodMaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_woodMaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_woodMaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_woodMaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_woodNormal.png b/Assets/Arts/Anime Tokyo/Textures/M_toorigate_woodNormal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_toorigate_woodNormal.png rename to Assets/Arts/Anime Tokyo/Textures/M_toorigate_woodNormal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights2_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights2_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights2_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights2_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights2_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights2_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights2_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficlights_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficlights_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficlights_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficpylons_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficpylons_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficpylons_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficpylons_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficpylons_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficpylons_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficpylons_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficsigns_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficsigns_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficsigns_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficsigns_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficsigns_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficsigns_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficsigns_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficsigns_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficsigns_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_trafficsigns_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_trafficsigns_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_trafficsigns_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_02_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_02_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_02_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_02_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_03_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_03_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_03_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vendingmachine_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_vendingmachine_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vent_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_vent_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vent_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_vent_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vent_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_vent_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vent_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_vent_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_vent_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_vent_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_vent_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_vent_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern2_diff.png b/Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern2_diff.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern2_diff.png rename to Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern2_diff.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern_02.png b/Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern_02.png rename to Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern_02_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern_02_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern_02_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern_02_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern_nrm.png b/Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern_nrm.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_linepattern_nrm.png rename to Assets/Arts/Anime Tokyo/Textures/M_wall_linepattern_nrm.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_plaster_BaseColor.png b/Assets/Arts/Anime Tokyo/Textures/M_wall_plaster_BaseColor.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_plaster_BaseColor.png rename to Assets/Arts/Anime Tokyo/Textures/M_wall_plaster_BaseColor.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_plaster_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_wall_plaster_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wall_plaster_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_wall_plaster_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wallblocks_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wallblocks_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wallblocks_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wallblocks_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wallblocks_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wallblocks_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wallblocks_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wallblocks_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wallblocks_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_wallblocks_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wallblocks_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_wallblocks_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_01_suburbsNormal.png b/Assets/Arts/Anime Tokyo/Textures/M_walls_01_suburbsNormal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_01_suburbsNormal.png rename to Assets/Arts/Anime Tokyo/Textures/M_walls_01_suburbsNormal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_01_suburbs_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_walls_01_suburbs_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_01_suburbs_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_walls_01_suburbs_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_02_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_02_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_02_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_02_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_02_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_02_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_02_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_02_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_03Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_03Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_03Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_03Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_03_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_walls_suburbs_03_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_walls_suburbs_03_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_warningsigns_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_warningsigns_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_warningsigns_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_warningsigns_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_warningsigns_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_warningsigns_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_warningsigns_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wheel_car_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wheel_car_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wheel_car_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wheel_car_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wheel_car_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wheel_car_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wheel_car_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wheel_car_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wheel_car_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_wheel_car_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wheel_car_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_wheel_car_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_Normal.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_Normal.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_Normal.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_Normal.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_white_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_white_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_white_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_white_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_white_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_white_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_white_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_white_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_wood_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_wood_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_wood_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_wood_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_wood_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_windows_residential_wood_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_windows_residential_wood_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_windows_residential_wood_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_01_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_01_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_01_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_01_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_01_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_01_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_01_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_01_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_02_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_02_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_02_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_02_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_02_Emissive.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_02_Emissive.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_02_Emissive.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_02_Emissive.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_02_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_02_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_02_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_02_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_03_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_03_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_03_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_03_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_03_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_03_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_03_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_03_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_04_BaseMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_04_BaseMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_04_BaseMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_04_BaseMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_04_MaskMap.png b/Assets/Arts/Anime Tokyo/Textures/M_wordsigns_04_MaskMap.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/M_wordsigns_04_MaskMap.png rename to Assets/Arts/Anime Tokyo/Textures/M_wordsigns_04_MaskMap.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_airline.png b/Assets/Arts/Anime Tokyo/Textures/billboard_airline.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_airline.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_airline.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_arcadecenter.png b/Assets/Arts/Anime Tokyo/Textures/billboard_arcadecenter.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_arcadecenter.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_arcadecenter.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_baristacoffee.png b/Assets/Arts/Anime Tokyo/Textures/billboard_baristacoffee.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_baristacoffee.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_baristacoffee.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_beer_01.png b/Assets/Arts/Anime Tokyo/Textures/billboard_beer_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_beer_01.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_beer_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_beer_02.png b/Assets/Arts/Anime Tokyo/Textures/billboard_beer_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_beer_02.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_beer_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_cosmetics_01.png b/Assets/Arts/Anime Tokyo/Textures/billboard_cosmetics_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_cosmetics_01.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_cosmetics_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl.png b/Assets/Arts/Anime Tokyo/Textures/billboard_girl.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_girl.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_03.png b/Assets/Arts/Anime Tokyo/Textures/billboard_girl_03.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_03.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_girl_03.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_04.png b/Assets/Arts/Anime Tokyo/Textures/billboard_girl_04.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_girl_04.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_girl_04.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_hostclub_01.png b/Assets/Arts/Anime Tokyo/Textures/billboard_hostclub_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_hostclub_01.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_hostclub_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_inforcenter.png b/Assets/Arts/Anime Tokyo/Textures/billboard_inforcenter.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_inforcenter.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_inforcenter.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_izakaya.png b/Assets/Arts/Anime Tokyo/Textures/billboard_izakaya.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_izakaya.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_izakaya.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_izakaya_02.png b/Assets/Arts/Anime Tokyo/Textures/billboard_izakaya_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_izakaya_02.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_izakaya_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_kimane.png b/Assets/Arts/Anime Tokyo/Textures/billboard_kimane.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_kimane.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_kimane.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_kotososervices.png b/Assets/Arts/Anime Tokyo/Textures/billboard_kotososervices.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_kotososervices.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_kotososervices.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_man_01.png b/Assets/Arts/Anime Tokyo/Textures/billboard_man_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_man_01.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_man_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_monja.png b/Assets/Arts/Anime Tokyo/Textures/billboard_monja.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_monja.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_monja.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_phone.png b/Assets/Arts/Anime Tokyo/Textures/billboard_phone.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_phone.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_phone.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_01.png b/Assets/Arts/Anime Tokyo/Textures/billboard_realestate_01.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_01.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_realestate_01.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_02.png b/Assets/Arts/Anime Tokyo/Textures/billboard_realestate_02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_realestate_02.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_realestate_02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_sushi.png b/Assets/Arts/Anime Tokyo/Textures/billboard_sushi.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_sushi.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_sushi.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_videogamecenter.png b/Assets/Arts/Anime Tokyo/Textures/billboard_videogamecenter.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_videogamecenter.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_videogamecenter.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_videogamecenter02.png b/Assets/Arts/Anime Tokyo/Textures/billboard_videogamecenter02.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_videogamecenter02.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_videogamecenter02.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_water.png b/Assets/Arts/Anime Tokyo/Textures/billboard_water.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_water.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_water.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/billboard_wifi.png b/Assets/Arts/Anime Tokyo/Textures/billboard_wifi.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/billboard_wifi.png rename to Assets/Arts/Anime Tokyo/Textures/billboard_wifi.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/echowavekaraoke.png b/Assets/Arts/Anime Tokyo/Textures/echowavekaraoke.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/echowavekaraoke.png rename to Assets/Arts/Anime Tokyo/Textures/echowavekaraoke.png diff --git a/Assets/Arts/Anime Tokyo/Materials/Textures/echowavekaraoke2.png b/Assets/Arts/Anime Tokyo/Textures/echowavekaraoke2.png similarity index 100% rename from Assets/Arts/Anime Tokyo/Materials/Textures/echowavekaraoke2.png rename to Assets/Arts/Anime Tokyo/Textures/echowavekaraoke2.png diff --git a/Assets/AssetBundleCollectorSetting.asset b/Assets/AssetBundleCollectorSetting.asset index bfc9a0254..e7445dcda 100644 --- a/Assets/AssetBundleCollectorSetting.asset +++ b/Assets/AssetBundleCollectorSetting.asset @@ -84,11 +84,29 @@ MonoBehaviour: FilterRuleName: CollectScene AssetTags: UserData: - - CollectPath: Assets/Artists/Scenes/map_new_menu.unity - CollectorGUID: 8c62e11b988f2e24b8d8b6de309cc851 + - GroupName: Shader + GroupDesc: + AssetTags: + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/MyShaderVariants.shadervariants + CollectorGUID: 515c24291f9508a49863f518901792d9 CollectorType: 0 AddressRuleName: AddressByFileName PackRuleName: PackDirectory FilterRuleName: CollectAll AssetTags: UserData: + - GroupName: Material + GroupDesc: + AssetTags: + ActiveRuleName: EnableGroup + Collectors: + - CollectPath: Assets/Arts/Anime Tokyo/Materials + CollectorGUID: 5d8f5b504db298b43af0ec018f77a113 + CollectorType: 0 + AddressRuleName: AddressByFileName + PackRuleName: PackDirectory + FilterRuleName: CollectAll + AssetTags: material + UserData: diff --git a/Assets/BITKit/Core/StateMachine/AsyncStateMachine.cs b/Assets/BITKit/Core/StateMachine/AsyncStateMachine.cs index 373ccc778..98c44588f 100644 --- a/Assets/BITKit/Core/StateMachine/AsyncStateMachine.cs +++ b/Assets/BITKit/Core/StateMachine/AsyncStateMachine.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Threading; using Cysharp.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; -using Random = UnityEngine.Random; namespace BITKit.StateMachine { diff --git a/Assets/BITKit/Unity/Scripts/Assets/YooAssetMaterialFix.cs b/Assets/BITKit/Unity/Scripts/Assets/YooAssetMaterialFix.cs new file mode 100644 index 000000000..558ebdbc7 --- /dev/null +++ b/Assets/BITKit/Unity/Scripts/Assets/YooAssetMaterialFix.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using BITKit.IO; +using Cysharp.Threading.Tasks; +using Microsoft.Extensions.Logging; +using UnityEditor; +using UnityEngine; +using YooAsset; + +namespace BITKit.Mod +{ + public class YooAssetMaterialFix:IDisposable + { + private readonly ILogger _logger; + public YooAssetMaterialFix(ILogger logger) + { + _logger = logger; + YooAssetUtils.OnPackageRegistered += OnPackageRegistered; + foreach (var packageName in YooAssetUtils.RegisteredPackages) + { + OnPackageRegistered(packageName); + } + } + + private async void OnPackageRegistered(string obj) + { + var package = YooAssets.GetPackage(obj); + _logger.LogInformation("正在加载所有材质"); + var assetInfos = package.GetAssetInfos("material"); + foreach (var assetInfo in assetInfos) + { + var task = package.LoadAssetAsync(assetInfo.AssetPath); + await task; + var material = task.AssetObject.As(); + material.shader = material.shader; + } + _logger.LogInformation($"所有材质加载完成,已更新{assetInfos.Length}个材质"); + } + + public void Dispose() + { + // TODO 在此释放托管资源 + YooAssetUtils.OnPackageRegistered -= OnPackageRegistered; + } + } + +} + diff --git a/Assets/MyShaderVariants.json b/Assets/MyShaderVariants.json new file mode 100644 index 000000000..c7426ea08 --- /dev/null +++ b/Assets/MyShaderVariants.json @@ -0,0 +1,434 @@ +{ + "ShaderTotalCount": 17, + "VariantTotalCount": 41, + "ShaderVariantInfos": [ + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/BlitCopy", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Skybox/Procedural", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "_SUNDISK_SIMPLE" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Skybox/Panoramic", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-GUITextureClip", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-GUITextureClipText", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-GUITexture", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-GUITextureBlit", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-GUIRoundedRect", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-GUIRoundedRectWithColorPerBorder", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/Internal-UIRAtlasBlitCopy", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Resources/unity_builtin_extra", + "ShaderName": "Hidden/UIElements/EditorUIE", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/CopyDepth.shader", + "ShaderName": "Hidden/Universal Render Pipeline/CopyDepth", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Lit.shader", + "ShaderName": "Universal Render Pipeline/Lit", + "ShaderVariantCount": 24, + "ShaderVariantElements": [ + { + "PassType": 8, + "Keywords": [ + "" + ] + }, + { + "PassType": 8, + "Keywords": [ + "_ALPHATEST_ON" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_ALPHAPREMULTIPLY_ON", + "_NORMALMAP", + "_SURFACE_TYPE_TRANSPARENT" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_ALPHAPREMULTIPLY_ON", + "_SURFACE_TYPE_TRANSPARENT" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_ALPHATEST_ON" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_ALPHATEST_ON", + "_DETAIL_MULX2" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_ALPHATEST_ON", + "_DETAIL_MULX2", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_DETAIL_MULX2" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_DETAIL_MULX2", + "_EMISSION" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_DETAIL_MULX2", + "_METALLICSPECGLOSSMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_DETAIL_MULX2", + "_METALLICSPECGLOSSMAP", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_DETAIL_MULX2", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_EMISSION" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_EMISSION", + "_METALLICSPECGLOSSMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_EMISSION", + "_METALLICSPECGLOSSMAP", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_EMISSION", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_EMISSION", + "_RECEIVE_SHADOWS_OFF", + "_SPECULARHIGHLIGHTS_OFF" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_METALLICSPECGLOSSMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_METALLICSPECGLOSSMAP", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_NORMALMAP" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_NORMALMAP", + "_SURFACE_TYPE_TRANSPARENT" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_RECEIVE_SHADOWS_OFF" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS", + "_SURFACE_TYPE_TRANSPARENT" + ] + } + ] + }, + { + "AssetPath": "Assets/Arts/Fantasy Adventure Environment/Shaders/URP/FAE_Foliage.shadergraph", + "ShaderName": "Universal Render Pipeline/FAE/FAE_Foliage", + "ShaderVariantCount": 2, + "ShaderVariantElements": [ + { + "PassType": 8, + "Keywords": [ + "PROCEDURAL_INSTANCING_ON" + ] + }, + { + "PassType": 13, + "Keywords": [ + "EVALUATE_SH_VERTEX", + "_ADDITIONAL_LIGHTS" + ] + } + ] + }, + { + "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/FallbackError.shader", + "ShaderName": "Hidden/Universal Render Pipeline/FallbackError", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Packages/com.unity.render-pipelines.universal/Shaders/Utils/CoreBlit.shader", + "ShaderName": "Hidden/Universal/CoreBlit", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + }, + { + "AssetPath": "Packages/com.unity.render-pipelines.core/Runtime/RenderPipelineResources/FallbackShader.shader", + "ShaderName": "Hidden/Core/FallbackError", + "ShaderVariantCount": 1, + "ShaderVariantElements": [ + { + "PassType": 0, + "Keywords": [ + "" + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/Assets/MyShaderVariants.shadervariants b/Assets/MyShaderVariants.shadervariants new file mode 100644 index 000000000..e20909e5e --- /dev/null +++ b/Assets/MyShaderVariants.shadervariants @@ -0,0 +1,148 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!200 &20000000 +ShaderVariantCollection: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Assets/MyShaderVariants.shadervariants + m_Shaders: + - first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: _SUNDISK_SIMPLE + passType: 0 + - first: {fileID: 108, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + second: + variants: + - keywords: + passType: 8 + - keywords: _ALPHATEST_ON + passType: 8 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHAPREMULTIPLY_ON _NORMALMAP + _SURFACE_TYPE_TRANSPARENT + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHAPREMULTIPLY_ON _SURFACE_TYPE_TRANSPARENT + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHATEST_ON + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHATEST_ON _DETAIL_MULX2 + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _ALPHATEST_ON _DETAIL_MULX2 + _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _DETAIL_MULX2 + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _DETAIL_MULX2 _EMISSION + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _DETAIL_MULX2 _METALLICSPECGLOSSMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _DETAIL_MULX2 _METALLICSPECGLOSSMAP + _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _DETAIL_MULX2 _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _METALLICSPECGLOSSMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _METALLICSPECGLOSSMAP + _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _EMISSION _RECEIVE_SHADOWS_OFF + _SPECULARHIGHLIGHTS_OFF + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _METALLICSPECGLOSSMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _METALLICSPECGLOSSMAP _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _NORMALMAP + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _NORMALMAP _SURFACE_TYPE_TRANSPARENT + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _RECEIVE_SHADOWS_OFF + passType: 13 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS _SURFACE_TYPE_TRANSPARENT + passType: 13 + - first: {fileID: -6465566751694194690, guid: dc1a634184354e343a9a36dd032cf2bf, type: 3} + second: + variants: + - keywords: PROCEDURAL_INSTANCING_ON + passType: 8 + - keywords: EVALUATE_SH_VERTEX _ADDITIONAL_LIGHTS + passType: 13 + - first: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + second: + variants: + - keywords: + passType: 0 + - first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3} + second: + variants: + - keywords: + passType: 0 diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/CustomPackRule.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/CustomPackRule.cs new file mode 100644 index 000000000..dc3c5a882 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/CustomPackRule.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using UnityEngine; +using YooAsset.Editor; + +[DisplayName("打包特效纹理（自定义）")] +public class PackEffectTexture : IPackRule +{ + private const string PackDirectory = "Assets/Effect/Textures/"; + + PackRuleResult IPackRule.GetPackRuleResult(PackRuleData data) + { + string assetPath = data.AssetPath; + if (assetPath.StartsWith(PackDirectory) == false) + throw new Exception($"Only support folder : {PackDirectory}"); + + string assetName = Path.GetFileName(assetPath).ToLower(); + string firstChar = assetName.Substring(0, 1); + string bundleName = $"{PackDirectory}effect_texture_{firstChar}"; + var packRuleResult = new PackRuleResult(bundleName, DefaultPackRule.AssetBundleFileExtension); + return packRuleResult; + } +} + +[DisplayName("打包视频（自定义）")] +public class PackVideo : IPackRule +{ + public PackRuleResult GetPackRuleResult(PackRuleData data) + { + string bundleName = RemoveExtension(data.AssetPath); + string fileExtension = Path.GetExtension(data.AssetPath); + fileExtension = fileExtension.Remove(0, 1); + PackRuleResult result = new PackRuleResult(bundleName, fileExtension); + return result; + } + + private string RemoveExtension(string str) + { + if (string.IsNullOrEmpty(str)) + return str; + + int index = str.LastIndexOf("."); + if (index == -1) + return str; + else + return str.Remove(index); //"assets/config/test.unity3d" --> "assets/config/test" + } +} \ No newline at end of file diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageComparator/PackageComparatorWindow.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageComparator/PackageComparatorWindow.cs new file mode 100644 index 000000000..d3b67287a --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageComparator/PackageComparatorWindow.cs @@ -0,0 +1,138 @@ +using System.IO; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEditor; + +namespace YooAsset.Editor +{ + public class PackageComparatorWindow : EditorWindow + { + static PackageComparatorWindow _thisInstance; + + [MenuItem("Tools/补丁包比对工具", false, 102)] + static void ShowWindow() + { + if (_thisInstance == null) + { + _thisInstance = EditorWindow.GetWindow(typeof(PackageComparatorWindow), false, "补丁包比对工具", true) as PackageComparatorWindow; + _thisInstance.minSize = new Vector2(800, 600); + } + _thisInstance.Show(); + } + + private string _manifestPath1 = string.Empty; + private string _manifestPath2 = string.Empty; + private readonly List _changeList = new List(); + private readonly List _newList = new List(); + private Vector2 _scrollPos1; + private Vector2 _scrollPos2; + + private void OnGUI() + { + GUILayout.Space(10); + EditorGUILayout.BeginHorizontal(); + if (GUILayout.Button("选择补丁包1", GUILayout.MaxWidth(150))) + { + string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); + if (string.IsNullOrEmpty(resultPath)) + return; + _manifestPath1 = resultPath; + } + EditorGUILayout.LabelField(_manifestPath1); + EditorGUILayout.EndHorizontal(); + + GUILayout.Space(10); + EditorGUILayout.BeginHorizontal(); + if (GUILayout.Button("选择补丁包2", GUILayout.MaxWidth(150))) + { + string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); + if (string.IsNullOrEmpty(resultPath)) + return; + _manifestPath2 = resultPath; + } + EditorGUILayout.LabelField(_manifestPath2); + EditorGUILayout.EndHorizontal(); + + if (string.IsNullOrEmpty(_manifestPath1) == false && string.IsNullOrEmpty(_manifestPath2) == false) + { + if (GUILayout.Button("比对差异", GUILayout.MaxWidth(150))) + { + ComparePackage(_changeList, _newList); + } + } + + EditorGUILayout.Space(); + using (new EditorGUI.DisabledScope(false)) + { + int totalCount = _changeList.Count; + EditorGUILayout.Foldout(true, $"差异列表 ( {totalCount} )"); + + EditorGUI.indentLevel = 1; + _scrollPos1 = EditorGUILayout.BeginScrollView(_scrollPos1); + { + foreach (var bundle in _changeList) + { + EditorGUILayout.LabelField($"{bundle.BundleName} | {(bundle.FileSize / 1024)}K"); + } + } + EditorGUILayout.EndScrollView(); + EditorGUI.indentLevel = 0; + } + + EditorGUILayout.Space(); + using (new EditorGUI.DisabledScope(false)) + { + int totalCount = _newList.Count; + EditorGUILayout.Foldout(true, $"新增列表 ( {totalCount} )"); + + EditorGUI.indentLevel = 1; + _scrollPos2 = EditorGUILayout.BeginScrollView(_scrollPos2); + { + foreach (var bundle in _newList) + { + EditorGUILayout.LabelField($"{bundle.BundleName}"); + } + } + EditorGUILayout.EndScrollView(); + EditorGUI.indentLevel = 0; + } + } + + private void ComparePackage(List changeList, List newList) + { + changeList.Clear(); + newList.Clear(); + + // 加载补丁清单1 + byte[] bytesData1 = FileUtility.ReadAllBytes(_manifestPath1); + PackageManifest manifest1 = ManifestTools.DeserializeFromBinary(bytesData1); + + // 加载补丁清单1 + byte[] bytesData2 = FileUtility.ReadAllBytes(_manifestPath2); + PackageManifest manifest2 = ManifestTools.DeserializeFromBinary(bytesData2); + + // 拷贝文件列表 + foreach (var bundle2 in manifest2.BundleList) + { + if (manifest1.TryGetPackageBundleByBundleName(bundle2.BundleName, out PackageBundle bundle1)) + { + if (bundle2.FileHash != bundle1.FileHash) + { + changeList.Add(bundle2); + } + } + else + { + newList.Add(bundle2); + } + } + + // 按字母重新排序 + changeList.Sort((x, y) => string.Compare(x.BundleName, y.BundleName)); + newList.Sort((x, y) => string.Compare(x.BundleName, y.BundleName)); + + Debug.Log("资源包差异比对完成！"); + } + } +} diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageImporter/PackageImporterWindow.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageImporter/PackageImporterWindow.cs new file mode 100644 index 000000000..690a7f810 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/PackageImporter/PackageImporterWindow.cs @@ -0,0 +1,91 @@ +using System.IO; +using UnityEngine; +using UnityEditor; + +namespace YooAsset.Editor +{ + public class PackageImporterWindow : EditorWindow + { + static PackageImporterWindow _thisInstance; + + [MenuItem("Tools/补丁包导入工具", false, 101)] + static void ShowWindow() + { + if (_thisInstance == null) + { + _thisInstance = EditorWindow.GetWindow(typeof(PackageImporterWindow), false, "补丁包导入工具", true) as PackageImporterWindow; + _thisInstance.minSize = new Vector2(800, 600); + } + _thisInstance.Show(); + } + + private string _manifestPath = string.Empty; + private string _packageName = "DefaultPackage"; + + private void OnGUI() + { + GUILayout.Space(10); + EditorGUILayout.BeginHorizontal(); + if (GUILayout.Button("选择补丁包", GUILayout.MaxWidth(150))) + { + string resultPath = EditorUtility.OpenFilePanel("Find", "Assets/", "bytes"); + if (string.IsNullOrEmpty(resultPath)) + return; + _manifestPath = resultPath; + } + EditorGUILayout.LabelField(_manifestPath); + EditorGUILayout.EndHorizontal(); + + if (string.IsNullOrEmpty(_manifestPath) == false) + { + if (GUILayout.Button("导入补丁包（全部文件）", GUILayout.MaxWidth(150))) + { + string streamingAssetsRoot = AssetBundleBuilderHelper.GetStreamingAssetsRoot(); + EditorTools.ClearFolder(streamingAssetsRoot); + CopyPackageFiles(_manifestPath); + } + } + } + + private void CopyPackageFiles(string manifestFilePath) + { + string manifestFileName = Path.GetFileNameWithoutExtension(manifestFilePath); + string outputDirectory = Path.GetDirectoryName(manifestFilePath); + + // 加载补丁清单 + byte[] bytesData = FileUtility.ReadAllBytes(manifestFilePath); + PackageManifest manifest = ManifestTools.DeserializeFromBinary(bytesData); + + // 拷贝核心文件 + { + string sourcePath = $"{outputDirectory}/{manifestFileName}.bytes"; + string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{manifestFileName}.bytes"; + EditorTools.CopyFile(sourcePath, destPath, true); + } + { + string sourcePath = $"{outputDirectory}/{manifestFileName}.hash"; + string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{manifestFileName}.hash"; + EditorTools.CopyFile(sourcePath, destPath, true); + } + { + string fileName = YooAssetSettingsData.GetPackageVersionFileName(manifest.PackageName); + string sourcePath = $"{outputDirectory}/{fileName}"; + string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{fileName}"; + EditorTools.CopyFile(sourcePath, destPath, true); + } + + // 拷贝文件列表 + int fileCount = 0; + foreach (var packageBundle in manifest.BundleList) + { + fileCount++; + string sourcePath = $"{outputDirectory}/{packageBundle.FileName}"; + string destPath = $"{AssetBundleBuilderHelper.GetStreamingAssetsRoot()}/{_packageName}/{packageBundle.FileName}"; + EditorTools.CopyFile(sourcePath, destPath, true); + } + + Debug.Log($"补丁包拷贝完成，一共拷贝了{fileCount}个资源文件"); + AssetDatabase.Refresh(); + } + } +} \ No newline at end of file diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs new file mode 100644 index 000000000..7345fbf91 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionHelper.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEditor; +using YooAsset.Editor; + +public static class ShaderVariantCollectionHelper +{ + public static void ClearCurrentShaderVariantCollection() + { + EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "ClearCurrentShaderVariantCollection"); + } + public static void SaveCurrentShaderVariantCollection(string savePath) + { + EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "SaveCurrentShaderVariantCollection", savePath); + } + public static int GetCurrentShaderVariantCollectionShaderCount() + { + return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionShaderCount"); + } + public static int GetCurrentShaderVariantCollectionVariantCount() + { + return (int)EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetCurrentShaderVariantCollectionVariantCount"); + } + + /// + /// 获取着色器的变种总数量 + /// + public static string GetShaderVariantCount(string assetPath) + { + Shader shader = AssetDatabase.LoadAssetAtPath(assetPath); + var variantCount = EditorTools.InvokeNonPublicStaticMethod(typeof(ShaderUtil), "GetVariantCount", shader, true); + return variantCount.ToString(); + } +} \ No newline at end of file diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs new file mode 100644 index 000000000..73f7b7833 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectionManifest.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEditor; + +[Serializable] +public class ShaderVariantCollectionManifest +{ + [Serializable] + public class ShaderVariantElement + { + /// + /// Pass type to use in this variant. + /// + public PassType PassType; + + /// + /// Array of shader keywords to use in this variant. + /// + public string[] Keywords; + } + + [Serializable] + public class ShaderVariantInfo + { + /// + /// 着色器资源路径. + /// + public string AssetPath; + + /// + /// 着色器名称 + /// + public string ShaderName; + + /// + /// 着色器变种总数 + /// + public int ShaderVariantCount = 0; + + /// + /// 着色器变种列表 + /// + public List ShaderVariantElements = new List(1000); + } + + + /// + /// Number of shaders in this collection + /// + public int ShaderTotalCount; + + /// + /// Number of total varians in this collection + /// + public int VariantTotalCount; + + /// + /// Shader variants info list. + /// + public List ShaderVariantInfos = new List(1000); + + /// + /// 添加着色器变种信息 + /// + public void AddShaderVariant(string assetPath, string shaderName, PassType passType, string[] keywords) + { + var info = GetOrCreateShaderVariantInfo(assetPath, shaderName); + ShaderVariantElement element = new ShaderVariantElement(); + element.PassType = passType; + element.Keywords = keywords; + info.ShaderVariantElements.Add(element); + info.ShaderVariantCount++; + } + private ShaderVariantInfo GetOrCreateShaderVariantInfo(string assetPath, string shaderName) + { + var selectList = ShaderVariantInfos.Where(t => t.ShaderName == shaderName && t.AssetPath == assetPath).ToList(); + if (selectList.Count == 0) + { + ShaderVariantInfo newInfo = new ShaderVariantInfo(); + newInfo.AssetPath = assetPath; + newInfo.ShaderName = shaderName; + ShaderVariantInfos.Add(newInfo); + return newInfo; + } + + if (selectList.Count != 1) + throw new Exception("Should never get here !"); + + return selectList[0]; + } + + + /// + /// 解析SVC文件并将数据写入到清单 + /// + public static ShaderVariantCollectionManifest Extract(ShaderVariantCollection svc) + { + var manifest = new ShaderVariantCollectionManifest(); + manifest.ShaderTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionShaderCount(); + manifest.VariantTotalCount = ShaderVariantCollectionHelper.GetCurrentShaderVariantCollectionVariantCount(); + + using (var so = new SerializedObject(svc)) + { + var shaderArray = so.FindProperty("m_Shaders.Array"); + if (shaderArray != null && shaderArray.isArray) + { + for (int i = 0; i < shaderArray.arraySize; ++i) + { + var shaderRef = shaderArray.FindPropertyRelative($"data[{i}].first"); + var shaderVariantsArray = shaderArray.FindPropertyRelative($"data[{i}].second.variants"); + if (shaderRef != null && shaderRef.propertyType == SerializedPropertyType.ObjectReference && shaderVariantsArray != null && shaderVariantsArray.isArray) + { + var shader = shaderRef.objectReferenceValue as Shader; + if (shader == null) + { + throw new Exception("Invalid shader in ShaderVariantCollection file."); + } + + string shaderAssetPath = AssetDatabase.GetAssetPath(shader); + string shaderName = shader.name; + + // 添加变种信息 + for (int j = 0; j < shaderVariantsArray.arraySize; ++j) + { + var propKeywords = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].keywords"); + var propPassType = shaderVariantsArray.FindPropertyRelative($"Array.data[{j}].passType"); + if (propKeywords != null && propPassType != null && propKeywords.propertyType == SerializedPropertyType.String) + { + string[] keywords = propKeywords.stringValue.Split(' '); + PassType pathType = (PassType)propPassType.intValue; + manifest.AddShaderVariant(shaderAssetPath, shaderName, pathType, keywords); + } + } + } + } + } + } + + return manifest; + } +} \ No newline at end of file diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollector.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollector.cs new file mode 100644 index 000000000..5a9536730 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollector.cs @@ -0,0 +1,256 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.IO; +using UnityEngine; +using UnityEditor; +using UnityEditor.SceneManagement; +using YooAsset.Editor; +using Debug = UnityEngine.Debug; + +public static class ShaderVariantCollector +{ + private enum ESteps + { + None, + Prepare, + CollectAllMaterial, + CollectVariants, + CollectSleeping, + WaitingDone, + } + + private const float WaitMilliseconds = 1000f; + private const float SleepMilliseconds = 100f; + private static string _savePath; + private static string _packageName; + private static int _processMaxNum; + private static Action _completedCallback; + + private static ESteps _steps = ESteps.None; + private static Stopwatch _elapsedTime; + private static List _allMaterials; + private static List _allSpheres = new List(1000); + + + /// + /// 开始收集 + /// + public static void Run(string savePath, string packageName, int processMaxNum, Action completedCallback) + { + if (_steps != ESteps.None) + return; + + if (Path.HasExtension(savePath) == false) + savePath = $"{savePath}.shadervariants"; + if (Path.GetExtension(savePath) != ".shadervariants") + throw new System.Exception("Shader variant file extension is invalid."); + if (string.IsNullOrEmpty(packageName)) + throw new System.Exception("Package name is null or empty !"); + + // 注意：先删除再保存，否则ShaderVariantCollection内容将无法及时刷新 + AssetDatabase.DeleteAsset(savePath); + EditorTools.CreateFileDirectory(savePath); + _savePath = savePath; + _packageName = packageName; + _processMaxNum = processMaxNum; + _completedCallback = completedCallback; + + // 聚焦到游戏窗口 + EditorTools.FocusUnityGameWindow(); + + // 创建临时测试场景 + CreateTempScene(); + + _steps = ESteps.Prepare; + EditorApplication.update += EditorUpdate; + } + + private static void EditorUpdate() + { + if (_steps == ESteps.None) + return; + + if (_steps == ESteps.Prepare) + { + ShaderVariantCollectionHelper.ClearCurrentShaderVariantCollection(); + _steps = ESteps.CollectAllMaterial; + return; //等待一帧 + } + + if (_steps == ESteps.CollectAllMaterial) + { + _allMaterials = GetAllMaterials(); + _steps = ESteps.CollectVariants; + return; //等待一帧 + } + + if (_steps == ESteps.CollectVariants) + { + int count = Mathf.Min(_processMaxNum, _allMaterials.Count); + List range = _allMaterials.GetRange(0, count); + _allMaterials.RemoveRange(0, count); + CollectVariants(range); + + if (_allMaterials.Count > 0) + { + _elapsedTime = Stopwatch.StartNew(); + _steps = ESteps.CollectSleeping; + } + else + { + _elapsedTime = Stopwatch.StartNew(); + _steps = ESteps.WaitingDone; + } + } + + if (_steps == ESteps.CollectSleeping) + { + if (_elapsedTime.ElapsedMilliseconds > SleepMilliseconds) + { + DestroyAllSpheres(); + _elapsedTime.Stop(); + _steps = ESteps.CollectVariants; + } + } + + if (_steps == ESteps.WaitingDone) + { + // 注意：一定要延迟保存才会起效 + if (_elapsedTime.ElapsedMilliseconds > WaitMilliseconds) + { + _elapsedTime.Stop(); + _steps = ESteps.None; + + // 保存结果并创建清单 + ShaderVariantCollectionHelper.SaveCurrentShaderVariantCollection(_savePath); + CreateManifest(); + + Debug.Log($"搜集SVC完毕！"); + EditorApplication.update -= EditorUpdate; + _completedCallback?.Invoke(); + } + } + } + private static void CreateTempScene() + { + EditorSceneManager.NewScene(NewSceneSetup.DefaultGameObjects); + } + private static List GetAllMaterials() + { + int progressValue = 0; + List allAssets = new List(1000); + + // 获取所有打包的资源 + CollectResult collectResult = AssetBundleCollectorSettingData.Setting.GetPackageAssets(EBuildMode.DryRunBuild, _packageName); + foreach (var assetInfo in collectResult.CollectAssets) + { + string[] depends = AssetDatabase.GetDependencies(assetInfo.AssetInfo.AssetPath, true); + foreach (var dependAsset in depends) + { + if (allAssets.Contains(dependAsset) == false) + allAssets.Add(dependAsset); + } + EditorTools.DisplayProgressBar("获取所有打包资源", ++progressValue, collectResult.CollectAssets.Count); + } + EditorTools.ClearProgressBar(); + + // 搜集所有材质球 + progressValue = 0; + List allMaterial = new List(1000); + foreach (var assetPath in allAssets) + { + System.Type assetType = AssetDatabase.GetMainAssetTypeAtPath(assetPath); + if (assetType == typeof(UnityEngine.Material)) + { + allMaterial.Add(assetPath); + } + EditorTools.DisplayProgressBar("搜集所有材质球", ++progressValue, allAssets.Count); + } + EditorTools.ClearProgressBar(); + + // 返回结果 + return allMaterial; + } + private static void CollectVariants(List materials) + { + Camera camera = Camera.main; + if (camera == null) + throw new System.Exception("Not found main camera."); + + // 设置主相机 + float aspect = camera.aspect; + int totalMaterials = materials.Count; + float height = Mathf.Sqrt(totalMaterials / aspect) + 1; + float width = Mathf.Sqrt(totalMaterials / aspect) * aspect + 1; + float halfHeight = Mathf.CeilToInt(height / 2f); + float halfWidth = Mathf.CeilToInt(width / 2f); + camera.orthographic = true; + camera.orthographicSize = halfHeight; + camera.transform.position = new Vector3(0f, 0f, -10f); + + // 创建测试球体 + int xMax = (int)(width - 1); + int x = 0, y = 0; + int progressValue = 0; + for (int i = 0; i < materials.Count; i++) + { + var material = materials[i]; + var position = new Vector3(x - halfWidth + 1f, y - halfHeight + 1f, 0f); + var go = CreateSphere(material, position, i); + if (go != null) + _allSpheres.Add(go); + if (x == xMax) + { + x = 0; + y++; + } + else + { + x++; + } + EditorTools.DisplayProgressBar("照射所有材质球", ++progressValue, materials.Count); + } + EditorTools.ClearProgressBar(); + } + private static GameObject CreateSphere(string assetPath, Vector3 position, int index) + { + var material = AssetDatabase.LoadAssetAtPath(assetPath); + var shader = material.shader; + if (shader == null) + return null; + + var go = GameObject.CreatePrimitive(PrimitiveType.Sphere); + go.GetComponent().sharedMaterial = material; + go.transform.position = position; + go.name = $"Sphere_{index} | {material.name}"; + return go; + } + private static void DestroyAllSpheres() + { + foreach (var go in _allSpheres) + { + GameObject.DestroyImmediate(go); + } + _allSpheres.Clear(); + + // 尝试释放编辑器加载的资源 + EditorUtility.UnloadUnusedAssetsImmediate(true); + } + private static void CreateManifest() + { + AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate); + + ShaderVariantCollection svc = AssetDatabase.LoadAssetAtPath(_savePath); + if (svc != null) + { + var wrapper = ShaderVariantCollectionManifest.Extract(svc); + string jsonData = JsonUtility.ToJson(wrapper, true); + string savePath = _savePath.Replace(".shadervariants", ".json"); + File.WriteAllText(savePath, jsonData); + } + + AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate); + } +} \ No newline at end of file diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs new file mode 100644 index 000000000..62fecc014 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorSetting.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using UnityEditor; + +public class ShaderVariantCollectorSetting : ScriptableObject +{ + private const string DefaultSavePath = "Assets/MyShaderVariants.shadervariants"; + + public static string GeFileSavePath(string packageName) + { + string key = $"{Application.productName}_{packageName}_GeFileSavePath"; + return EditorPrefs.GetString(key, DefaultSavePath); + } + public static void SetFileSavePath(string packageName, string savePath) + { + string key = $"{Application.productName}_{packageName}_GeFileSavePath"; + EditorPrefs.SetString(key, savePath); + } + + public static int GeProcessCapacity(string packageName) + { + string key = $"{Application.productName}_{packageName}_GeProcessCapacity"; + return EditorPrefs.GetInt(key, 1000); + } + public static void SetProcessCapacity(string packageName, int capacity) + { + string key = $"{Application.productName}_{packageName}_GeProcessCapacity"; + EditorPrefs.SetInt(key, capacity); + } +} \ No newline at end of file diff --git a/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs new file mode 100644 index 000000000..1120d6108 --- /dev/null +++ b/Assets/Samples/YooAsset/2.1.1/Extension Sample/Scripts/Editor/ShaderVariantCollector/ShaderVariantCollectorWindow.cs @@ -0,0 +1,150 @@ +#if UNITY_2019_4_OR_NEWER +using System; +using System.Linq; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; +using UnityEditor.UIElements; +using UnityEngine.UIElements; +using YooAsset.Editor; + +public class ShaderVariantCollectorWindow : EditorWindow +{ + [MenuItem("Tools/着色器变种收集器", false, 100)] + public static void OpenWindow() + { + ShaderVariantCollectorWindow window = GetWindow("着色器变种收集工具", true); + window.minSize = new Vector2(800, 600); + } + + private Button _collectButton; + private TextField _collectOutputField; + private Label _currentShaderCountField; + private Label _currentVariantCountField; + private SliderInt _processCapacitySlider; + private PopupField _packageField; + + private List _packageNames; + private string _currentPackageName; + + public void CreateGUI() + { + try + { + VisualElement root = this.rootVisualElement; + + // 加载布局文件 + var visualAsset = UxmlLoader.LoadWindowUXML(); + if (visualAsset == null) + return; + + visualAsset.CloneTree(root); + + // 包裹名称列表 + _packageNames = GetBuildPackageNames(); + _currentPackageName = _packageNames[0]; + + // 文件输出目录 + _collectOutputField = root.Q("CollectOutput"); + _collectOutputField.SetValueWithoutNotify(ShaderVariantCollectorSetting.GeFileSavePath(_currentPackageName)); + _collectOutputField.RegisterValueChangedCallback(evt => + { + ShaderVariantCollectorSetting.SetFileSavePath(_currentPackageName, _collectOutputField.value); + }); + + // 收集的包裹 + var packageContainer = root.Q("PackageContainer"); + if (_packageNames.Count > 0) + { + int defaultIndex = GetDefaultPackageIndex(_currentPackageName); + _packageField = new PopupField(_packageNames, defaultIndex); + _packageField.label = "Package"; + _packageField.style.width = 350; + _packageField.RegisterValueChangedCallback(evt => + { + _currentPackageName = _packageField.value; + }); + packageContainer.Add(_packageField); + } + else + { + _packageField = new PopupField(); + _packageField.label = "Package"; + _packageField.style.width = 350; + packageContainer.Add(_packageField); + } + + // 容器值 + _processCapacitySlider = root.Q("ProcessCapacity"); + _processCapacitySlider.SetValueWithoutNotify(ShaderVariantCollectorSetting.GeProcessCapacity(_currentPackageName)); +#if !UNITY_2020_3_OR_NEWER + _processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})"; + _processCapacitySlider.RegisterValueChangedCallback(evt => + { + ShaderVariantCollectorSetting.SetProcessCapacity(_currentPackageName, _processCapacitySlider.value); + _processCapacitySlider.label = $"Capacity ({_processCapacitySlider.value})"; + }); +#else + _processCapacitySlider.RegisterValueChangedCallback(evt => + { + ShaderVariantCollectorSetting.SetProcessCapacity(_currentPackageName, _processCapacitySlider.value); + }); +#endif + + _currentShaderCountField = root.Q