diff --git a/Assets/Assets/Prefab/BigEnvironment/NightCity.meta b/Assets/Assets/Prefab/BigEnvironment/NightCity.meta new file mode 100644 index 0000000..21b4729 --- /dev/null +++ b/Assets/Assets/Prefab/BigEnvironment/NightCity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c8df63998cc5114f9704b379f7888f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/Prefab/BigEnvironment/CityScene1.prefab b/Assets/Assets/Prefab/BigEnvironment/NightCity/CityScene1.prefab similarity index 100% rename from Assets/Assets/Prefab/BigEnvironment/CityScene1.prefab rename to Assets/Assets/Prefab/BigEnvironment/NightCity/CityScene1.prefab diff --git a/Assets/Assets/Prefab/BigEnvironment/CityScene1.prefab.meta b/Assets/Assets/Prefab/BigEnvironment/NightCity/CityScene1.prefab.meta similarity index 100% rename from Assets/Assets/Prefab/BigEnvironment/CityScene1.prefab.meta rename to Assets/Assets/Prefab/BigEnvironment/NightCity/CityScene1.prefab.meta diff --git a/Assets/Assets/Prefab/BigEnvironment/UnityTerrain.meta b/Assets/Assets/Prefab/BigEnvironment/UnityTerrain.meta new file mode 100644 index 0000000..cbe0364 --- /dev/null +++ b/Assets/Assets/Prefab/BigEnvironment/UnityTerrain.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd3ca46206991204b8f32f9906fad91d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/Prefab/BigEnvironment/TerrainScene1.prefab b/Assets/Assets/Prefab/BigEnvironment/UnityTerrain/TerrainScene1.prefab similarity index 100% rename from Assets/Assets/Prefab/BigEnvironment/TerrainScene1.prefab rename to Assets/Assets/Prefab/BigEnvironment/UnityTerrain/TerrainScene1.prefab diff --git a/Assets/Assets/Prefab/BigEnvironment/TerrainScene1.prefab.meta b/Assets/Assets/Prefab/BigEnvironment/UnityTerrain/TerrainScene1.prefab.meta similarity index 100% rename from Assets/Assets/Prefab/BigEnvironment/TerrainScene1.prefab.meta rename to Assets/Assets/Prefab/BigEnvironment/UnityTerrain/TerrainScene1.prefab.meta diff --git a/Assets/Assets/Prefab/Particles/AoE effects/AoE slash blue.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/AoE slash blue.prefab.meta index 1a028a6..3ff09a0 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/AoE slash blue.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/AoE slash blue.prefab.meta @@ -3,5 +3,5 @@ guid: 60452087adf370e4ab7311d4d0f89610 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/AoE slash green.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/AoE slash green.prefab.meta index b9c71c7..d687e79 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/AoE slash green.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/AoE slash green.prefab.meta @@ -3,5 +3,5 @@ guid: b8ba33b60f1077a4e8e86ede7a7dfbc0 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/AoE slash orange.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/AoE slash orange.prefab.meta index 085be38..53f4bc7 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/AoE slash orange.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/AoE slash orange.prefab.meta @@ -3,5 +3,5 @@ guid: 0de95d1d11f8f0644b750f69a3a45b29 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade 2.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade 2.prefab.meta index e1cc11a..97b4a61 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade 2.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade 2.prefab.meta @@ -3,5 +3,5 @@ guid: d1456bed315703b42a39352ec0be892d PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade.prefab.meta index 9a5a870..5a742c8 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Crystals crossfade.prefab.meta @@ -3,5 +3,5 @@ guid: 4e99eebef8e713d42af2b6d59ad53697 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Crystals front attack.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Crystals front attack.prefab.meta index 02184aa..e7425e6 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Crystals front attack.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Crystals front attack.prefab.meta @@ -3,5 +3,5 @@ guid: acbf735db00b0244cbf9f89d2799949f PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Ground AOE explosion.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Ground AOE explosion.prefab.meta index 588308e..e417ce7 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Ground AOE explosion.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Ground AOE explosion.prefab.meta @@ -3,5 +3,5 @@ guid: 7431a2e38c768004eb82284983fe33b1 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Laser AOE.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Laser AOE.prefab.meta index aa136ee..cc20bd5 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Laser AOE.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Laser AOE.prefab.meta @@ -3,5 +3,5 @@ guid: a02ab2e7dc24cf2498f0e48450b71ccb PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Meteors AOE.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Meteors AOE.prefab.meta index 5ac2bef..f0e0519 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Meteors AOE.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Meteors AOE.prefab.meta @@ -3,5 +3,5 @@ guid: 7f8b11e560d80174f981971da302d0d7 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Plexus AoE.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Plexus AoE.prefab.meta index f922177..11e94b8 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Plexus AoE.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Plexus AoE.prefab.meta @@ -3,5 +3,5 @@ guid: f07ef9f322d4cb54b88fa4d251a6e524 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Red energy explosion.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Red energy explosion.prefab.meta index f81627d..e2ed3e9 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Red energy explosion.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Red energy explosion.prefab.meta @@ -3,5 +3,5 @@ guid: e96497b7a17d73c44b57bcac94501af1 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Smoke AOE explosion.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Smoke AOE explosion.prefab.meta index ef0f7c0..17a4173 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Smoke AOE explosion.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Smoke AOE explosion.prefab.meta @@ -3,5 +3,5 @@ guid: 46e0917220767f84a9e72de70f66355f PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/AoE effects/Snow AOE.prefab.meta b/Assets/Assets/Prefab/Particles/AoE effects/Snow AOE.prefab.meta index d793dd3..73781d0 100644 --- a/Assets/Assets/Prefab/Particles/AoE effects/Snow AOE.prefab.meta +++ b/Assets/Assets/Prefab/Particles/AoE effects/Snow AOE.prefab.meta @@ -3,5 +3,5 @@ guid: 9a96eb3d45d99774c9d8c0263fc0ff97 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: aoe_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Buff.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Buff.prefab.meta index 6a194d0..d95e487 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Buff.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Buff.prefab.meta @@ -3,5 +3,5 @@ guid: 74a45e939f019a44e9fa15bd3f76243b PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Debuff.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Debuff.prefab.meta index dbde157..a014d4f 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Debuff.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Debuff.prefab.meta @@ -3,5 +3,5 @@ guid: 9bbaa2224edd0314a86954ca18687e17 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Healing.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Healing.prefab.meta index 828a8ab..08e8085 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Healing.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Healing.prefab.meta @@ -3,5 +3,5 @@ guid: 2a0e2540a3950164fb777088729d2847 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Lightning aura.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Lightning aura.prefab.meta index 9f01d10..08d5c29 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Lightning aura.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Lightning aura.prefab.meta @@ -3,5 +3,5 @@ guid: 9295d57e97151314a80943592750cbda PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Love aura.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Love aura.prefab.meta index a3f0b45..9fece6e 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Love aura.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Love aura.prefab.meta @@ -3,5 +3,5 @@ guid: c36e8f631d2d7dc429df3c6186c53234 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Plexus.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Plexus.prefab.meta index 430009a..01c14f0 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Plexus.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Plexus.prefab.meta @@ -3,5 +3,5 @@ guid: d20cfd9d000501e48b06e384b30ba5d7 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Character auras/Star aura.prefab.meta b/Assets/Assets/Prefab/Particles/Character auras/Star aura.prefab.meta index 71975e7..8fa95eb 100644 --- a/Assets/Assets/Prefab/Particles/Character auras/Star aura.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Character auras/Star aura.prefab.meta @@ -3,5 +3,5 @@ guid: 193ea807ebd6fb4458aba82be930314f PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: character_auras assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Electro hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Electro hit.prefab.meta index c5ae0fa..70c1ac3 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Electro hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Electro hit.prefab.meta @@ -3,5 +3,5 @@ guid: 702b54ac50fe60749bcfd47108b3afff PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Explosion.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Explosion.prefab.meta index 953e558..39ae165 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Explosion.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Explosion.prefab.meta @@ -3,5 +3,5 @@ guid: f2afde4d4b9ac7b49a74b4a959b2c9a7 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Green hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Green hit.prefab.meta index 07d08eb..737ac10 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Green hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Green hit.prefab.meta @@ -3,5 +3,5 @@ guid: 758db589664bcd8428780fdfa993ca4c PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Holy hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Holy hit.prefab.meta index b5027de..05ba64c 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Holy hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Holy hit.prefab.meta @@ -3,5 +3,5 @@ guid: 7c4b7b1b80c86af499a6f0119f6afda1 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Love hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Love hit.prefab.meta index 56cc374..d19fdd0 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Love hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Love hit.prefab.meta @@ -3,5 +3,5 @@ guid: ee9a192a089728a4b91679fb2873dd6b PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Snow hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Snow hit.prefab.meta index 260000e..a3778b8 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Snow hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Snow hit.prefab.meta @@ -3,5 +3,5 @@ guid: 1befd4fadeb3158419db2ffac2e6f5ff PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Star hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Star hit.prefab.meta index 63317aa..b7688a7 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Star hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Star hit.prefab.meta @@ -3,5 +3,5 @@ guid: 96cf9617d49c21445865ef9099edc4d0 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Hits and explosions/Stones hit.prefab.meta b/Assets/Assets/Prefab/Particles/Hits and explosions/Stones hit.prefab.meta index d415c20..2e95900 100644 --- a/Assets/Assets/Prefab/Particles/Hits and explosions/Stones hit.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Hits and explosions/Stones hit.prefab.meta @@ -3,5 +3,5 @@ guid: 36299255fb8a3a145856c25cee966c03 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: hits_and_explosions assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Magic circles/Freeze circle.prefab.meta b/Assets/Assets/Prefab/Particles/Magic circles/Freeze circle.prefab.meta index 08d14b0..2606169 100644 --- a/Assets/Assets/Prefab/Particles/Magic circles/Freeze circle.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Magic circles/Freeze circle.prefab.meta @@ -3,5 +3,5 @@ guid: 1e60b7d8b0a54cb4d88e75a920c56687 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: magic_circles assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Magic circles/Healing circle.prefab.meta b/Assets/Assets/Prefab/Particles/Magic circles/Healing circle.prefab.meta index 54526d8..b8e1760 100644 --- a/Assets/Assets/Prefab/Particles/Magic circles/Healing circle.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Magic circles/Healing circle.prefab.meta @@ -3,5 +3,5 @@ guid: b2712e34cc581474cacea6818bf33baf PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: magic_circles assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Magic circles/Magic circle 2.prefab.meta b/Assets/Assets/Prefab/Particles/Magic circles/Magic circle 2.prefab.meta index 3f6d68a..d08fe04 100644 --- a/Assets/Assets/Prefab/Particles/Magic circles/Magic circle 2.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Magic circles/Magic circle 2.prefab.meta @@ -3,5 +3,5 @@ guid: cbed276d748c7b849ae4c42cf13eda6f PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: magic_circles assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Magic circles/Magic circle.prefab.meta b/Assets/Assets/Prefab/Particles/Magic circles/Magic circle.prefab.meta index b92b6c5..bf1973f 100644 --- a/Assets/Assets/Prefab/Particles/Magic circles/Magic circle.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Magic circles/Magic circle.prefab.meta @@ -3,5 +3,5 @@ guid: ebfe9d06f02c9d34ab8847c353ab43fa PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: magic_circles assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Portals/Portal blue.prefab.meta b/Assets/Assets/Prefab/Particles/Portals/Portal blue.prefab.meta index 75c364e..e54b176 100644 --- a/Assets/Assets/Prefab/Particles/Portals/Portal blue.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Portals/Portal blue.prefab.meta @@ -3,5 +3,5 @@ guid: 48efc1a8f12f53c45ab5b252643b33a4 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: portals assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Portals/Portal green.prefab.meta b/Assets/Assets/Prefab/Particles/Portals/Portal green.prefab.meta index 106136d..a4f889f 100644 --- a/Assets/Assets/Prefab/Particles/Portals/Portal green.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Portals/Portal green.prefab.meta @@ -3,5 +3,5 @@ guid: 579802ea806917a42a0466820d3ce4ee PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: portals assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Portals/Portal red.prefab.meta b/Assets/Assets/Prefab/Particles/Portals/Portal red.prefab.meta index c73c4bd..77ff1e3 100644 --- a/Assets/Assets/Prefab/Particles/Portals/Portal red.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Portals/Portal red.prefab.meta @@ -3,5 +3,5 @@ guid: f2b486a1c0f06a04e8c345235064a331 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: portals assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Portals/Portal yellow.prefab.meta b/Assets/Assets/Prefab/Particles/Portals/Portal yellow.prefab.meta index ed29699..1971d87 100644 --- a/Assets/Assets/Prefab/Particles/Portals/Portal yellow.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Portals/Portal yellow.prefab.meta @@ -3,5 +3,5 @@ guid: a214dfbc5fffb494c9fef2596135253c PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: portals assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Slash effects/Charge slash blue.prefab.meta b/Assets/Assets/Prefab/Particles/Slash effects/Charge slash blue.prefab.meta index f4e86c7..0b971a7 100644 --- a/Assets/Assets/Prefab/Particles/Slash effects/Charge slash blue.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Slash effects/Charge slash blue.prefab.meta @@ -3,5 +3,5 @@ guid: a326a54672e839f428aac1120cdbc433 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: slash_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Slash effects/Charge slash purple.prefab.meta b/Assets/Assets/Prefab/Particles/Slash effects/Charge slash purple.prefab.meta index ef3fe96..2971c07 100644 --- a/Assets/Assets/Prefab/Particles/Slash effects/Charge slash purple.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Slash effects/Charge slash purple.prefab.meta @@ -3,5 +3,5 @@ guid: da98ffcff758db04c84dc63a168319eb PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: slash_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Slash effects/Charge slash red.prefab.meta b/Assets/Assets/Prefab/Particles/Slash effects/Charge slash red.prefab.meta index eb239e4..d3cc100 100644 --- a/Assets/Assets/Prefab/Particles/Slash effects/Charge slash red.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Slash effects/Charge slash red.prefab.meta @@ -3,5 +3,5 @@ guid: 6a6c6ebd203b8174993f8defc05d62e3 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: slash_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Slash effects/Electro slash.prefab.meta b/Assets/Assets/Prefab/Particles/Slash effects/Electro slash.prefab.meta index fa42ba0..60f9bb2 100644 --- a/Assets/Assets/Prefab/Particles/Slash effects/Electro slash.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Slash effects/Electro slash.prefab.meta @@ -3,5 +3,5 @@ guid: d2fff03d3e9ff43409ce5935e0f4519f PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: slash_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Slash effects/Snow slash.prefab.meta b/Assets/Assets/Prefab/Particles/Slash effects/Snow slash.prefab.meta index 8989f06..1c7ca69 100644 --- a/Assets/Assets/Prefab/Particles/Slash effects/Snow slash.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Slash effects/Snow slash.prefab.meta @@ -3,5 +3,5 @@ guid: 1663473351a454d4cacd5facbca5a216 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: slash_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Slash effects/Stone slash.prefab.meta b/Assets/Assets/Prefab/Particles/Slash effects/Stone slash.prefab.meta index 1b191bd..3467d77 100644 --- a/Assets/Assets/Prefab/Particles/Slash effects/Stone slash.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Slash effects/Stone slash.prefab.meta @@ -3,5 +3,5 @@ guid: 4000c84c4e3785041a88cfbbb2deeb33 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: slash_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Dust ground.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Dust ground.prefab.meta index 2026560..2caf5b0 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Dust ground.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Dust ground.prefab.meta @@ -3,5 +3,5 @@ guid: 4149adf3ba1727947976a5ccb03c5099 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Dust hemisphere loop.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Dust hemisphere loop.prefab.meta index 835a5e0..d7056ce 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Dust hemisphere loop.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Dust hemisphere loop.prefab.meta @@ -3,5 +3,5 @@ guid: 449a9456f2286484db54669223fa5d40 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Dust loop.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Dust loop.prefab.meta index feb83f6..bd1ad13 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Dust loop.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Dust loop.prefab.meta @@ -3,5 +3,5 @@ guid: db9ff06b42a1d084097539cf6ecb8701 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Dust puff.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Dust puff.prefab.meta index 79748cc..6da954e 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Dust puff.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Dust puff.prefab.meta @@ -3,5 +3,5 @@ guid: e0122c12e52f14b41a23e7221d86b68d PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke ground.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke ground.prefab.meta index a63d23d..973a53f 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke ground.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke ground.prefab.meta @@ -3,5 +3,5 @@ guid: 03aa7733806268145a45709c1eae9296 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke hemisphere loop.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke hemisphere loop.prefab.meta index 00366fa..36122b3 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke hemisphere loop.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke hemisphere loop.prefab.meta @@ -3,5 +3,5 @@ guid: ebf0a3e1a8d620b4baa494a1a94ecc5e PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke loop.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke loop.prefab.meta index ffd9809..21a87de 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke loop.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke loop.prefab.meta @@ -3,5 +3,5 @@ guid: ebec5d7603c6b194a88bc9f4f2d46651 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke puff.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke puff.prefab.meta index ed4d4c8..21e8e37 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke puff.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke puff.prefab.meta @@ -3,5 +3,5 @@ guid: 00e3f4220eaa07c4eb12c7688b3f4bfe PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke vortex.prefab.meta b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke vortex.prefab.meta index 90bbb0a..58733e3 100644 --- a/Assets/Assets/Prefab/Particles/Smoke effects/Smoke vortex.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Smoke effects/Smoke vortex.prefab.meta @@ -3,5 +3,5 @@ guid: 935468f3b0fe54944bf3fdb3f044c0f5 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: smoke_effects assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks blue.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks blue.prefab.meta index dbdd881..ebc7890 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks blue.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks blue.prefab.meta @@ -3,5 +3,5 @@ guid: b599d44d6f20a57488525f8dc4d5a097 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode blue.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode blue.prefab.meta index 1a9b5a3..95494d7 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode blue.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode blue.prefab.meta @@ -3,5 +3,5 @@ guid: e3d21bab75e181247b4a560a9adb04c1 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode green.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode green.prefab.meta index b893837..56a7a3d 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode green.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode green.prefab.meta @@ -3,5 +3,5 @@ guid: c4a6c28902216164fa040d3867d14d0a PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode pink.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode pink.prefab.meta index 869cc8d..259e46e 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode pink.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode pink.prefab.meta @@ -3,5 +3,5 @@ guid: 1116b2a722fdac94cbc008cecc0a04a9 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode red.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode red.prefab.meta index a84513b..4c4c46c 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode red.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode red.prefab.meta @@ -3,5 +3,5 @@ guid: 0bef098b298803f4abdb3c97e94c973c PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode white.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode white.prefab.meta index 23a3d4a..58bd6b2 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode white.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode white.prefab.meta @@ -3,5 +3,5 @@ guid: 9f8ec7cb478786b4989f185b2a45c862 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode yellow.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode yellow.prefab.meta index 259a427..addbce2 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks explode yellow.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks explode yellow.prefab.meta @@ -3,5 +3,5 @@ guid: cc79df5a4a7f5294bbf852672c2e6a2b PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing blue.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing blue.prefab.meta index adbf6a3..8bd2f23 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing blue.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing blue.prefab.meta @@ -3,5 +3,5 @@ guid: 039624e2d30b5ef41acff45a5138a90a PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing green.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing green.prefab.meta index 9aa137e..d568c1d 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing green.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing green.prefab.meta @@ -3,5 +3,5 @@ guid: d38a9332d48a7084d83bb617bde700fa PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing pink.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing pink.prefab.meta index 88de897..8e46854 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing pink.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing pink.prefab.meta @@ -3,5 +3,5 @@ guid: 247f2277598c6394db3b710815616286 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing red.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing red.prefab.meta index 500c8e5..e239a88 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing red.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing red.prefab.meta @@ -3,5 +3,5 @@ guid: b6bd9a25e5fbdda409c0217315662f07 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing white.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing white.prefab.meta index fd36d41..9bb9c23 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing white.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing white.prefab.meta @@ -3,5 +3,5 @@ guid: d03c0fc2693fb4a4ca049a21b1e01764 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing yellow.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing yellow.prefab.meta index 2631e8b..8b66947 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing yellow.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks flashing yellow.prefab.meta @@ -3,5 +3,5 @@ guid: e99ae3d51d250274ebccd16e68d1a414 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks green.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks green.prefab.meta index a0436fe..d9126f1 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks green.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks green.prefab.meta @@ -3,5 +3,5 @@ guid: 489fd9f0ad9d8d0419583d339f3b11b4 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks pink.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks pink.prefab.meta index a6da8ee..07c324b 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks pink.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks pink.prefab.meta @@ -3,5 +3,5 @@ guid: 24a04a86a3866e14da15ac93a9205875 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks red.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks red.prefab.meta index 4029f6d..3ffea69 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks red.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks red.prefab.meta @@ -3,5 +3,5 @@ guid: 940be515bfff7a04baef210c7f82c176 PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks white.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks white.prefab.meta index ea1879f..8ce3c90 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks white.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks white.prefab.meta @@ -3,5 +3,5 @@ guid: 2b23239dfa092034f8ebb57b100d23ed PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/Particles/Sparks/Sparks yellow.prefab.meta b/Assets/Assets/Prefab/Particles/Sparks/Sparks yellow.prefab.meta index 824165f..c52cb3f 100644 --- a/Assets/Assets/Prefab/Particles/Sparks/Sparks yellow.prefab.meta +++ b/Assets/Assets/Prefab/Particles/Sparks/Sparks yellow.prefab.meta @@ -3,5 +3,5 @@ guid: 1846a80d65508614d881556c8eff197b PrefabImporter: externalObjects: {} userData: - assetBundleName: particles + assetBundleName: sparks assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire.meta b/Assets/Assets/Prefab/VFX/FX_Fire.meta new file mode 100644 index 0000000..e7629bd --- /dev/null +++ b/Assets/Assets/Prefab/VFX/FX_Fire.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 539ac546caa84774095c711da938a042 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_01.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_01.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_01.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_01.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01.prefab.meta index c3b0fcf..b58e45f 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_01.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01.prefab.meta @@ -3,5 +3,5 @@ guid: b7b9e51b97a0aea4682f92c45d082eca PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_01_2.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01_2.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_01_2.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01_2.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_01_2.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01_2.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_01_2.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01_2.prefab.meta index 2d22311..0e77bad 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_01_2.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_01_2.prefab.meta @@ -3,5 +3,5 @@ guid: 776d22340159044448d007213148bb72 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_02.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_02.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_02.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_02.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02.prefab.meta index bde2d98..4606eaa 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_02.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02.prefab.meta @@ -3,5 +3,5 @@ guid: 31ce43f63178a044ea04230cefdee8fc PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_02_2.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02_2.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_02_2.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02_2.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_02_2.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02_2.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_02_2.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02_2.prefab.meta index 19bb763..1e12dbd 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_02_2.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_02_2.prefab.meta @@ -3,5 +3,5 @@ guid: 345053a0791ad874e8ceee18f5432443 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_03.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_03.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_03.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_03.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03.prefab.meta index 5b300ab..ed1d1e6 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_03.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03.prefab.meta @@ -3,5 +3,5 @@ guid: 1dc303ae5311b6d40ae079359fe82875 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_03_2.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03_2.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_03_2.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03_2.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_03_2.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03_2.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_03_2.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03_2.prefab.meta index 151259f..8f77623 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_03_2.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_03_2.prefab.meta @@ -3,5 +3,5 @@ guid: cc87a81d51f45134590e285d86c72293 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_04.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_04.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_04.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_04.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04.prefab.meta index 9ebc0df..ae9f64a 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_04.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04.prefab.meta @@ -3,5 +3,5 @@ guid: c9cb7ab8ab283c3458ef9132ece54fb3 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_04_2.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04_2.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_04_2.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04_2.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_04_2.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04_2.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_04_2.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04_2.prefab.meta index c9aabb6..fa4e941 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_04_2.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_04_2.prefab.meta @@ -3,5 +3,5 @@ guid: cd50f9be2e297e44ebf725902c190ebf PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_05 _2.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05 _2.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_05 _2.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05 _2.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_05 _2.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05 _2.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_05 _2.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05 _2.prefab.meta index 9cbf8b8..3f22aec 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_05 _2.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05 _2.prefab.meta @@ -3,5 +3,5 @@ guid: 446b29ca04989624694739e049786214 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_05.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_05.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_05.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_05.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05.prefab.meta index 9f703f3..90250e1 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_05.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_05.prefab.meta @@ -3,5 +3,5 @@ guid: 64e69d3822b37b74fab2eb672a992afc PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_06.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_06.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_06.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_06.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06.prefab.meta index 8f0c999..ac40351 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_06.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06.prefab.meta @@ -3,5 +3,5 @@ guid: 17998748ba01a284f879d0c9f85a489b PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_06_2.prefab b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06_2.prefab similarity index 100% rename from Assets/Assets/Prefab/VFX/FX_Fire_06_2.prefab rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06_2.prefab diff --git a/Assets/Assets/Prefab/VFX/FX_Fire_06_2.prefab.meta b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06_2.prefab.meta similarity index 68% rename from Assets/Assets/Prefab/VFX/FX_Fire_06_2.prefab.meta rename to Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06_2.prefab.meta index da84224..0c1e06d 100644 --- a/Assets/Assets/Prefab/VFX/FX_Fire_06_2.prefab.meta +++ b/Assets/Assets/Prefab/VFX/FX_Fire/FX_Fire_06_2.prefab.meta @@ -3,5 +3,5 @@ guid: cd97f044c0637fb48a97931a0a3daf97 PrefabImporter: externalObjects: {} userData: - assetBundleName: - assetBundleVariant: + assetBundleName: fx_fire + assetBundleVariant: ab diff --git a/Assets/Assets/Vom.meta b/Assets/Assets/Volume.meta similarity index 100% rename from Assets/Assets/Vom.meta rename to Assets/Assets/Volume.meta diff --git a/Assets/Assets/Vom/Default.asset b/Assets/Assets/Volume/Default.asset similarity index 57% rename from Assets/Assets/Vom/Default.asset rename to Assets/Assets/Volume/Default.asset index 16c0df9..76211af 100644 --- a/Assets/Assets/Vom/Default.asset +++ b/Assets/Assets/Volume/Default.asset @@ -1,5 +1,51 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6930818438622466647 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bd486065ce11414fa40e631affc4900, type: 3} + m_Name: ProbeVolumesOptions + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.ProbeVolumesOptions + active: 1 + normalBias: + m_OverrideState: 0 + m_Value: 0.05 + viewBias: + m_OverrideState: 0 + m_Value: 0.1 + scaleBiasWithMinProbeDistance: + m_OverrideState: 0 + m_Value: 0 + samplingNoise: + m_OverrideState: 0 + m_Value: 0.1 + animateSamplingNoise: + m_OverrideState: 0 + m_Value: 1 + leakReductionMode: + m_OverrideState: 0 + m_Value: 2 + minValidDotProductValue: + m_OverrideState: 0 + m_Value: 0.1 + occlusionOnlyReflectionNormalization: + m_OverrideState: 0 + m_Value: 1 + intensityMultiplier: + m_OverrideState: 0 + m_Value: 1 + skyOcclusionIntensityMultiplier: + m_OverrideState: 0 + m_Value: 1 + worldOffset: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} --- !u!114 &-3285242745950591362 MonoBehaviour: m_ObjectHideFlags: 3 @@ -20,8 +66,8 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0.9 intensity: - m_OverrideState: 1 - m_Value: 1 + m_OverrideState: 0 + m_Value: 0 scatter: m_OverrideState: 0 m_Value: 0.7 @@ -61,41 +107,47 @@ MonoBehaviour: m_EditorClassIdentifier: active: 1 distance: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 64 baseHeight: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 0 maximumHeight: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 50 enableGround: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 0 groundHeight: m_OverrideState: 0 m_Value: 0 density: - m_OverrideState: 1 - m_Value: 1 + m_OverrideState: 0 + m_Value: 0.2 attenuationDistance: m_OverrideState: 0 m_Value: 128 - enableMainLightContribution: - m_OverrideState: 1 + enableAPVContribution: + m_OverrideState: 0 + m_Value: 0 + APVContributionWeight: + m_OverrideState: 0 m_Value: 1 + enableMainLightContribution: + m_OverrideState: 0 + m_Value: 0 anisotropy: m_OverrideState: 0 m_Value: 0.4 scattering: - m_OverrideState: 1 - m_Value: 1 + m_OverrideState: 0 + m_Value: 0.15 tint: - m_OverrideState: 1 - m_Value: {r: 4, g: 3.6910675, b: 0.596226, a: 1} + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} enableAdditionalLightsContribution: - m_OverrideState: 1 - m_Value: 1 + m_OverrideState: 0 + m_Value: 0 maxSteps: m_OverrideState: 0 m_Value: 128 @@ -103,8 +155,8 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 2 enabled: - m_OverrideState: 1 - m_Value: 1 + m_OverrideState: 0 + m_Value: 0 renderPassEvent: m_OverrideState: 0 m_Value: 550 @@ -166,6 +218,9 @@ MonoBehaviour: - {fileID: 531387521984870518} - {fileID: -2307326953841441124} - {fileID: 4550874325240702303} + - {fileID: -6930818438622466647} + - {fileID: 6698165480939181587} + - {fileID: 1880173585298826625} --- !u!114 &531387521984870518 MonoBehaviour: m_ObjectHideFlags: 3 @@ -194,6 +249,52 @@ MonoBehaviour: saturation: m_OverrideState: 0 m_Value: 0 +--- !u!114 &1880173585298826625 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.DepthOfField + active: 1 + mode: + m_OverrideState: 0 + m_Value: 0 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 0 + m_Value: 10 + aperture: + m_OverrideState: 0 + m_Value: 5.6 + focalLength: + m_OverrideState: 0 + m_Value: 50 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &4550874325240702303 MonoBehaviour: m_ObjectHideFlags: 3 @@ -208,8 +309,33 @@ MonoBehaviour: m_EditorClassIdentifier: active: 1 temperature: - m_OverrideState: 1 + m_OverrideState: 0 m_Value: 0 tint: + m_OverrideState: 0 + m_Value: 0 +--- !u!114 &6698165480939181587 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.MotionBlur + active: 1 + mode: + m_OverrideState: 0 + m_Value: 0 + quality: + m_OverrideState: 0 + m_Value: 0 + intensity: m_OverrideState: 1 m_Value: 0 + clamp: + m_OverrideState: 0 + m_Value: 0.05 diff --git a/Assets/Assets/Vom/Default.asset.meta b/Assets/Assets/Volume/Default.asset.meta similarity index 100% rename from Assets/Assets/Vom/Default.asset.meta rename to Assets/Assets/Volume/Default.asset.meta diff --git a/Assets/Assets/Volume/MotionBlur.asset b/Assets/Assets/Volume/MotionBlur.asset new file mode 100644 index 0000000..ef326d6 --- /dev/null +++ b/Assets/Assets/Volume/MotionBlur.asset @@ -0,0 +1,41 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.VolumeProfile + components: + - {fileID: 6947014788298238594} +--- !u!114 &6947014788298238594 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3} + m_Name: MotionBlur + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.MotionBlur + active: 1 + mode: + m_OverrideState: 0 + m_Value: 0 + quality: + m_OverrideState: 0 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 0.308 + clamp: + m_OverrideState: 0 + m_Value: 0.05 diff --git a/Assets/Assets/Volume/MotionBlur.asset.meta b/Assets/Assets/Volume/MotionBlur.asset.meta new file mode 100644 index 0000000..b2a6ccc --- /dev/null +++ b/Assets/Assets/Volume/MotionBlur.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b0f07468d55d78a4fa11a3e8664ab3c4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Empty.meta b/Assets/Scenes/Empty.meta new file mode 100644 index 0000000..b29255e --- /dev/null +++ b/Assets/Scenes/Empty.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2dc5f5b0d982e842b40a3fb066569d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Framework/ScriptableObjectInstantiate/DefaultScriptableObjectInstantiate.cs b/Assets/Scripts/Framework/ScriptableObjectInstantiate/DefaultScriptableObjectInstantiate.cs index 4fb4112..9fa1392 100644 --- a/Assets/Scripts/Framework/ScriptableObjectInstantiate/DefaultScriptableObjectInstantiate.cs +++ b/Assets/Scripts/Framework/ScriptableObjectInstantiate/DefaultScriptableObjectInstantiate.cs @@ -74,6 +74,11 @@ namespace Demo { $"{nameof(ParticleJudgement)}",ParticleJudgement.Make}, }; + public static Dictionary> SingleVolumeInstantiate = new() + { + { $"{nameof(MotionBlurVolume)}", MotionBlurVolume.Make } + }; + public static void OpenInstantiateMenu(this ScriptableObject self, RectTransform item) { List result = new() @@ -90,14 +95,17 @@ namespace Demo SharedModule.instance.OpenCustomMenu(item, result.ToArray()); } + private static Dictionary> s_ScriptableObjectInstantiate; + public static Dictionary> GetScriptableObjectInstantiate() { - return new Dictionary>(GameObjectInstantiate + return s_ScriptableObjectInstantiate ??= new Dictionary>(GameObjectInstantiate .Union(DDTInstantiate) .Union(TickUpdatementInstantiate) .Union(MaterialUpdatementInstantiate) .Union(SplineInstantiate) - .Union(JudgementInstantiate)); + .Union(JudgementInstantiate) + .Union(SingleVolumeInstantiate)); } } } diff --git a/Assets/Scripts/Volume.meta b/Assets/Scripts/Volume.meta new file mode 100644 index 0000000..a041cf7 --- /dev/null +++ b/Assets/Scripts/Volume.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7ca6b10736f6784fb939efe89aca8f6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Volume/BaseVolume.cs b/Assets/Scripts/Volume/BaseVolume.cs new file mode 100644 index 0000000..1a3dc47 --- /dev/null +++ b/Assets/Scripts/Volume/BaseVolume.cs @@ -0,0 +1,78 @@ +using Convention; +using System; +using System.Collections.Generic; +using System.Reflection; +using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; + +namespace Demo.Game +{ + public abstract class BaseVolume : ScriptableObject + { + [Resources, SerializeField] private Volume m_volume; + protected Volume MyVolume + { + get + { + if (m_volume == null) + m_volume = this.GetOrAddComponent(); + return m_volume; + } + } + + private static readonly Dictionary VolumeOverrideTypes = new() + { + { nameof(MotionBlur), typeof(MotionBlur)} + }; + + public bool HasOverride() where T : VolumeComponent + { + return MyVolume.profile.Has(); + } + + public bool HasOverride(string name) + { + if (VolumeOverrideTypes.TryGetValue(name, out var type)) + return MyVolume.profile.Has(type); + return false; + } + + public T GetOverride() where T : VolumeComponent + { + if (MyVolume.profile.TryGet(out var result)) + return result; + return null; + } + + public VolumeComponent GetOverride(string name) + { + if (VolumeOverrideTypes.TryGetValue(name, out var type)) + if (MyVolume.profile.TryGet(type, out var result)) + return result; + return null; + } + + public bool TrySetOverrideField(string name, FieldType value) where T : VolumeComponent + { + var component = GetOverride(); + if (component == null) + return false; + return ConventionUtility.PushValue(component, value, name, BindingFlags.Public | BindingFlags.Instance); + } + } + + public abstract class BaseForSingleVolume : BaseVolume where T : VolumeComponent + { + private T m_TargetOverride; + public T TargetOverride + { + get + { + if (m_TargetOverride == null) + m_TargetOverride = GetOverride(); + return TargetOverride; + } + } + } +} diff --git a/Assets/Scripts/Volume/BaseVolume.cs.meta b/Assets/Scripts/Volume/BaseVolume.cs.meta new file mode 100644 index 0000000..a901377 --- /dev/null +++ b/Assets/Scripts/Volume/BaseVolume.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 690e6449e63422241b10a6cf1d72cdd1 \ No newline at end of file diff --git a/Assets/Scripts/Volume/MotionBlurVolume.cs b/Assets/Scripts/Volume/MotionBlurVolume.cs new file mode 100644 index 0000000..a840123 --- /dev/null +++ b/Assets/Scripts/Volume/MotionBlurVolume.cs @@ -0,0 +1,47 @@ +using UnityEngine; +using UnityEngine.Rendering.Universal; + +namespace Demo.Game +{ + public class MotionBlurVolume : BaseForSingleVolume + { + public static MotionBlurVolume Make() + { + return new GameObject().AddComponent(); + } + + [Convention.RScript.Variable.Attr.Method] + public void SetLowMotionBlurQuality() + { + TargetOverride.quality.value = MotionBlurQuality.Low; + } + [Convention.RScript.Variable.Attr.Method] + public void SetMediumMotionBlurQuality() + { + TargetOverride.quality.value = MotionBlurQuality.Medium; + } + [Convention.RScript.Variable.Attr.Method] + public void SetHighMotionBlurQuality() + { + TargetOverride.quality.value = MotionBlurQuality.High; + } + /// + /// Use this if you need object motion blur. + /// + [Convention.RScript.Variable.Attr.Method] + public void EnableObjectsMotionBlur() + { + TargetOverride.mode.value = MotionBlurMode.CameraAndObjects; + } + [Convention.RScript.Variable.Attr.Method] + public void SetIntensity(float value) + { + TargetOverride.intensity.value = value; + } + [Convention.RScript.Variable.Attr.Method] + public void SetClamp(float value) + { + TargetOverride.clamp.value = value; + } + } +} diff --git a/Assets/Scripts/Volume/MotionBlurVolume.cs.meta b/Assets/Scripts/Volume/MotionBlurVolume.cs.meta new file mode 100644 index 0000000..b06d497 --- /dev/null +++ b/Assets/Scripts/Volume/MotionBlurVolume.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 420cec8bd1a2bc14ba438908b4c86740 \ No newline at end of file diff --git a/Assets/TerrainDemoScene_URP/Prefabs/Trees/Cypress/Materials/Cypress_Forest_Desktop.mat b/Assets/TerrainDemoScene_URP/Prefabs/Trees/Cypress/Materials/Cypress_Forest_Desktop.mat index 666ac8f..879f493 100644 --- a/Assets/TerrainDemoScene_URP/Prefabs/Trees/Cypress/Materials/Cypress_Forest_Desktop.mat +++ b/Assets/TerrainDemoScene_URP/Prefabs/Trees/Cypress/Materials/Cypress_Forest_Desktop.mat @@ -49,7 +49,7 @@ Material: m_LightmapFlags: 2 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: 2450 stringTagMap: MotionVector: User disabledShaderPasses: