diff options
163 files changed, 624 insertions, 3611 deletions
diff --git a/Documents/_TODO.xlsx b/Documents/_TODO.xlsx Binary files differnew file mode 100644 index 00000000..c2d30c7c --- /dev/null +++ b/Documents/_TODO.xlsx diff --git a/Documents/攻击盒.xlsx b/Documents/攻击盒.xlsx Binary files differnew file mode 100644 index 00000000..fc60a7d8 --- /dev/null +++ b/Documents/攻击盒.xlsx diff --git a/Documents/资源（必看）.txt b/Documents/资源（必看）.txt new file mode 100644 index 00000000..ae2a78db --- /dev/null +++ b/Documents/资源（必看）.txt @@ -0,0 +1 @@ +https://www.aigei.com/unity3d
\ No newline at end of file diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Grass.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Grass.meta deleted file mode 100644 index bb2673a9..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Grass.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1ed1a2d50fa6b8c42a6d1d5a1f0e4a39 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Misc.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Misc.meta deleted file mode 100644 index 4fae73bf..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Misc.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5f025b54c7e08044aab7499db6639632 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Rock.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Rock.meta deleted file mode 100644 index dccc516f..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Rock.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d4dde7b6628c5794c939527dc116cf16 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Sand.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Sand.meta deleted file mode 100644 index 23291c72..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Sand.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d1b803b89b9ccc147bc3dcc162e850f6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/SceneTextures.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/SceneTextures.meta deleted file mode 100644 index 80841232..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/SceneTextures.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 24120cfb7b733194cb2b1fa0bbaa4590 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Snow.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Snow.meta deleted file mode 100644 index 557ff529..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Snow.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 239ef12cd88a87d4da12067991894232 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Sprites.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Sprites.meta deleted file mode 100644 index a665f34a..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 60df5dc916155644e99eea3ac2ef8d2e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Tiles.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Tiles.meta deleted file mode 100644 index a35962e3..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/Tiles.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6f83c22eac4dd4749926a12915af7f37 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedFire-ShaderFunction.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedFire-ShaderFunction.meta deleted file mode 100644 index 4a7a70ff..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedFire-ShaderFunction.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e39bdcd590065994fbdb28239f9e44b4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedFire.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedFire.meta deleted file mode 100644 index abc98538..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedFire.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6f33215f02c33d54e9c67889bbe01a8b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedUVDistortion.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedUVDistortion.meta deleted file mode 100644 index 12038ecf..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/AnimatedUVDistortion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8a7babccfe44a5e45954a013a5c781a7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Burn.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Burn.meta deleted file mode 100644 index bc1f2e36..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Burn.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d560477902e5f014d9c80e165e7920b1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community 2Sided.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community 2Sided.meta deleted file mode 100644 index be07582d..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community 2Sided.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 01e12cdbbbacc475286043cb0daab769 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Dissolve Burn.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Dissolve Burn.meta deleted file mode 100644 index 28dd19ac..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Dissolve Burn.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d23c76070cf6e7a4b9ffc96dca9e3dbe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community EnvironmentGradient/Materials.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community EnvironmentGradient/Materials.meta deleted file mode 100644 index 8683106b..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community EnvironmentGradient/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f83d34eb23cd01b4794851aa9a07bcd5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community ForceShield.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community ForceShield.meta deleted file mode 100644 index 18b13272..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community ForceShield.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 77bf83e7c4b6841eabcfb922a81748c6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community HighlightAnimated.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community HighlightAnimated.meta deleted file mode 100644 index 8d1360a1..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community HighlightAnimated.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 696ba2962d08d4f3ea703dfff5878412 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community HologramSimple.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community HologramSimple.meta deleted file mode 100644 index 4f9c53f8..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community HologramSimple.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df035cfea6b9b427bb3fe28ae67e0ecc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community LowPolyWater.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community LowPolyWater.meta deleted file mode 100644 index cb597fb3..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community LowPolyWater.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 928cc984d9ba84125b2e79ebb31f914d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Melting.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Melting.meta deleted file mode 100644 index 619a451f..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Melting.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cbd1a7df71b6bb940a02e5c012d1d565 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community SingleChannelMasking.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community SingleChannelMasking.meta deleted file mode 100644 index 1d2aa042..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community SingleChannelMasking.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e9158db324825a4f91607f3826e7457 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Demo.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Demo.meta deleted file mode 100644 index b4b414d4..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Demo.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f44781c96a2c4a9baf05617317ea474b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Materials.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Materials.meta deleted file mode 100644 index d13f8642..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a060c54f699946c98f51e3219240cd58 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Meshes/Materials.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Meshes/Materials.meta deleted file mode 100644 index c793b082..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Meshes/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 643696e12ede46d4db063a22cb7ea6a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Prefabs.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Prefabs.meta deleted file mode 100644 index b860b21f..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec606668535445329dd02215c9b5d552 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Shaders.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Shaders.meta deleted file mode 100644 index 25bddcf0..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f588e0815af14c6aac3f1bba8d3bb00e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Textures.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Textures.meta deleted file mode 100644 index 52a1d100..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Skybox Cubemap Extended/Textures.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f82f53cdd2d849219ba4c63bbe4f5551 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Volumetric Pixelization.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Volumetric Pixelization.meta deleted file mode 100644 index 9723a552..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Community Volumetric Pixelization.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5009acdd215b1ea4d8dc4d29300a78d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CubemapReflections.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CubemapReflections.meta deleted file mode 100644 index fa6a0ccd..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CubemapReflections.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0cee41bebbd81bb47915ffa987a06d1d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomLightingToon.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomLightingToon.meta deleted file mode 100644 index 90a710bd..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomLightingToon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: babb56e3ecb51074f9cb613080b62743 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomOutlineToon.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomOutlineToon.meta deleted file mode 100644 index 7887d349..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomOutlineToon.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 354b4292db3638f4691f0ecf7c379043 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomRTRain.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomRTRain.meta deleted file mode 100644 index 2d0c9004..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/CustomRTRain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 917f314cd7500ab41a37e0c60edaf755 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Dithering.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Dithering.meta deleted file mode 100644 index 74cf3983..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Dithering.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e584e36eeea74e94aa0ffbf922aedbf6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/DoubleLayerCustomSurface.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/DoubleLayerCustomSurface.meta deleted file mode 100644 index 6ba85b28..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/DoubleLayerCustomSurface.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19f2e2cabde2b9644891d835658cacf8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Extrusion.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Extrusion.meta deleted file mode 100644 index ddd901e5..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Extrusion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 25219f7a4c77b2143bc4bb96b30d81d3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Matcap.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Matcap.meta deleted file mode 100644 index 226f0adc..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Matcap.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2bf4d4d2d1863c4448a455a74bc732a8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Mosaic Effect PPS.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Mosaic Effect PPS.meta deleted file mode 100644 index 2fa6632b..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Mosaic Effect PPS.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cd74e9ffeb35ce343b6caab2061ea48d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/MultiPassDistortion.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/MultiPassDistortion.meta deleted file mode 100644 index 80edda16..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/MultiPassDistortion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 26f4ebde06f0bab4a9a6c1a70ebc7da3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ObjectNormalRefraction.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ObjectNormalRefraction.meta deleted file mode 100644 index c84ce618..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ObjectNormalRefraction.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1709bf8b354faff4583990f3fbeb6e69 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/OrientationBasedSprite.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/OrientationBasedSprite.meta deleted file mode 100644 index 91865542..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/OrientationBasedSprite.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 64ab51b9561f6be4199b5f32263514de -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Outline.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Outline.meta deleted file mode 100644 index 2e6c1073..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Outline.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3dbda337521ad834e9c14bfddc855f7b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxMapping.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxMapping.meta deleted file mode 100644 index 81d445c4..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxMapping.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 46de6e1bf8f10a34e86e513edd24839b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxOcclusionMappingPOM.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxOcclusionMappingPOM.meta deleted file mode 100644 index 4566dfaf..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxOcclusionMappingPOM.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 14e02c0a9d2c3fa4894ab77f5b8628fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxOffsetFakeInterior.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxOffsetFakeInterior.meta deleted file mode 100644 index b789e7fb..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ParallaxOffsetFakeInterior.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9d8e2cf96c8f49842a5d25c90dfe8eb3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/PositionCutoff.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/PositionCutoff.meta deleted file mode 100644 index 78a09398..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/PositionCutoff.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4a2cc44a3da90954ab91ab30fd23730d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Projectors.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Projectors.meta deleted file mode 100644 index 49203b96..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Projectors.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fa2e8303180916f4989da3d28fc53fc3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RadialUVDistortion.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RadialUVDistortion.meta deleted file mode 100644 index 00290d93..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RadialUVDistortion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e1b34d47962da8249949b510396ddbcf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ReadFromAtlasTiled.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ReadFromAtlasTiled.meta deleted file mode 100644 index 2abb510a..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ReadFromAtlasTiled.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b292727fd47f1a64e8cf487e7c7c7056 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ReflectRefractSoapBubble.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ReflectRefractSoapBubble.meta deleted file mode 100644 index d1b9536f..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ReflectRefractSoapBubble.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0966a12dedbb023439402599d691b704 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RefractedShadows.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RefractedShadows.meta deleted file mode 100644 index 222e0f8f..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RefractedShadows.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0731c5c4691b01442a4f2c5c6ead4935 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RimLight.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RimLight.meta deleted file mode 100644 index 5bc2d989..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/RimLight.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c1226500a4e76c04688f67105becd6d9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScaleIndependentTile.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScaleIndependentTile.meta deleted file mode 100644 index cc05f4e4..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScaleIndependentTile.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6befd5da6f516ef4fbebb3524a2750fc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScreenSpaceCurvature.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScreenSpaceCurvature.meta deleted file mode 100644 index fe0735e6..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScreenSpaceCurvature.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e8d33793708ee448ac507d45cf224a8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScreenSpaceDetail.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScreenSpaceDetail.meta deleted file mode 100644 index 9bc0cb83..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/ScreenSpaceDetail.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ac3caf666ecacdb4d93d677454ec5c55 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleBlur.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleBlur.meta deleted file mode 100644 index dd4603cd..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleBlur.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a968bf7ffe0369d4bbe067338db19b5b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleGPUInstancing.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleGPUInstancing.meta deleted file mode 100644 index 0614e3eb..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleGPUInstancing.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2d130c44bf106ec49aaaf7de0898668f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleLambert.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleLambert.meta deleted file mode 100644 index 8ec86564..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleLambert.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 17b350443b4741a41945f5914c4fab1b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleNoise.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleNoise.meta deleted file mode 100644 index d6055a3a..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleNoise.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fae4b0d59b0235141b3dc60ec6238568 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimplePotionLiquid.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimplePotionLiquid.meta deleted file mode 100644 index 1445dbef..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimplePotionLiquid.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 96636aef4362b9d488a520efe43007ec -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleRefraction.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleRefraction.meta deleted file mode 100644 index f026d300..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleRefraction.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dfcfcd6873d9dae4d97bad8a1dacbe2b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleTerrain.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleTerrain.meta deleted file mode 100644 index d50bf8ca..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleTerrain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e14f9199031928442a76fcb851644355 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleTexture.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleTexture.meta deleted file mode 100644 index d493abd8..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SimpleTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a01ab39b64a03fe4c8a2a66183fec924 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Smear.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Smear.meta deleted file mode 100644 index e67cacbe..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Smear.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6c526c3db85c5a54db3c53ab2ea1dde8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SnowAccum.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SnowAccum.meta deleted file mode 100644 index 4d18e132..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/SnowAccum.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 738d2db52bbc9594a8f157a265ba0856 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal01.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal01.meta deleted file mode 100644 index df8f9478..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal01.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3a0a8d4ad7eab884ea2f9e960040776b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal02.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal02.meta deleted file mode 100644 index 8d40435e..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal02.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f82ec69ca011d104b83041613366a0c1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal03.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal03.meta deleted file mode 100644 index 0988a509..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/Portals/Portal03.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 49b2ebcca2ebdbe4fa5980b87e1e20c9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/RefractionsPanels.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/RefractionsPanels.meta deleted file mode 100644 index 2fcc09e6..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/StencilExample/RefractionsPanels.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2ae0e1494190183469284b5ab881b7d4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Substance.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Substance.meta deleted file mode 100644 index 68bce781..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Substance.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3a1c9292d8fac714e9091922355abcd7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Substance2018.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Substance2018.meta deleted file mode 100644 index 2a2c78ca..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Substance2018.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 50c3f69bf74856340867f04dd9288b24 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Particles/HeatHaze.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Particles/HeatHaze.meta deleted file mode 100644 index e54ba05a..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Particles/HeatHaze.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6cf96ce7a6797974988249abd3d5c604 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/PostProcess/FilmGrain.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/PostProcess/FilmGrain.meta deleted file mode 100644 index 7087ee5c..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/PostProcess/FilmGrain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 98716a22521c7eb44b73f08fca1a18f2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/PostProcess/Sobel.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/PostProcess/Sobel.meta deleted file mode 100644 index aa1c3aaf..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/PostProcess/Sobel.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b90911c85a52a9447968d9687b8e367f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Sprites/SimpleSprite.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Sprites/SimpleSprite.meta deleted file mode 100644 index 50c3bbec..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Sprites/SimpleSprite.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c0c979020f1ff8f4b9ccfce731f4bca7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Sprites/SpriteMask.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Sprites/SpriteMask.meta deleted file mode 100644 index 060279af..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/Sprites/SpriteMask.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fc6ce674ab93169479fb8ea9357598c3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/UI/MaskedUI.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/UI/MaskedUI.meta deleted file mode 100644 index 128e9ab1..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/UI/MaskedUI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6994a06202c18b4aa6c8939f2496aee -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/UI/SimpleUI.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/UI/SimpleUI.meta deleted file mode 100644 index 378518db..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TemplateExamples/UI/SimpleUI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b311f99c56dba98499b6a7cace2c1166 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TerrainSnowCoverage.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TerrainSnowCoverage.meta deleted file mode 100644 index 606f3a1e..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TerrainSnowCoverage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 23d37d6252465924f9bd11dc306e2b6f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Tessellation.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Tessellation.meta deleted file mode 100644 index 85da4cee..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Tessellation.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 91e7a5c46ca56c44fb97eb9aad2f9551 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TextureArray.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TextureArray.meta deleted file mode 100644 index 6fb723a8..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TextureArray.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8eb394abf69a7984c800268f5d459d41 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Translucency.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Translucency.meta deleted file mode 100644 index 89fac5f3..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Translucency.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a4e320b208a433049b8b2abb7d15f61d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Transmission.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Transmission.meta deleted file mode 100644 index 8b5e545c..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Transmission.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9eabec4fd9a18d540b6effd8b54f4e7e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Transparency.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Transparency.meta deleted file mode 100644 index ad9276f3..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Transparency.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c0ca92efe884f8c4dab69660e1278517 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TriplanarProjection.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TriplanarProjection.meta deleted file mode 100644 index a237fa47..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TriplanarProjection.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d73f5ba181fb9d44f8bc0812df733798 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TwoSidedWithFace.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TwoSidedWithFace.meta deleted file mode 100644 index 3b31fd26..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/TwoSidedWithFace.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 773b3f81032d840479b3e299e676226c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UISpriteFX.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UISpriteFX.meta deleted file mode 100644 index 896d846c..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UISpriteFX.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 034f7d984719df94ab48dc833aec1fad -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UVLightReveal.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UVLightReveal.meta deleted file mode 100644 index 1861e796..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UVLightReveal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7d6af1686a59451459baa5cb7aac059d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UnlitWithLightmap.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UnlitWithLightmap.meta deleted file mode 100644 index 2661ace8..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/UnlitWithLightmap.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4aa2b8856b816e642a7f96fd6d825cc7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/VertexNormalReconstruction.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/VertexNormalReconstruction.meta deleted file mode 100644 index 7f924d26..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/VertexNormalReconstruction.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2a62c40d60e696441adf71dec0d1ee8f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Water.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Water.meta deleted file mode 100644 index 1d5f28b9..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/Water.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 202edec4bafb5e74cbafe2e767d00e14 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/WorldPosSLices.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/WorldPosSLices.meta deleted file mode 100644 index 6cbcfbb2..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/WorldPosSLices.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f4d2dce433a9c9c4aadf057982a42bb9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/XRay.meta b/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/XRay.meta deleted file mode 100644 index 6ed77114..00000000 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Built-In/XRay.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b01aac5b31c999e41ac47f5faab667c9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Models/Characters/Default.meta b/Erika/Assets/Art/Models/Characters/Default.meta deleted file mode 100644 index 43499fc7..00000000 --- a/Erika/Assets/Art/Models/Characters/Default.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e8a40298dd4efd14c9f90a63734ca39b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Models/Characters/Erika2.meta b/Erika/Assets/Art/Models/Characters/Erika2.meta deleted file mode 100644 index fd7369d9..00000000 --- a/Erika/Assets/Art/Models/Characters/Erika2.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 077f81003f9fc564791cce182048c2b0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta deleted file mode 100644 index b76e98a5..00000000 --- a/Erika/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 20381b3eecfbfe34a9d9222868969d29 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta deleted file mode 100644 index 41200932..00000000 --- a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: abff7cb61c760094f8ab9437379e0f2c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta deleted file mode 100644 index fa9e76cd..00000000 --- a/Erika/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e38cb65072bb4a64cbe162792de9bec2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Materials/Unit/Effect.meta b/Erika/Assets/Bundle/Materials/Unit/Effect.meta deleted file mode 100644 index fdf8c1db..00000000 --- a/Erika/Assets/Bundle/Materials/Unit/Effect.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0525fec1eb7cc94458170e9e106955d5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity index d1450a13..c781bce3 100644 --- a/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity +++ b/Erika/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity @@ -112,37 +112,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &22554937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 22554938} - m_Layer: 0 - m_Name: Bip01_L_Finger1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &22554938 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 22554937} - m_LocalRotation: {x: -0.051385906, y: -0.13159737, z: 0.058058597, w: 0.98826665} - m_LocalPosition: {x: -0.08424862, y: 0.012339441, z: -0.037419852} - m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1} - m_Children: - - {fileID: 1669136953} - m_Father: {fileID: 467646115} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &53681805 GameObject: m_ObjectHideFlags: 0 @@ -4898,68 +4867,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &83637501 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 83637502} - m_Layer: 0 - m_Name: Bip01_Spine1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &83637502 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 83637501} - m_LocalRotation: {x: -0.06663341, y: -0.05911192, z: -0.18177214, w: 0.97929806} - m_LocalPosition: {x: -0.09309901, y: -0.00010160353, z: -0.00001898283} - m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001} - m_Children: - - {fileID: 626989321} - m_Father: {fileID: 1400170958} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &85420807 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 85420808} - m_Layer: 0 - m_Name: Bip01_R_Finger11 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &85420808 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 85420807} - m_LocalRotation: {x: 0.22282155, y: -0.39188144, z: 0.46784183, w: -0.7601997} - m_LocalPosition: {x: -0.029807415, y: 0.0000000043999306, z: 0.0000001129314} - m_LocalScale: {x: 1.0000005, y: 0.9999998, z: 1.0000001} - m_Children: - - {fileID: 1773940705} - m_Father: {fileID: 745846062} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &89054486 GameObject: m_ObjectHideFlags: 0 @@ -9762,88 +9669,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &112128548 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 112128549} - - component: {fileID: 112128550} - m_Layer: 0 - m_Name: 40_06_wuqi_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &112128549 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 112128548} - m_LocalRotation: {x: -0, y: -0.2956758, z: -0, w: 0.95528835} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1752934839} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &112128550 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 112128548} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 2fade982e278c14458a9b05f164944cb, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 4300002, guid: 9e88de20522c1b34289699be7c70f503, type: 3} - m_Bones: - - {fileID: 672402250} - - {fileID: 1109283722} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 1109283722} - m_AABB: - m_Center: {x: 0.1254181, y: -0.065377235, z: 0.000000070780516} - m_Extent: {x: 0.2952843, y: 0.2824861, z: 0.02829496} - m_DirtyAABB: 0 --- !u!1 &115933492 GameObject: m_ObjectHideFlags: 0 @@ -24302,123 +24127,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &211890989 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 211890990} - - component: {fileID: 211890994} - - component: {fileID: 211890993} - - component: {fileID: 211890992} - - component: {fileID: 211890991} - m_Layer: 9 - m_Name: LongSword (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &211890990 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211890989} - m_LocalRotation: {x: -0.20345572, y: -0.07620924, z: 0.29289585, w: -0.93113375} - m_LocalPosition: {x: -0.049, y: -0.11, z: 0.356} - m_LocalScale: {x: 0.01006957, y: 0.014763792, z: 0.9952188} - m_Children: - - {fileID: 1066443516} - - {fileID: 1608908031} - m_Father: {fileID: 1428666999} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 154.942, y: 181.438, z: 145.397} ---- !u!114 &211890991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211890989} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6c2c9828fec98747a1b0680f47bed80, type: 3} - m_Name: - m_EditorClassIdentifier: - UseWith2D: 0 - SortingLayerName: - SortingOrder: 0 - PointStart: {fileID: 1608908031} - PointEnd: {fileID: 1066443516} - MaxFrame: 10 - Granularity: 60 - MyColor: {r: 1, g: 1, b: 1, a: 0.5019608} - MyMaterial: {fileID: 2100000, guid: 9db63a4774ae8954ab6f503f10fb20e4, type: 2} ---- !u!65 &211890992 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211890989} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &211890993 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211890989} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: fb1a6b631853ec045bdfb595c327997c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &211890994 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211890989} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &278122006 GameObject: m_ObjectHideFlags: 0 @@ -24451,36 +24161,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &291935596 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 291935597} - m_Layer: 0 - m_Name: Bip01_L_Finger3Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &291935597 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 291935596} - m_LocalRotation: {x: -0.00000082966125, y: 2.0816675e-16, z: 7.979745e-17, w: 1} - m_LocalPosition: {x: -0.020666694, y: -0.000000019073486, z: -0.000000019073486} - m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} - m_Children: [] - m_Father: {fileID: 2084671495} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &299052604 GameObject: m_ObjectHideFlags: 0 @@ -29245,37 +28925,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &319259688 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 319259689} - m_Layer: 0 - m_Name: Bone04 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &319259689 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 319259688} - m_LocalRotation: {x: -0.000000048428763, y: 0.00000013411035, z: -0.00000012775088, - w: 1} - m_LocalPosition: {x: -0.11361407, y: 0.000000012999827, z: 0.000000003504331} - m_LocalScale: {x: 0.99999994, y: 1.0000002, z: 0.9999999} - m_Children: [] - m_Father: {fileID: 1109283722} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &340202959 GameObject: m_ObjectHideFlags: 0 @@ -38919,7 +38568,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &411861530 GameObject: @@ -48434,40 +48083,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &467646114 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 467646115} - m_Layer: 0 - m_Name: Bip01_L_Hand - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &467646115 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 467646114} - m_LocalRotation: {x: 0.8839825, y: 0.14368942, z: -0.28231254, w: 0.34384307} - m_LocalPosition: {x: -0.172958, y: 0.000000042165926, z: -0.000000049132503} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} - m_Children: - - {fileID: 1424314405} - - {fileID: 22554938} - - {fileID: 1034931747} - - {fileID: 1159088306} - m_Father: {fileID: 1475513133} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &483744137 GameObject: m_ObjectHideFlags: 0 @@ -53223,67 +52838,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &491192086 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 491192087} - m_Layer: 0 - m_Name: Bip01_R_Finger0Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &491192087 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 491192086} - m_LocalRotation: {x: 0.00000009668988, y: -0.00000016403918, z: 0.99999994, w: -0.0003452789} - m_LocalPosition: {x: -0.028186798, y: -0.0000000667572, z: -3.289813e-14} - m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} - m_Children: [] - m_Father: {fileID: 1251493304} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &508858557 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 508858558} - m_Layer: 0 - m_Name: Bip01_R_Clavicle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &508858558 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 508858557} - m_LocalRotation: {x: 0.72391087, y: 0.14373428, z: 0.628415, w: -0.24573997} - m_LocalPosition: {x: 0.047632538, y: 0.026799843, z: -0.07921414} - m_LocalScale: {x: 0.9999999, y: 0.99999976, z: 0.9999999} - m_Children: - - {fileID: 975335737} - m_Father: {fileID: 626989321} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519301909 GameObject: m_ObjectHideFlags: 0 @@ -67597,36 +67151,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &571607286 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 571607287} - m_Layer: 0 - m_Name: Bip01_L_Finger2Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &571607287 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 571607286} - m_LocalRotation: {x: -0.0000008387114, y: -6.938891e-17, z: -2.7755635e-17, w: 1} - m_LocalPosition: {x: -0.025772514, y: 0.000000038146972, z: 6.750156e-16} - m_LocalScale: {x: 1, y: 1.0000001, z: 1} - m_Children: [] - m_Father: {fileID: 1178227206} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &576787327 GameObject: m_ObjectHideFlags: 0 @@ -67696,71 +67220,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &577228043 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 577228044} - m_Layer: 0 - m_Name: Bone03 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &577228044 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 577228043} - m_LocalRotation: {x: -0.40651152, y: -0.44444385, z: -0.7968845, w: 0.04683235} - m_LocalPosition: {x: -0.08042663, y: 0.018215375, z: 0.058707643} - m_LocalScale: {x: 1.0000002, y: 0.9999995, z: 1.0000005} - m_Children: - - {fileID: 1109283722} - - {fileID: 1931354150} - m_Father: {fileID: 1428666999} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &626989320 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 626989321} - m_Layer: 0 - m_Name: Bip01_Neck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &626989321 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 626989320} - m_LocalRotation: {x: -0.017269805, y: 0.15550964, z: -0.27509853, w: 0.9485986} - m_LocalPosition: {x: -0.14913236, y: 0.006819147, z: 0.0000020914397} - m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999999} - m_Children: - - {fileID: 1813171789} - - {fileID: 1838813329} - - {fileID: 508858558} - m_Father: {fileID: 83637502} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &659412353 GameObject: m_ObjectHideFlags: 0 @@ -72516,37 +71975,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &672402249 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 672402250} - m_Layer: 0 - m_Name: Bone01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &672402250 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 672402249} - m_LocalRotation: {x: -0.27349356, y: 0.024100432, z: -0.9255484, w: 0.26073113} - m_LocalPosition: {x: 0.041816693, y: -0.010132938, z: 0.000000039598987} - m_LocalScale: {x: 1.0000005, y: 0.9999998, z: 0.9999999} - m_Children: - - {fileID: 1187695148} - m_Father: {fileID: 1109283722} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &687023027 GameObject: m_ObjectHideFlags: 0 @@ -72694,36 +72122,6 @@ MonoBehaviour: m_BeforeTransparentBundles: [] m_BeforeStackBundles: [] m_AfterStackBundles: [] ---- !u!1 &717820883 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 717820884} - m_Layer: 0 - m_Name: Bip01_L_Finger0Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &717820884 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 717820883} - m_LocalRotation: {x: -0.000013783456, y: 0.00004436678, z: 0.000020964444, w: 1} - m_LocalPosition: {x: -0.028186912, y: -0.0000011634835, z: 0.0000025939933} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1650604464} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &729227977 GameObject: m_ObjectHideFlags: 0 @@ -72828,68 +72226,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &745846061 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 745846062} - m_Layer: 0 - m_Name: Bip01_R_Finger1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &745846062 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 745846061} - m_LocalRotation: {x: 0.12670393, y: -0.31497282, z: 0.27864867, w: -0.8983837} - m_LocalPosition: {x: -0.08424888, y: 0.012339574, z: 0.037419893} - m_LocalScale: {x: 1.0000002, y: 0.99999964, z: 1} - m_Children: - - {fileID: 85420808} - m_Father: {fileID: 1428666999} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &770592172 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 770592173} - m_Layer: 0 - m_Name: Bip01_R_Thigh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &770592173 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 770592172} - m_LocalRotation: {x: -0.8643045, y: 0.49596536, z: 0.035039145, w: -0.075950146} - m_LocalPosition: {x: -0.00000030799623, y: -0.0000001176985, z: -0.08553498} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} - m_Children: - - {fileID: 1684999265} - m_Father: {fileID: 1693873628} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &771299854 GameObject: m_ObjectHideFlags: 0 @@ -82660,37 +81996,6 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 threshold: 1 ---- !u!1 &975335736 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 975335737} - m_Layer: 0 - m_Name: Bip01_R_UpperArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &975335737 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 975335736} - m_LocalRotation: {x: 0.46357208, y: -0.35142246, z: -0.18802893, w: -0.79135853} - m_LocalPosition: {x: -0.081466265, y: 0.00000011293165, z: -0.00000009826532} - m_LocalScale: {x: 1, y: 0.99999994, z: 1.0000001} - m_Children: - - {fileID: 1482836370} - m_Father: {fileID: 508858558} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &998301198 GameObject: m_ObjectHideFlags: 0 @@ -82736,99 +82041,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 ---- !u!1 &1029053314 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1029053315} - m_Layer: 0 - m_Name: Bip01_R_Finger2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1029053315 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029053314} - m_LocalRotation: {x: 0.054014504, y: -0.27949372, z: 0.38071635, w: -0.8797845} - m_LocalPosition: {x: -0.08509593, y: 0.012511395, z: 0.007837344} - m_LocalScale: {x: 1.0000002, y: 0.9999999, z: 1.0000001} - m_Children: - - {fileID: 1732458216} - m_Father: {fileID: 1428666999} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1030411160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1030411161} - m_Layer: 0 - m_Name: body - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1030411161 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1030411160} - m_LocalRotation: {x: -0.27411792, y: 0.6518124, z: 0.65181243, w: 0.27411783} - m_LocalPosition: {x: 0.13741475, y: 1.6859171, z: 0.014655918} - m_LocalScale: {x: 2.539999, y: 2.5399995, z: 2.5399997} - m_Children: - - {fileID: 1693873628} - m_Father: {fileID: 1752934839} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1034931746 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1034931747} - m_Layer: 0 - m_Name: Bip01_L_Finger2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1034931747 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034931746} - m_LocalRotation: {x: -0.14221199, y: -0.25286853, z: 0.02138081, w: 0.9567529} - m_LocalPosition: {x: -0.08509573, y: 0.01251139, z: -0.007837229} - m_LocalScale: {x: 1.0000004, y: 0.9999997, z: 1} - m_Children: - - {fileID: 1178227206} - m_Father: {fileID: 467646115} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1036440312 GameObject: m_ObjectHideFlags: 0 @@ -82874,36 +82086,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 ---- !u!1 &1066443515 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1066443516} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1066443516 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1066443515} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.466} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 211890990} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1077360195 GameObject: m_ObjectHideFlags: 0 @@ -92417,124 +91599,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1084668073 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1084668074} - - component: {fileID: 1084668075} - m_Layer: 9 - m_Name: 40_06 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1084668074 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084668073} - m_LocalRotation: {x: -0, y: -0.2956758, z: -0, w: 0.95528835} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1752934839} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &1084668075 -SkinnedMeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084668073} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d743391c976d45f41be9ace4cf3bc3ac, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - serializedVersion: 2 - m_Quality: 0 - m_UpdateWhenOffscreen: 0 - m_SkinnedMotionVectors: 1 - m_Mesh: {fileID: 4300000, guid: 9e88de20522c1b34289699be7c70f503, type: 3} - m_Bones: - - {fileID: 1693873628} - - {fileID: 1030411161} - - {fileID: 1400170958} - - {fileID: 83637502} - - {fileID: 626989321} - - {fileID: 1813171789} - - {fileID: 1838813329} - - {fileID: 1134941579} - - {fileID: 1475513133} - - {fileID: 467646115} - - {fileID: 1424314405} - - {fileID: 1650604464} - - {fileID: 22554938} - - {fileID: 1669136953} - - {fileID: 1034931747} - - {fileID: 1178227206} - - {fileID: 1159088306} - - {fileID: 2084671495} - - {fileID: 508858558} - - {fileID: 975335737} - - {fileID: 1482836370} - - {fileID: 1428666999} - - {fileID: 2090757792} - - {fileID: 1251493304} - - {fileID: 745846062} - - {fileID: 85420808} - - {fileID: 1029053315} - - {fileID: 1732458216} - - {fileID: 1980221825} - - {fileID: 1384604950} - - {fileID: 1503659853} - - {fileID: 1750728773} - - {fileID: 1381587776} - - {fileID: 1317549100} - - {fileID: 770592173} - - {fileID: 1684999265} - - {fileID: 1702519657} - - {fileID: 1962284262} - m_BlendShapeWeights: [] - m_RootBone: {fileID: 1030411161} - m_AABB: - m_Center: {x: -0.0097737685, y: -0.011292309, z: -0.109718874} - m_Extent: {x: 0.21953902, y: 0.2945871, z: 0.5579216} - m_DirtyAABB: 0 --- !u!1 &1099604284 GameObject: m_ObjectHideFlags: 0 @@ -102063,99 +101127,75 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1109283721 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1109283722} - m_Layer: 0 - m_Name: 40_06_wuqi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1109283722 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1109283721} - m_LocalRotation: {x: 0.9339491, y: -0.16590153, z: -0.31509176, w: 0.030544685} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} - m_Children: - - {fileID: 672402250} - - {fileID: 319259689} - m_Father: {fileID: 577228044} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1113248087 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1113248088} - m_Layer: 0 - m_Name: Bip01_L_Toe0Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1113248088 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1113248087} - m_LocalRotation: {x: 0.00000015925002, y: 0.0000005878736, z: 1, w: 1.2959718e-13} - m_LocalPosition: {x: -0.032491323, y: 0.000000039528786, z: -0.000000125209} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1317549100} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1134941578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1134941579} - m_Layer: 0 - m_Name: Bip01_L_UpperArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1134941579 -Transform: +--- !u!1001 &1136168827 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1134941578} - m_LocalRotation: {x: 0.17183279, y: -0.11886807, z: 0.42484635, w: 0.8808232} - m_LocalPosition: {x: -0.081466004, y: -0.000000004399934, z: -0.00000011073173} - m_LocalScale: {x: 1.0000002, y: 0.99999994, z: 1.0000001} - m_Children: - - {fileID: 1475513133} - m_Father: {fileID: 1838813329} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6928033330946439154, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_Name + value: Erika_Robot + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.54 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.34 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalPosition.z + value: -12.52 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, type: 3} --- !u!1 &1141527490 GameObject: m_ObjectHideFlags: 0 @@ -111736,37 +110776,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1159088305 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159088306} - m_Layer: 0 - m_Name: Bip01_L_Finger3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1159088306 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159088305} - m_LocalRotation: {x: -0.25804722, y: -0.39430216, z: -0.17424624, w: 0.8646246} - m_LocalPosition: {x: -0.081515536, y: 0.013640816, z: 0.016015444} - m_LocalScale: {x: 1.0000005, y: 0.99999976, z: 1.0000001} - m_Children: - - {fileID: 2084671495} - m_Father: {fileID: 467646115} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1163248615 GameObject: m_ObjectHideFlags: 0 @@ -116531,68 +115540,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1178227205 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1178227206} - m_Layer: 0 - m_Name: Bip01_L_Finger21 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1178227206 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1178227205} - m_LocalRotation: {x: 0.096892536, y: -0.085341185, z: 0.024972197, w: -0.9913149} - m_LocalPosition: {x: -0.030312594, y: 0.000000086164974, z: 0.00000006306543} - m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1} - m_Children: - - {fileID: 571607287} - m_Father: {fileID: 1034931747} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1187695147 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187695148} - m_Layer: 0 - m_Name: Bone02 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1187695148 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187695147} - m_LocalRotation: {x: -0.0000000037253085, y: -1.3877788e-16, z: -1.3010427e-17, - w: 1} - m_LocalPosition: {x: -0.36140585, y: -0.00000009875901, z: -0.0000000035386658} - m_LocalScale: {x: 1, y: 1.0000002, z: 0.9999999} - m_Children: [] - m_Father: {fileID: 672402250} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1209790437 GameObject: m_ObjectHideFlags: 0 @@ -121348,37 +120295,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1251493303 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1251493304} - m_Layer: 0 - m_Name: Bip01_R_Finger01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1251493304 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1251493303} - m_LocalRotation: {x: 0.23811325, y: -0.55293584, z: -0.09644291, w: -0.7926303} - m_LocalPosition: {x: -0.02408105, y: -0.000000080665345, z: 0.000000032266087} - m_LocalScale: {x: 0.9999999, y: 1.0000001, z: 0.99999994} - m_Children: - - {fileID: 491192087} - m_Father: {fileID: 2090757792} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1294129355 GameObject: m_ObjectHideFlags: 0 @@ -126181,37 +125097,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1317549099 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1317549100} - m_Layer: 0 - m_Name: Bip01_L_Toe0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1317549100 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1317549099} - m_LocalRotation: {x: -0.05532536, y: -0.02546245, z: -0.7192968, w: 0.6920281} - m_LocalPosition: {x: -0.085949264, y: 0.06625112, z: 0.0000001466643} - m_LocalScale: {x: 1.0000002, y: 1, z: 1} - m_Children: - - {fileID: 1113248088} - m_Father: {fileID: 1381587776} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1326207094 GameObject: m_ObjectHideFlags: 0 @@ -140488,99 +139373,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1381587775 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1381587776} - m_Layer: 0 - m_Name: Bip01_L_Foot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1381587776 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1381587775} - m_LocalRotation: {x: -0.07282301, y: -0.05861039, z: 0.24984674, w: 0.9637626} - m_LocalPosition: {x: -0.26188183, y: 0.00000009386549, z: 0.00000042239392} - m_LocalScale: {x: 0.99999994, y: 1, z: 1} - m_Children: - - {fileID: 1317549100} - m_Father: {fileID: 1750728773} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1384604949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1384604950} - m_Layer: 0 - m_Name: Bip01_R_Finger31 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1384604950 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1384604949} - m_LocalRotation: {x: 0.22376277, y: -0.16694172, z: 0.5855874, w: -0.7610178} - m_LocalPosition: {x: -0.024786694, y: 0.00000001099981, z: -0.0000000080665234} - m_LocalScale: {x: 1.0000002, y: 0.9999999, z: 1} - m_Children: - - {fileID: 1782291767} - m_Father: {fileID: 1980221825} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1400170957 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1400170958} - m_Layer: 0 - m_Name: Bip01_Spine - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1400170958 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400170957} - m_LocalRotation: {x: 0.056942, y: -0.09024632, z: 0.12613426, w: 0.98625726} - m_LocalPosition: {x: -0.05737207, y: 0.0035605342, z: 0.0033644496} - m_LocalScale: {x: 1, y: 0.99999994, z: 1} - m_Children: - - {fileID: 83637502} - m_Father: {fileID: 1693873628} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1407747293 GameObject: m_ObjectHideFlags: 0 @@ -145442,161 +144234,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1424314404 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1424314405} - m_Layer: 0 - m_Name: Bip01_L_Finger0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1424314405 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1424314404} - m_LocalRotation: {x: 0.28021628, y: -0.06002177, z: 0.24734977, w: 0.9255779} - m_LocalPosition: {x: -0.05137835, y: 0.008330817, z: -0.03716016} - m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1.0000004} - m_Children: - - {fileID: 1650604464} - m_Father: {fileID: 467646115} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1428666998 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1428666999} - m_Layer: 0 - m_Name: Bip01_R_Hand - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1428666999 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1428666998} - m_LocalRotation: {x: -0.49313015, y: -0.08001543, z: 0.5156327, w: -0.6960914} - m_LocalPosition: {x: -0.17295843, y: 0.00000013098686, z: -0.000000053743214} - m_LocalScale: {x: 1.0000002, y: 0.9999997, z: 1.0000004} - m_Children: - - {fileID: 2090757792} - - {fileID: 745846062} - - {fileID: 1029053315} - - {fileID: 1980221825} - - {fileID: 577228044} - - {fileID: 211890990} - m_Father: {fileID: 1482836370} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1435377156 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1435377158} - - component: {fileID: 1435377157} - m_Layer: 0 - m_Name: RootActionTool - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1435377157 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1435377156} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2a6b1bbe8a21fe44b9a3626c5c94ec2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1435377158 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1435377156} - 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_Children: - - {fileID: 1792765219} - m_Father: {fileID: 0} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1468232990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1468232991} - - component: {fileID: 1468232992} - m_Layer: 0 - m_Name: CollisionSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1468232991 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1468232990} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -15.533203, y: 2.676611, z: 4.4661183} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1468232992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1468232990} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc2cc9a83ab4066478ac795935406ee2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UnitColliderCount: 0 --- !u!1 &1469445325 GameObject: m_ObjectHideFlags: 0 @@ -150361,37 +148998,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1475513132 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1475513133} - m_Layer: 0 - m_Name: Bip01_L_Forearm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1475513133 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1475513132} - m_LocalRotation: {x: -0.19899483, y: 0.28555906, z: 0.8013331, w: 0.48654124} - m_LocalPosition: {x: -0.18664832, y: 0.00000011568154, z: -0.0000001098149} - m_LocalScale: {x: 1.0000004, y: 0.99999964, z: 1} - m_Children: - - {fileID: 467646115} - m_Father: {fileID: 1134941579} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1481416387 GameObject: m_ObjectHideFlags: 0 @@ -155147,37 +153753,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1482836369 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1482836370} - m_Layer: 0 - m_Name: Bip01_R_Forearm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1482836370 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1482836369} - m_LocalRotation: {x: 0.20230642, y: -0.37309268, z: 0.4408389, w: 0.7909078} - m_LocalPosition: {x: -0.18664853, y: 0.00000008488206, z: 0.00000008891536} - m_LocalScale: {x: 1, y: 0.9999997, z: 1} - m_Children: - - {fileID: 1428666999} - m_Father: {fileID: 975335737} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1489618601 GameObject: m_ObjectHideFlags: 0 @@ -159942,37 +158517,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1503659852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1503659853} - m_Layer: 0 - m_Name: Bip01_L_Thigh - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1503659853 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1503659852} - m_LocalRotation: {x: -0.5081278, y: 0.8599792, z: 0.034346998, w: 0.03259175} - m_LocalPosition: {x: 0.00000016793128, y: 0.00000016756452, z: 0.085535005} - m_LocalScale: {x: 1.0000002, y: 0.99999994, z: 1.0000001} - m_Children: - - {fileID: 1750728773} - m_Father: {fileID: 1693873628} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1576806749 GameObject: m_ObjectHideFlags: 0 @@ -169591,36 +168135,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ClearTime: 2 ---- !u!1 &1608908030 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1608908031} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1608908031 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1608908030} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: -0.489} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 211890990} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1618251392 GameObject: m_ObjectHideFlags: 0 @@ -188653,37 +187167,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1650604463 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1650604464} - m_Layer: 0 - m_Name: Bip01_L_Finger01 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1650604464 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1650604463} - m_LocalRotation: {x: -0.070365235, y: 0.12583604, z: -0.18619467, w: 0.9718774} - m_LocalPosition: {x: -0.02408098, y: -0.0000010002474, z: 0.000001968227} - m_LocalScale: {x: 1.0000004, y: 0.9999997, z: 1} - m_Children: - - {fileID: 717820884} - m_Father: {fileID: 1424314405} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1655124697 GameObject: m_ObjectHideFlags: 0 @@ -193448,37 +191931,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1669136952 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1669136953} - m_Layer: 0 - m_Name: Bip01_L_Finger11 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1669136953 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1669136952} - m_LocalRotation: {x: 0.10133489, y: -0.21899344, z: 0.103001766, w: -0.9649683} - m_LocalPosition: {x: -0.029807413, y: 0.00000017342997, z: 0.000000023466209} - m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1} - m_Children: - - {fileID: 1852988682} - m_Father: {fileID: 22554938} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1680813692 GameObject: m_ObjectHideFlags: 0 @@ -203000,70 +201452,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1684999264 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1684999265} - m_Layer: 0 - m_Name: Bip01_R_Calf - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1684999265 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1684999264} - m_LocalRotation: {x: 0.024339603, y: -0.1875899, z: 0.93085575, w: 0.31261045} - m_LocalPosition: {x: -0.32738468, y: 0.00000023466373, z: -0.0000010068528} - m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001} - m_Children: - - {fileID: 1702519657} - m_Father: {fileID: 770592173} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1693873627 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1693873628} - m_Layer: 0 - m_Name: Bip01_Pelvis - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1693873628 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693873627} - m_LocalRotation: {x: -0.8247233, y: -0.069145784, z: 0.5319144, w: 0.1792133} - m_LocalPosition: {x: 0.07060255, y: 0.14459871, z: -0.029772189} - m_LocalScale: {x: 0.9999999, y: 1, z: 1} - m_Children: - - {fileID: 1503659853} - - {fileID: 770592173} - - {fileID: 1400170958} - m_Father: {fileID: 1030411161} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1702070933 GameObject: m_ObjectHideFlags: 0 @@ -207828,37 +206216,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1702519656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1702519657} - m_Layer: 0 - m_Name: Bip01_R_Foot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1702519657 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702519656} - m_LocalRotation: {x: 0.18345253, y: -0.06580482, z: 0.1494016, w: 0.96937823} - m_LocalPosition: {x: -0.26188183, y: 0.00000014079814, z: -0.0000007274562} - m_LocalScale: {x: 1.0000001, y: 1, z: 1} - m_Children: - - {fileID: 1962284262} - m_Father: {fileID: 1684999265} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1710231911 GameObject: m_ObjectHideFlags: 0 @@ -212660,38 +211017,7 @@ Transform: - {fileID: 1294129356} - {fileID: 115933493} m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1732458215 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1732458216} - m_Layer: 0 - m_Name: Bip01_R_Finger21 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1732458216 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1732458215} - m_LocalRotation: {x: 0.21696863, y: -0.29564956, z: 0.5288698, w: -0.7653841} - m_LocalPosition: {x: -0.03031253, y: -0.000000016133061, z: 0.000000024932872} - m_LocalScale: {x: 1.0000002, y: 0.9999998, z: 1} - m_Children: - - {fileID: 1980673543} - m_Father: {fileID: 1029053315} - m_RootOrder: 0 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1740894742 GameObject: @@ -212797,227 +211123,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1750728772 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1750728773} - m_Layer: 0 - m_Name: Bip01_L_Calf - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1750728773 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1750728772} - m_LocalRotation: {x: 0.11362531, y: 0.006734669, z: 0.26705587, w: 0.9569353} - m_LocalPosition: {x: -0.32738468, y: 0.00000011733185, z: 0.00000058079183} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1381587776} - m_Father: {fileID: 1503659853} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1752934838 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1752934839} - - component: {fileID: 1752934844} - - component: {fileID: 1752934843} - - component: {fileID: 1752934842} - - component: {fileID: 1752934841} - - component: {fileID: 1752934840} - m_Layer: 0 - m_Name: Erika_Robot(Clone) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1752934839 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752934838} - m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7500005, y: 0.75, z: 0.7500005} - m_Children: - - {fileID: 1084668074} - - {fileID: 112128549} - - {fileID: 1030411161} - m_Father: {fileID: 1792765219} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1752934840 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752934838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 91537a55ed7187b49ac3636609b05f43, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ID: 1 - m_Colliders: - - {fileID: 1752934841} ---- !u!136 &1752934841 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752934838} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.5 - m_Height: 1.1281656 - m_Direction: 1 - m_Center: {x: 0, y: 1.6288118, z: 0} ---- !u!114 &1752934842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752934838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 51d91d81079585e4da846762765c152e, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HurtBoxes: - - {fileID: 1752934840} - m_GuardBoxes: [] - m_TriggerBoxes: [] ---- !u!114 &1752934843 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752934838} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 75a2e2ebdc58ab940858d821f8a1ffa0, type: 3} - m_Name: - m_EditorClassIdentifier: - showGizmos: 1 - rootBone: {fileID: 1030411161} - afterImageAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab - snapshotAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab - m_Bones: - m_keys: 0000000001000000020000000300000004000000050000000600000007000000080000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f0000002000000021000000220000002300000024000000250000002600000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003c0000003d0000003e0000003f00000050000000510000005200000053000000 - m_values: - - {fileID: 1693873628} - - {fileID: 1400170958} - - {fileID: 83637502} - - {fileID: 0} - - {fileID: 626989321} - - {fileID: 1813171789} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 1838813329} - - {fileID: 1134941579} - - {fileID: 1475513133} - - {fileID: 467646115} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 508858558} - - {fileID: 975335737} - - {fileID: 1482836370} - - {fileID: 1428666999} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 1503659853} - - {fileID: 1750728773} - - {fileID: 1381587776} - - {fileID: 1317549100} - - {fileID: 770592173} - - {fileID: 1684999265} - - {fileID: 1702519657} - - {fileID: 1962284262} - m_ReferencePoints: - m_keys: 0100000014000000 - m_values: - - {fileID: 0} - - {fileID: 0} - snapshotBound: 5 - m_MainRenderer: - tag: 0 - renderer: {fileID: 1084668075} - m_Renderers: - - tag: 0 - renderer: {fileID: 1084668075} - - tag: 1 - renderer: {fileID: 211890993} ---- !u!95 &1752934844 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752934838} - m_Enabled: 1 - m_Avatar: {fileID: 9000000, guid: 9e88de20522c1b34289699be7c70f503, type: 3} - m_Controller: {fileID: 1826958699} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1765961529 GameObject: m_ObjectHideFlags: 0 @@ -217853,97 +215958,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1773940704 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1773940705} - m_Layer: 0 - m_Name: Bip01_R_Finger1Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1773940705 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1773940704} - m_LocalRotation: {x: 0.00000041922317, y: 0.00000031242666, z: 0.99999994, w: 0.0003451458} - m_LocalPosition: {x: -0.025208702, y: -5.8264504e-15, z: 0.000000009536743} - m_LocalScale: {x: 0.99999994, y: 1, z: 1.0000001} - m_Children: [] - m_Father: {fileID: 85420808} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1782291766 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1782291767} - m_Layer: 0 - m_Name: Bip01_R_Finger3Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1782291767 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782291766} - m_LocalRotation: {x: 0.00000047609635, y: 0.000000020656456, z: 0.99999994, w: 0.0003451458} - m_LocalPosition: {x: -0.020666676, y: 2.9842794e-15, z: 0.000000028610229} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1384604950} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1792765218 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1792765219} - m_Layer: 0 - m_Name: UnitRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1792765219 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1792765218} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2364808, y: -0.20188227, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1752934839} - m_Father: {fileID: 1435377158} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1811105936 GameObject: m_ObjectHideFlags: 0 @@ -222701,37 +220715,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1813171788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1813171789} - m_Layer: 0 - m_Name: Bip01_Head - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1813171789 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1813171788} - m_LocalRotation: {x: -0.5723131, y: -0.13491008, z: -0.19217531, w: -0.78570074} - m_LocalPosition: {x: -0.046630166, y: -0.000000023466338, z: -0.000000023466345} - m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 1} - m_Children: - - {fileID: 1834194133} - m_Father: {fileID: 626989321} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1813621498 GameObject: m_ObjectHideFlags: 0 @@ -232242,47 +230225,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!221 &1826958699 -AnimatorOverrideController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: override controller - m_Controller: {fileID: 9100000, guid: 47311b4ae25969546aa7fca07ea0405a, type: 2} - m_Clips: - - m_OriginalClip: {fileID: 7400000, guid: d1dee14942f17c745bb953c649ee14e5, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 154fc7715a2686b43ba21cd2178be9a9, type: 2} ---- !u!1 &1834194132 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1834194133} - m_Layer: 0 - m_Name: Bip01_HeadNub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1834194133 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1834194132} - m_LocalRotation: {x: -0.00000022500257, y: 1.7347266e-18, z: -1.3877788e-17, w: 1} - m_LocalPosition: {x: -0.08935898, y: 0.000000019073486, z: 0.000000015497209} - m_LocalScale: {x: 1, y: 1.0000001, z: 1} - m_Children: [] - m_Father: {fileID: 1813171789} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1838491441 GameObject: m_ObjectHideFlags: 0 @@ -237038,67 +234980,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1838813328 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1838813329} - m_Layer: 0 - m_Name: Bip01_L_Clavicle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1838813329 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1838813328} - m_LocalRotation: {x: -0.7318101, y: -0.13698202, z: 0.62350917, w: -0.2385922} - m_LocalPosition: {x: 0.03657107, y: 0.017407324, z: 0.08729733} - m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 1} - m_Children: - - {fileID: 1134941579} - m_Father: {fileID: 626989321} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1852988681 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1852988682} - m_Layer: 0 - m_Name: Bip01_L_Finger1Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1852988682 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1852988681} - m_LocalRotation: {x: -0.00000079494583, y: -4.1633406e-17, z: 5.5511118e-17, w: 1} - m_LocalPosition: {x: -0.025208663, y: -0.000000076293944, z: 5.968559e-15} - m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} - m_Children: [] - m_Father: {fileID: 1669136953} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1911232878 GameObject: m_ObjectHideFlags: 0 @@ -246722,67 +244603,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1931354149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1931354150} - m_Layer: 0 - m_Name: Bone04_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1931354150 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1931354149} - m_LocalRotation: {x: -0.0000005555558, y: -8.3266733e-17, z: 1.38777415e-17, w: 1} - m_LocalPosition: {x: -0.10880185, y: 0.000000076293944, z: -1.3287149e-14} - m_LocalScale: {x: 1, y: 1.0000001, z: 0.99999994} - m_Children: [] - m_Father: {fileID: 577228044} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1962284261 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1962284262} - m_Layer: 0 - m_Name: Bip01_R_Toe0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1962284262 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1962284261} - m_LocalRotation: {x: 0.005790743, y: -0.008622324, z: -0.7664677, w: 0.642199} - m_LocalPosition: {x: -0.08594917, y: 0.066251084, z: -0.00000024639624} - m_LocalScale: {x: 1.0000001, y: 0.99999976, z: 1} - m_Children: - - {fileID: 2144060131} - m_Father: {fileID: 1702519657} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1963377758 GameObject: m_ObjectHideFlags: 0 @@ -256298,67 +254118,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!1 &1980221824 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1980221825} - m_Layer: 0 - m_Name: Bip01_R_Finger3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1980221825 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980221824} - m_LocalRotation: {x: -0.059120867, y: -0.21540792, z: 0.3762275, w: -0.899198} - m_LocalPosition: {x: -0.08151567, y: 0.013640919, z: -0.01601535} - m_LocalScale: {x: 1.0000004, y: 0.9999998, z: 1.0000001} - m_Children: - - {fileID: 1384604950} - m_Father: {fileID: 1428666999} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1980673542 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1980673543} - m_Layer: 0 - m_Name: Bip01_R_Finger2Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1980673543 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1980673542} - m_LocalRotation: {x: 0.00000019373944, y: 0.0000005065914, z: 0.99999994, w: 0.00034514573} - m_LocalPosition: {x: -0.025772667, y: -0.00000007629395, z: 0.000000028610224} - m_LocalScale: {x: 1.0000001, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1732458216} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1991550205 GameObject: m_ObjectHideFlags: 0 @@ -261221,68 +258980,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2084671494 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2084671495} - m_Layer: 0 - m_Name: Bip01_L_Finger31 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2084671495 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2084671494} - m_LocalRotation: {x: 0.094904214, y: -0.06476919, z: 0.025094012, w: -0.9930602} - m_LocalPosition: {x: -0.024786739, y: 0.00000007663179, z: 0.00000010266465} - m_LocalScale: {x: 1.0000002, y: 0.99999976, z: 1} - m_Children: - - {fileID: 291935597} - m_Father: {fileID: 1159088306} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2090757791 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2090757792} - m_Layer: 0 - m_Name: Bip01_R_Finger0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2090757792 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090757791} - m_LocalRotation: {x: -0.5996625, y: 0.43716633, z: -0.08323367, w: 0.6651035} - m_LocalPosition: {x: -0.05137855, y: 0.008330947, z: 0.037160244} - m_LocalScale: {x: 1.0000002, y: 0.99999964, z: 1.0000001} - m_Children: - - {fileID: 1251493304} - m_Father: {fileID: 1428666999} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2098653157 GameObject: m_ObjectHideFlags: 0 @@ -261294,8 +258991,8 @@ GameObject: - component: {fileID: 2098653161} - component: {fileID: 2098653160} - component: {fileID: 2098653159} - - component: {fileID: 2098653158} - component: {fileID: 2098653162} + - component: {fileID: 2098653158} m_Layer: 0 m_Name: Plane m_TagString: Untagged @@ -261303,8 +259000,8 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!64 &2098653158 -MeshCollider: +--- !u!65 &2098653158 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -261313,10 +259010,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 - m_Convex: 0 - m_CookingOptions: 14 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} + serializedVersion: 2 + m_Size: {x: 10.000002, y: 2.220446e-16, z: 10.000002} + m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2098653159 MeshRenderer: m_ObjectHideFlags: 0 @@ -261461,7 +259157,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2137539566 GameObject: @@ -261553,36 +259249,74 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: -137.82199, y: -87.41101, z: 86.146996} ---- !u!1 &2144060130 -GameObject: +--- !u!1001 &660368928556257865 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2144060131} - m_Layer: 0 - m_Name: Bip01_R_Toe0Nub - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2144060131 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2144060130} - m_LocalRotation: {x: 0.000001727194, y: 0.000000037252654, z: 0.00000016340393, - w: 1} - m_LocalPosition: {x: -0.03249138, y: 0.000000011962838, z: 5.1514347e-16} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1962284262} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1408780923508576172, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_Name + value: ColliderBox + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1408780923508576176, guid: 492f7cd89e8d31346b059f8e501681dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 492f7cd89e8d31346b059f8e501681dd, type: 3} diff --git a/Erika/Assets/Bundle/Shaders/Include.meta b/Erika/Assets/Bundle/Shaders/Include.meta deleted file mode 100644 index 2666365a..00000000 --- a/Erika/Assets/Bundle/Shaders/Include.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dc32af12c5122994d8791378227adeb6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Shaders/Unit/Effect.meta b/Erika/Assets/Bundle/Shaders/Unit/Effect.meta deleted file mode 100644 index 7df9a033..00000000 --- a/Erika/Assets/Bundle/Shaders/Unit/Effect.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9cc4684b9f432f149b16a51f148c9490 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Materials.meta b/Erika/Assets/Bundle/Unit/Colliders.meta index 614033e8..ad7e8f14 100644 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Materials.meta +++ b/Erika/Assets/Bundle/Unit/Colliders.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f011243a91422e848860a6f4340f6595 +guid: 08adfa6a6a6efb148b5a724bdaa21455 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Bundle/Unit/Colliders/ColliderBox.prefab b/Erika/Assets/Bundle/Unit/Colliders/ColliderBox.prefab new file mode 100644 index 00000000..e6ff38a3 --- /dev/null +++ b/Erika/Assets/Bundle/Unit/Colliders/ColliderBox.prefab @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1408780923508576172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1408780923508576176} + - component: {fileID: 1408780923508576173} + - component: {fileID: 1408780923508576177} + - component: {fileID: 6472023626838543295} + m_Layer: 0 + m_Name: ColliderBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1408780923508576176 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408780923508576172} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1408780923508576173 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408780923508576172} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &1408780923508576177 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408780923508576172} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 3 +--- !u!114 &6472023626838543295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408780923508576172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b6e50b8c49a6ee144830503d34593230, type: 3} + m_Name: + m_EditorClassIdentifier: + colliderType: 0 + owner: {fileID: 0} diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/FakeWindow.meta b/Erika/Assets/Bundle/Unit/Colliders/ColliderBox.prefab.meta index 08819e9e..822ee24e 100644 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Textures/FakeWindow.meta +++ b/Erika/Assets/Bundle/Unit/Colliders/ColliderBox.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 0c44684ee5c046f43832f30b4eb3f704 -folderAsset: yes -DefaultImporter: +guid: 492f7cd89e8d31346b059f8e501681dd +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta deleted file mode 100644 index ca7266b0..00000000 --- a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a1d7b6e0d8fb1a642a65011fb6cd7d89 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta deleted file mode 100644 index 142f5872..00000000 --- a/Erika/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6ad7401709700f34db2b795830937d76 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/NPC.meta b/Erika/Assets/Bundle/Unit/NPC.meta deleted file mode 100644 index eeea13e1..00000000 --- a/Erika/Assets/Bundle/Unit/NPC.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8ced034d375cdfa488814663ea17a79b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset b/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset index 1072a25e..854d9856 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset +++ b/Erika/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_2.asset @@ -17,45 +17,7 @@ MonoBehaviour: note: animationEvents: - {fileID: 114311271947421858} - hurtBoxes: - - collider: - type: 1 - pivot: 0 - multiHit: 0 - hitResponse: 0 - hitBack: {x: 0, y: 0, z: 0} - hitCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - freezeGlobal: 0 - freezeFramesSelf: 0 - freezeFramesOther: 0 - sparkPath: - sparkAnchor: 0 - sparkOffset: {x: 0, y: 0, z: 0} - sparkScale: {x: 1, y: 1, z: 1} - multiSparks: 0 - spark2Path: - spark2Anchor: 0 - spark2Offset: {x: 0, y: 0, z: 0} - spark3Path: - spark3Anchor: 0 - spark3Offset: {x: 0, y: 0, z: 0} - selfEffect: 0 - otherEffect: 0 - zoomCamera: 0 - shakeScreen: 0 - shakeOffset: {x: 0, y: 0} - shakeStrength: 0 - colorDrift: 0 - blur: 0 - soundPath: - useGravity: 0 - multiple: 0 - frames: [] + hurtBoxes: [] hitBoxes: - collider: type: 0 @@ -156,6 +118,10 @@ MonoBehaviour: m_keys: 01000000 m_values: - 0.12 + actionSettings: + isGun: 0 + cooldown: 0 + isAttack: 0 --- !u!114 &114157186485495952 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta deleted file mode 100644 index 8c41a6b2..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5dc1b71affc68b54594096a1b96a5c00 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta b/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta deleted file mode 100644 index 11148d17..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0d712421d808a43438a43d8a5d34effe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab b/Erika/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab index 41d2789c..7189d733 100644 --- a/Erika/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab +++ b/Erika/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab @@ -214,6 +214,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6930399342477815872} + - component: {fileID: 1630907127658890998} m_Layer: 0 m_Name: Bip01_R_Calf m_TagString: Untagged @@ -237,6 +238,20 @@ Transform: m_Father: {fileID: 6931862975547679840} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1630907127658890998 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6926567782030009328} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 0.1 + m_Height: 0.37 + m_Direction: 0 + m_Center: {x: -0.15, y: 0, z: 0} --- !u!1 &6926569683539314042 GameObject: m_ObjectHideFlags: 0 @@ -310,6 +325,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6931862975547679840} + - component: {fileID: 5178867036054511256} m_Layer: 0 m_Name: Bip01_R_Thigh m_TagString: Untagged @@ -332,6 +348,20 @@ Transform: m_Father: {fileID: 6931910881339740176} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &5178867036054511256 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6926595750892554656} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 0.1 + m_Height: 0.32 + m_Direction: 0 + m_Center: {x: -0.15, y: 0, z: 0} --- !u!1 &6926619748224588722 GameObject: m_ObjectHideFlags: 0 @@ -499,6 +529,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6930266010808624108} + - component: {fileID: 4263223576988327993} m_Layer: 0 m_Name: Bip01_L_Thigh m_TagString: Untagged @@ -521,6 +552,20 @@ Transform: m_Father: {fileID: 6931910881339740176} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &4263223576988327993 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6928010566799161970} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 0.1 + m_Height: 0.32 + m_Direction: 0 + m_Center: {x: -0.15, y: 0, z: 0} --- !u!1 &6928012617035205996 GameObject: m_ObjectHideFlags: 0 @@ -594,7 +639,6 @@ GameObject: - component: {fileID: 7023111129766813114} - component: {fileID: 5512425670061407962} - component: {fileID: 5127450053073716701} - - component: {fileID: 2095437511} - component: {fileID: 2095437512} m_Layer: 0 m_Name: Erika_Robot @@ -652,6 +696,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: showGizmos: 1 + characterControllerSetting: + center: {x: 0, y: 1, z: 0} + radius: 0.5 + height: 2 + skinWidth: 0.0001 rootBone: {fileID: 6930221487356679114} afterImageAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab snapshotAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_Snapshot.prefab @@ -743,20 +792,6 @@ MonoBehaviour: - {fileID: 2095437512} m_GuardBoxes: [] m_TriggerBoxes: [] ---- !u!136 &2095437511 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6928033330946439154} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.5 - m_Height: 2.6290653 - m_Direction: 1 - m_Center: {x: 0, y: 1.2972177, z: 0} --- !u!114 &2095437512 MonoBehaviour: m_ObjectHideFlags: 0 @@ -769,9 +804,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 91537a55ed7187b49ac3636609b05f43, type: 3} m_Name: m_EditorClassIdentifier: - m_ID: 1 + m_ID: 0 m_Colliders: - - {fileID: 2095437511} + - {fileID: 5946264143219188484} + - {fileID: 7422617487119414037} + - {fileID: 5178867036054511256} + - {fileID: 1630907127658890998} + - {fileID: 4263223576988327993} + - {fileID: 1653403851519477410} --- !u!1 &6928056367075676882 GameObject: m_ObjectHideFlags: 0 @@ -874,6 +914,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6930315471109823840} + - component: {fileID: 5946264143219188484} m_Layer: 0 m_Name: Bip01_Head m_TagString: Untagged @@ -896,6 +937,19 @@ Transform: m_Father: {fileID: 6931808467863946034} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &5946264143219188484 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6928068912984293090} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.09109698 + m_Center: {x: -0.023186713, y: -0.0046714195, z: -0.0000000056737437} --- !u!1 &6928090713769608000 GameObject: m_ObjectHideFlags: 0 @@ -1766,6 +1820,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6932088213832717862} + - component: {fileID: 7422617487119414037} m_Layer: 0 m_Name: Bip01_Spine1 m_TagString: Untagged @@ -1788,6 +1843,19 @@ Transform: m_Father: {fileID: 6930073807658420724} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &7422617487119414037 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6928438565542991688} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.18626271 + m_Center: {x: -0.0010101823, y: -0.011837016, z: -3.0086933e-10} --- !u!1 &6928439052030577736 GameObject: m_ObjectHideFlags: 0 @@ -2003,6 +2071,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6932062504377624008} + - component: {fileID: 1653403851519477410} m_Layer: 0 m_Name: Bip01_L_Calf m_TagString: Untagged @@ -2026,6 +2095,20 @@ Transform: m_Father: {fileID: 6930266010808624108} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1653403851519477410 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6928569945189487090} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + m_Radius: 0.1 + m_Height: 0.35673413 + m_Direction: 0 + m_Center: {x: -0.16071744, y: -0.00000003820126, z: 0.000000019714431} --- !u!1 &6928578483659482256 GameObject: m_ObjectHideFlags: 0 diff --git a/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta deleted file mode 100644 index 7d4b13eb..00000000 --- a/Erika/Assets/Bundle/Unit/PC/Erika/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 922befa8a94692845b88500a23229d7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta deleted file mode 100644 index f5434a00..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07c3b2bf6cb8cc2498422bbb105cbad8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta deleted file mode 100644 index 4ed2c938..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 827d77abe87680a47ae2d71a9e953a18 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta deleted file mode 100644 index 43a52cd1..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a2b72fbb41383047ac45e6c22ea9663 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta deleted file mode 100644 index 85d58a8c..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2b0838fb0603964e99904eefe81ad7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta deleted file mode 100644 index dd867045..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c8a678ea9e801f439a1003d04f33cf5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta deleted file mode 100644 index dc530723..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ebf636c7cf7b1934b885298ce1f5f42e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta deleted file mode 100644 index b28b6f04..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2022e8298d3a8624992143eb57c0f8ac -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta deleted file mode 100644 index eeca0d3b..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6aa859c834c51f498ef0b3c3b83a0f5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta deleted file mode 100644 index 7f91da28..00000000 --- a/Erika/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df69962f5b01e444a8bea87e31c7d0a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Bundle/Unit/Prop.meta b/Erika/Assets/Bundle/Unit/Prop.meta deleted file mode 100644 index affd6eed..00000000 --- a/Erika/Assets/Bundle/Unit/Prop.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dafc173db1ebeab4c80641cc3d4fa528 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Models/Materials.meta b/Erika/Assets/ProBuilder Data.meta index 95c1c297..8424bd32 100644 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Models/Materials.meta +++ b/Erika/Assets/ProBuilder Data.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6fcbe8b33ea8cfc4c97e5863c65eca05 +guid: 62b452114e207404bacccba32c7da124 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Scripts/ApplicationMain.cs b/Erika/Assets/Scripts/ApplicationMain.cs index 558a8c9d..5e78d6af 100644 --- a/Erika/Assets/Scripts/ApplicationMain.cs +++ b/Erika/Assets/Scripts/ApplicationMain.cs @@ -7,16 +7,16 @@ public class ApplicationMain : MonoBehaviour void Start() { _InputManager.Instance.Init(); - PhysicsWorld.Instance.Init();
+ //PhysicsWorld.Instance.Init();
- PhysicsWorld.Instance.onUpdate += OnPhysicsUpdate; + //PhysicsWorld.Instance.onUpdate += OnPhysicsUpdate; } void Update() { _InputManager.Instance.Update();
AvatarManager.Instance.OnUpdate();
- PhysicsWorld.Instance.Update();
+ //PhysicsWorld.Instance.Update();
} void OnPhysicsUpdate()
@@ -27,7 +27,8 @@ public class ApplicationMain : MonoBehaviour private void OnDrawGizmos()
{
- PhysicsWorld.Instance.DrawGizmos();
+
+
} }
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Curve3D.meta b/Erika/Assets/Scripts/Curve3D.meta deleted file mode 100644 index fef1c5e7..00000000 --- a/Erika/Assets/Scripts/Curve3D.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad8b718b6b700d8419838dad07158567 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Data/StaticDefine.cs b/Erika/Assets/Scripts/Data/StaticDefine.cs index 0d3384be..afbbffe9 100644 --- a/Erika/Assets/Scripts/Data/StaticDefine.cs +++ b/Erika/Assets/Scripts/Data/StaticDefine.cs @@ -10,6 +10,8 @@ public static class StaticDefine { EImageEffectMaterails.Glitch, "Assets/Bundle/Materials/Unit/ImageEffect/unit_img_glitch.mat"},
};
+ // 碰撞体prefab路径
+ public static string collider = "Assets/Bundle/Unit/Colliders/ColliderBox.prefab";
public struct ShaderDefine
{
diff --git a/Erika/Assets/Scripts/Drone.meta b/Erika/Assets/Scripts/Drone.meta deleted file mode 100644 index 694cff70..00000000 --- a/Erika/Assets/Scripts/Drone.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ec3412151f8a72a41b2ed21316763399 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Managers/Physics.meta b/Erika/Assets/Scripts/Managers/Physics.meta deleted file mode 100644 index 2296b3f8..00000000 --- a/Erika/Assets/Scripts/Managers/Physics.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 603d4624aaedd794cb89497954a83f4a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Physics/PhysicsWorld.cs b/Erika/Assets/Scripts/Physics/PhysicsWorld.cs index a9712c48..58741baa 100644 --- a/Erika/Assets/Scripts/Physics/PhysicsWorld.cs +++ b/Erika/Assets/Scripts/Physics/PhysicsWorld.cs @@ -11,6 +11,7 @@ using UnityEngine; /// <summary>
/// primitive分类
/// </summary>
+[System.Obsolete("废弃，改为用Physics.OverlapXXX和Colliders")]
public enum PhysicsGroup
{
Character, // 角色
@@ -27,6 +28,7 @@ public enum PhysicsGroup /// <summary>
/// primitive标记
/// </summary>
+[System.Obsolete("废弃，改为用Physics.OverlapXXX和Colliders")]
public enum PhysicsTag
{
Null = 0,
@@ -37,6 +39,7 @@ public enum PhysicsTag /// <summary>
/// 物理子系统
/// </summary>
+[System.Obsolete("废弃，改为用Physics.OverlapXXX和Colliders")]
public class PhysicsWorld : Singleton<PhysicsWorld>
{
public delegate void Callback();
diff --git a/Erika/Assets/Scripts/Projectile/Projectile.cs b/Erika/Assets/Scripts/Projectile/Projectile.cs index ba325302..8678e58b 100644 --- a/Erika/Assets/Scripts/Projectile/Projectile.cs +++ b/Erika/Assets/Scripts/Projectile/Projectile.cs @@ -96,7 +96,7 @@ public class Projectile : MonoBehaviour void OnEnable()
{
- ColliderRegistry.Instance.AddProjectile(this);
+ //ColliderRegistry.Instance.AddProjectile(this);
}
public void Update()
@@ -120,7 +120,7 @@ public class Projectile : MonoBehaviour void OnDestroy()
{
- ColliderRegistry.Instance.RemoveProjectile(this);
+ //ColliderRegistry.Instance.RemoveProjectile(this);
}
public IEnumerable GetCollidersInWorldSpace()
@@ -182,20 +182,20 @@ public class Projectile : MonoBehaviour m_Hitmask.Add(targethash);
}
- public void OnShot(CollisionInfo collision)
- {
- GameObject spark = ResourceManager.Instance.LoadAsset<GameObject>(sparkPath);
- if (spark)
- {
- GameObject obj = GameObject.Instantiate(spark);
-#if UNITY_EDITOR
- obj.transform.SetParent(TimelineEventProxy.Root_Particles.transform);
-#endif
- obj.transform.position = collision.collidee.unitCollider.owner.center;
-
- markDestroy = true;
- }
- }
+// public void OnShot(CollisionInfo collision)
+// {
+// GameObject spark = ResourceManager.Instance.LoadAsset<GameObject>(sparkPath);
+// if (spark)
+// {
+// GameObject obj = GameObject.Instantiate(spark);
+//#if UNITY_EDITOR
+// obj.transform.SetParent(TimelineEventProxy.Root_Particles.transform);
+//#endif
+// obj.transform.position = collision.collidee.unitCollider.owner.center;
+
+// markDestroy = true;
+// }
+// }
public bool HasTag(string tag)
{
diff --git a/Erika/Assets/Scripts/Props.meta b/Erika/Assets/Scripts/Props.meta deleted file mode 100644 index bb96602e..00000000 --- a/Erika/Assets/Scripts/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f299520ed9fcf4a45858ad4ef5a8d5d1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Robot.meta b/Erika/Assets/Scripts/Robot.meta deleted file mode 100644 index 0b5a087e..00000000 --- a/Erika/Assets/Scripts/Robot.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7c09ca1609552d24bbe697d1516f8aa9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/TestErika.meta b/Erika/Assets/Scripts/TestErika.meta deleted file mode 100644 index e7feed7d..00000000 --- a/Erika/Assets/Scripts/TestErika.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1efd025b77f12134b82d58b88b3b164e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/TestOther.meta b/Erika/Assets/Scripts/TestOther.meta deleted file mode 100644 index a952af42..00000000 --- a/Erika/Assets/Scripts/TestOther.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8b12a4a6f7bf099448fa5babf1e6c7dd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Actions.meta b/Erika/Assets/Scripts/Unit/AI/Actions.meta deleted file mode 100644 index 9b4ad463..00000000 --- a/Erika/Assets/Scripts/Unit/AI/Actions.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 971e9d55b8bc0894eb6a110fb962000b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta b/Erika/Assets/Scripts/Unit/AI/Conditionals.meta deleted file mode 100644 index 70a86da5..00000000 --- a/Erika/Assets/Scripts/Unit/AI/Conditionals.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 85b7e0c7ed1d12f42a5178bfbf3d934c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/AnimationData.cs b/Erika/Assets/Scripts/Unit/AnimationData.cs index 323f21d4..3f516d4b 100644 --- a/Erika/Assets/Scripts/Unit/AnimationData.cs +++ b/Erika/Assets/Scripts/Unit/AnimationData.cs @@ -324,11 +324,25 @@ public class AnimationData : ScriptableObject return toggles[toggle].to >= normalizedTime && normalizedTime >= toggles[toggle].from;
}
+ /// <summary>
+ /// 获得某个playback时刻的碰撞盒数据
+ /// </summary>
+ /// <param name="type"></param>
+ /// <param name="index"></param>
+ /// <param name="playbackTime"></param>
+ /// <returns></returns>
public ColliderInfo GetColliderInfo(ColliderBox.EColliderType type, int index, float playbackTime)
{
return GetColliderInfoByFrame(type, index, playbackTime * FPS);
}
+ /// <summary>
+ /// 获得某个帧的碰撞盒数据
+ /// </summary>
+ /// <param name="type"></param>
+ /// <param name="index"></param>
+ /// <param name="frame"></param>
+ /// <returns></returns>
public ColliderInfo GetColliderInfoByFrame(ColliderBox.EColliderType type, int index, float frame)
{
ColliderInfo info = new ColliderInfo();
diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs index 24319ef2..b44f2bf3 100644 --- a/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox.cs @@ -16,11 +16,11 @@ public partial class ColliderBox // 分化为不同的collider类型
public enum EColliderType
{
- HitBox,
- HurtBox,
- ThrowBox,
- BlockBox,
- DefendBox,
+ HitBox, // Triggers //Physics.OverlapXXX()
+ HurtBox, // Triggers
+ ThrowBox, // Triggers
+ BlockBox, // Triggers
+ DefendBox, // Triggers
}
[DisallowModifiyInGUI]
diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs index 9f1d629a..f2549984 100644 --- a/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderBox_Hitbox.cs @@ -2,8 +2,10 @@ // 打击感相关资料
// https://gameinstitute.qq.com/community/detail/112371
-//
+/// <summary>
+/// 攻击盒，用Physics.OverlayXXX检测和其他盒子的碰撞
+/// </summary>
public partial class ColliderBox {
diff --git a/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs b/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs index 408ce5a4..5fe6c912 100644 --- a/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs +++ b/Erika/Assets/Scripts/Unit/Collider/ColliderRegistry.cs @@ -1,7 +1,10 @@ -using System.Collections; +// 废弃，改为用Physics.OverlapXXX和Colliders + +using System.Collections; using System.Collections.Generic; using UnityEngine; +[System.Obsolete("废弃，改为用Physics.OverlapXXX和Colliders")] public class ColliderRegistry : Singleton<ColliderRegistry> { public List<UnitCollider> colliders = new List<UnitCollider>(); diff --git a/Erika/Assets/Scripts/Unit/Collider/CollisionHandler.cs b/Erika/Assets/Scripts/Unit/Collider/CollisionHandler.cs new file mode 100644 index 00000000..0dd68d40 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/CollisionHandler.cs @@ -0,0 +1,49 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CollisionHandler : MonoBehaviour +{ + + public ColliderBox.EColliderType colliderType; + + public ColliderData colliderData; + + public UnitController owner; + + public void Initialize(ColliderBox.EColliderType type, UnitController owner) + { + this.colliderType = type; + this.owner = owner; + } + + public void OnTriggerEnter(Collider other) + { + CollisionHandler otherHandler = other.GetComponent<CollisionHandler>(); + if (otherHandler == null) + return; + + if(owner != null) + { + owner.OnCollision(otherHandler.owner); + } + + if(otherHandler.owner != null) + { + otherHandler.owner.OnCollision(owner); + } + + } + + public void OnTriggerStay(Collider other) + { + + } + + public void OnTriggerExit(Collider other) + { + + } + +} diff --git a/Erika/Assets/Scripts/Unit/Collider/CollisionHandler.cs.meta b/Erika/Assets/Scripts/Unit/Collider/CollisionHandler.cs.meta new file mode 100644 index 00000000..2fba0fdc --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Collider/CollisionHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b6e50b8c49a6ee144830503d34593230 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs b/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs index 83052073..8149f6a3 100644 --- a/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs +++ b/Erika/Assets/Scripts/Unit/Collider/CollisionSystem.cs @@ -1,4 +1,6 @@ -using System; +// 废弃，改为用Physics.OverlapXXX和Colliders + +using System; using System.Collections.Generic; using UnityEngine; @@ -23,6 +25,7 @@ public struct CollisionInfo public bool isCollision; } +[Obsolete("废弃，改为用Physics.OverlapXXX和Colliders")] public class CollisionSystem : SingletonMB<CollisionSystem> { public delegate void StageHandle(); @@ -97,8 +100,8 @@ public class CollisionSystem : SingletonMB<CollisionSystem> if (!hitbox.unitCollider.CanCollide(hitbox.colliderInfo.colliderHash, hurtbox.unitCollider.owner.GetHashCode())) continue; hitbox.unitCollider.RecordCollision(hitbox.colliderInfo.colliderHash, hurtbox.unitCollider.owner.GetHashCode()); - hitbox.unitCollider.owner.OnHit(collision); - hurtbox.unitCollider.owner.OnGetHit(collision); + //hitbox.unitCollider.owner.OnHit(collision); + //hurtbox.unitCollider.owner.OnGetHit(collision); } } @@ -150,8 +153,8 @@ public class CollisionSystem : SingletonMB<CollisionSystem> collision.isCollision = true;
collision.intersection = intersection;
collision.collidee = hurtCollider;
- hurtCollider.unitCollider.owner.OnGetShot(collision);
- projectile.OnShot(collision);
+ //hurtCollider.unitCollider.owner.OnGetShot(collision);
+ //projectile.OnShot(collision);
goto next;
}
@@ -184,6 +187,7 @@ public class CollisionSystem : SingletonMB<CollisionSystem> } + public static class ColliderUtility
{
public static CollisionInfo GetCollision(ColliderDescriptor collider, ColliderDescriptor collidee)
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs index 48ec46bb..6858fe74 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitCollider.cs @@ -8,18 +8,19 @@ public class UnitCollider : UnitComponent { public bool showGizmos; - private Dictionary<int/*hitbox hash*/, List<int/*unitController hash*/>> m_HitMask = new Dictionary<int, List<int>>(); + [System.Obsolete("废弃")] + private Dictionary<int/*hitbox hash*/, List<int/*unitController hash*/>> m_HitMask = new Dictionary<int, List<int>>(); public override void Awake() { base.Awake(); - ColliderRegistry.Instance.AddCollider(this); + //ColliderRegistry.Instance.AddCollider(this); } public override void OnDestroy() { - ColliderRegistry.Instance.RemoveCollider(this); + //ColliderRegistry.Instance.RemoveCollider(this); base.OnDestroy(); } @@ -30,7 +31,12 @@ public class UnitCollider : UnitComponent showGizmos = true; } - // 返回当前激活的对应类型的碰撞盒数据 + /// <summary> + /// 返回当前激活的对应类型的碰撞盒数据 + /// </summary> + /// <param name="type"></param> + /// <param name="layer"></param> + /// <returns></returns> public ColliderInfo[] GetCurrentBoxesInfoByType(ColliderBox.EColliderType type, int layer = 0) { AnimationData animData = m_Owner.unitAnimation.animationData; @@ -40,12 +46,16 @@ public class UnitCollider : UnitComponent return infos; } - // 动作切换，重置collider mask - public void OnAnimationChange() + /// <summary> + /// 动作切换，重置collider mask + /// </summary> + [System.Obsolete("废弃")] + public void OnAnimationChange() { m_HitMask.Clear(); } + [System.Obsolete("废弃")] public void RecordCollision(int colliderHash, int targetHash) { List<int> record; @@ -57,6 +67,7 @@ public class UnitCollider : UnitComponent record.Add(targetHash); } + [System.Obsolete("废弃")] public bool CanCollide(int colliderHash, int targetHash) { List<int> record; diff --git a/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs b/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs index ef4676a4..b3d0c580 100644 --- a/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs +++ b/Erika/Assets/Scripts/Unit/Components/UnitPhysicsBoxCollection.cs @@ -2,6 +2,9 @@ using System.Collections.Generic;
using UnityEngine;
+/// <summary>
+/// 角色身体上所有trigger集合
+/// </summary>
public class UnitPhysicsBoxCollection : UnitComponent
{
// 列表里不一定按顺序存储
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta b/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta deleted file mode 100644 index 13682d7f..00000000 --- a/Erika/Assets/Scripts/Unit/Components/UnitState/CyberAngel.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fa5eb9b1f1ac0184b9daa4cab5baaf64 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs index 22645b47..f75933cc 100644 --- a/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs +++ b/Erika/Assets/Scripts/Unit/Controller/MonsterController.cs @@ -22,42 +22,42 @@ public class MonsterController : UnitController base.Update();
}
- public override void OnHit(CollisionInfo info)
- {
- }
+ //public override void OnHit(CollisionInfo info)
+ //{
+ //}
- public override void OnGetHit(CollisionInfo info)
- {
- ColliderBox hitbox = info.collider.colliderInfo.collider;
- Debug.Assert(hitbox.type == ColliderBox.EColliderType.HitBox);
+ // public override void OnGetHit(CollisionInfo info)
+ // {
+ // ColliderBox hitbox = info.collider.colliderInfo.collider;
+ // Debug.Assert(hitbox.type == ColliderBox.EColliderType.HitBox);
- if(hitbox.hitResponse == ColliderBox.EHitResponse.Light)
- {
- monsterState.ChangeState(MonsterState.EUnitState.HitLight, new MonsterState.HitLightParam(), true);
- }
- else if (hitbox.hitResponse == ColliderBox.EHitResponse.HitAir)
- {
- monsterState.ChangeState(MonsterState.EUnitState.HitAir, new MonsterState.HitAirParam());
- }
- else if (hitbox.hitResponse == ColliderBox.EHitResponse.HitInAir)
- {
- monsterState.ChangeState(MonsterState.EUnitState.HitInAir, new MonsterState.HitInAirParam(), true);
- }
+ // if(hitbox.hitResponse == ColliderBox.EHitResponse.Light)
+ // {
+ // monsterState.ChangeState(MonsterState.EUnitState.HitLight, new MonsterState.HitLightParam(), true);
+ // }
+ // else if (hitbox.hitResponse == ColliderBox.EHitResponse.HitAir)
+ // {
+ // monsterState.ChangeState(MonsterState.EUnitState.HitAir, new MonsterState.HitAirParam());
+ // }
+ // else if (hitbox.hitResponse == ColliderBox.EHitResponse.HitInAir)
+ // {
+ // monsterState.ChangeState(MonsterState.EUnitState.HitInAir, new MonsterState.HitInAirParam(), true);
+ // }
- string path = hitbox.sparkPath;
- GameObject vfx = ResourceManager.Instance.LoadAsset<GameObject>(path);
- if(vfx != null)
- {
- GameObject go = GameObject.Instantiate(vfx);
- go.transform.position = center + hitbox.sparkOffset;
- go.transform.localScale = hitbox.sparkScale;
- }
- }
+ // string path = hitbox.sparkPath;
+ //GameObject vfx = ResourceManager.Instance.LoadAsset<GameObject>(path);
+ // if(vfx != null)
+ // {
+ // GameObject go = GameObject.Instantiate(vfx);
+ // go.transform.position = center + hitbox.sparkOffset;
+ // go.transform.localScale = hitbox.sparkScale;
+ // }
+ // }
- public override void OnGetShot(CollisionInfo info)
- {
- monsterState.ChangeState(MonsterState.EUnitState.HitLight, new MonsterState.HitLightParam(), true);
- }
+ // public override void OnGetShot(CollisionInfo info)
+ // {
+ // monsterState.ChangeState(MonsterState.EUnitState.HitLight, new MonsterState.HitLightParam(), true);
+ // }
public virtual bool IsFacePC()
{
diff --git a/Erika/Assets/Scripts/Unit/Controller/PCController.cs b/Erika/Assets/Scripts/Unit/Controller/PCController.cs index 35645d57..e634a4bb 100644 --- a/Erika/Assets/Scripts/Unit/Controller/PCController.cs +++ b/Erika/Assets/Scripts/Unit/Controller/PCController.cs @@ -44,15 +44,15 @@ public class PCController : UnitController unitImageEffect.OnUpdate();
}
- public override void OnHit(CollisionInfo info)
- {
- ColliderBox hitbox = info.collider.colliderInfo.collider;
- Debug.Assert(hitbox.type == ColliderBox.EColliderType.HitBox);
- }
+ //public override void OnHit(CollisionInfo info)
+ //{
+ // ColliderBox hitbox = info.collider.colliderInfo.collider;
+ // Debug.Assert(hitbox.type == ColliderBox.EColliderType.HitBox);
+ //}
- public override void OnGetHit(CollisionInfo info)
- {
- }
+ //public override void OnGetHit(CollisionInfo info)
+ //{
+ //}
public override void OnGrab()
{
diff --git a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs index e77b8435..f5577077 100644 --- a/Erika/Assets/Scripts/Unit/Controller/UnitController.cs +++ b/Erika/Assets/Scripts/Unit/Controller/UnitController.cs @@ -52,6 +52,8 @@ public class UnitController : MonoBehaviour/*, Interactable*/ protected List<UnitComponent> unitComponents;
+ public CharacterController unitCharacterController;
+
#region 事件监听
public delegate void OnTimelineEventHandle(AnimationEventBase animEvent);
public OnTimelineEventHandle onTimelineEvent { get; set; }
@@ -193,7 +195,14 @@ public class UnitController : MonoBehaviour/*, Interactable*/ unitPreprocessing = GetOrAddUnitComponent<UnitPreprocessing>();
unitPreprocessing.Initialize();
- }
+
+ unitCharacterController = gameObject.GetOrAddComponent<CharacterController>();
+ unitCharacterController.center = unitDetail.characterControllerSetting.center;
+ unitCharacterController.radius = unitDetail.characterControllerSetting.radius;
+ unitCharacterController.height = unitDetail.characterControllerSetting.height;
+ unitCharacterController.skinWidth = unitDetail.characterControllerSetting.skinWidth;
+
+ }
private void OnPostInitailize()
{
@@ -221,25 +230,13 @@ public class UnitController : MonoBehaviour/*, Interactable*/ unitSkill.OnUpdate();
unitRootMotion.OnUpdate();
unitLensEffect.OnUpdate();
+ unitPhysicsBoxes.OnUpdate();
}
public virtual void OnDestroy()
{
}
- public virtual void OnHit(CollisionInfo info)
- {
- }
-
- public virtual void OnGetHit(CollisionInfo info)
- {
- }
-
- public virtual void OnGetShot(CollisionInfo info)
- {
- }
-
-
public virtual void OnGrab()
{
}
@@ -270,4 +267,14 @@ public class UnitController : MonoBehaviour/*, Interactable*/ UnitSnapshotInfo snapshot = new UnitSnapshotInfo();
return snapshot;
}
+
+ #region 物理碰撞
+
+ public void OnCollision(UnitController other)
+ {
+
+ }
+
+ #endregion
+
}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Events/EventCollider_Enable.cs b/Erika/Assets/Scripts/Unit/Events/EventCollider_Enable.cs new file mode 100644 index 00000000..a9cec9d4 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventCollider_Enable.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EventCollider_Enable : AnimationEventBase +{ + public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventCollider_Enable; + + public override string shortName => "C"; + + [Tooltip("是否开启collider")] + public bool enabled = true; + +}
\ No newline at end of file diff --git a/Erika/Assets/Scripts/Unit/Events/EventCollider_Enable.cs.meta b/Erika/Assets/Scripts/Unit/Events/EventCollider_Enable.cs.meta new file mode 100644 index 00000000..cba0d755 --- /dev/null +++ b/Erika/Assets/Scripts/Unit/Events/EventCollider_Enable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61052caf1b575b344b9f319dbe3a31c6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs index 453f1903..61981620 100644 --- a/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Erika/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -50,6 +50,8 @@ public partial class TimelineEventProxy {
EventGame_TimeScale, // 缩放时间
+ EventCollider_Enable, // 开启\隐藏Collider
+
EventMesh_ImageEffect_MotionBlur, // 运动模糊 EventMesh_ImageEffect_Glitch, // glitch
diff --git a/Erika/Assets/Scripts/Unit/UnitDetail.cs b/Erika/Assets/Scripts/Unit/UnitDetail.cs index 56858b0b..b6c11a1a 100644 --- a/Erika/Assets/Scripts/Unit/UnitDetail.cs +++ b/Erika/Assets/Scripts/Unit/UnitDetail.cs @@ -68,6 +68,15 @@ public interface IBodyJointAgent UnitReferencePointDictionary referencePoints { get; }
} +[Serializable] +public struct CharacterControllerSetting
+{
+ [SerializeField] public Vector3 center;
+ [SerializeField] public float radius;
+ [SerializeField] public float height;
+ [SerializeField] public float skinWidth;
+} + // 角色的prefab附加数据 // * afterimage的prefab // * 骨骼映射 @@ -77,6 +86,8 @@ public class UnitDetail : MonoBehaviour, IBodyRendererAgent, IBodyJointAgent { public bool showGizmos;
+ public CharacterControllerSetting characterControllerSetting;
+
[FormerlySerializedAs("root")] public Transform rootBone; diff --git a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs index 140882d3..4af74c9d 100644 --- a/Erika/Assets/Scripts/Unit/UnitRootMotion.cs +++ b/Erika/Assets/Scripts/Unit/UnitRootMotion.cs @@ -103,7 +103,7 @@ public class UnitRootMotion : UnitComponent if(m_Owner.transform.position.y + realDest.y < 0)
realDest.y = 0;
}
- m_Owner.transform.position += realDest;
+ m_Owner.unitCharacterController.Move(realDest);
m_PrevFrame = frame;
}
@@ -119,10 +119,10 @@ public class UnitRootMotion : UnitComponent dest.y = 0;
}
dest.y = Mathf.Max(0, dest.y); // 从地面以下拉回
- //m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ
- m_Owner.transform.position += dest;
- }
- }
+ //m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ
+ m_Owner.unitCharacterController.Move(dest);
+ }
+ }
#endif
diff --git a/Erika/Assets/Scripts/Utils/UnityExtends.cs b/Erika/Assets/Scripts/Utils/UnityExtends.cs index d1a66f48..c5592d86 100644 --- a/Erika/Assets/Scripts/Utils/UnityExtends.cs +++ b/Erika/Assets/Scripts/Utils/UnityExtends.cs @@ -4,7 +4,7 @@ using UnityEngine; public static class UnityExtends { - public static T GetOrAddComponent<T>(this GameObject go) where T : MonoBehaviour + public static T GetOrAddComponent<T>(this GameObject go) where T : Component { T component = go.GetComponent<T>(); if (component == null) diff --git a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Prefabs/Ambient-Occlusion.meta b/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta index 0da2810c..7c152025 100644 --- a/Erika/Assets/AmplifyShaderEditor/Examples/Assets/Prefabs/Ambient-Occlusion.meta +++ b/Erika/Assets/ThirdParty/UMotion/UMotionExamples/Example Scene.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d41c2dcba620d3e45b7d542b9312625f +guid: 13ba4d2ee6e74bf4b9aea7f330df39c2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Erika/Assets/Tools/ActionTool/Editor/ActionEditor.cs b/Erika/Assets/Tools/ActionTool/Editor/ActionEditor.cs index 12057cf7..da95a70d 100644 --- a/Erika/Assets/Tools/ActionTool/Editor/ActionEditor.cs +++ b/Erika/Assets/Tools/ActionTool/Editor/ActionEditor.cs @@ -67,7 +67,7 @@ namespace ActionTool {
GUILayout.BeginHorizontal();
- GameObject selectObj = EditorGUILayout.ObjectField(ActionManager.CurrentUnit, typeof(GameObject), false, GUILayout.Width(position.width - 160)) as GameObject;
+ GameObject selectObj = EditorGUILayout.ObjectField(ActionManager.CurrentUnit, typeof(GameObject), false, GUILayout.Width(position.width - 240)) as GameObject;
if (selectObj != null && selectObj != ActionManager.CurrentUnit)
{
@@ -100,7 +100,12 @@ namespace ActionTool ActionManager.OnSelectObj(ActionManager.CurrentUnit);
}
- GUILayout.EndHorizontal();
+ if (GUILayout.Button("Clear", GUILayout.Width(70)))
+ {
+ ActionManager.Clear();
+ }
+
+ GUILayout.EndHorizontal();
//var scene = EditorSceneManager.GetActiveScene();
//if (scene == null || scene.path != ActionManager.scenePath)
diff --git a/Erika/Assets/Tools/ActionTool/Editor/ActionManager.cs b/Erika/Assets/Tools/ActionTool/Editor/ActionManager.cs index f88f73e3..60e0a8de 100644 --- a/Erika/Assets/Tools/ActionTool/Editor/ActionManager.cs +++ b/Erika/Assets/Tools/ActionTool/Editor/ActionManager.cs @@ -158,7 +158,7 @@ namespace ActionTool string folder = Path.GetDirectoryName(path).Replace('\\', '/');
folder = folder.Substring(0, folder.LastIndexOf('/'));
unitFolder = folder + "/";
- s_UnitInstance = GameObject.Instantiate(obj);
+ s_UnitInstance = GameObject.Instantiate(obj); // 实例化角色prefab
InitializeUnitInstance(s_UnitInstance);
}
onSelectObj?.Invoke(obj);
@@ -228,6 +228,11 @@ namespace ActionTool s_CurrentAnimationName = null;
}
+ public static void Clear()
+ {
+ Release();
+ }
+
private static void InitializeUnitInstance(GameObject unit)
{
if (unit == null)
@@ -243,6 +248,7 @@ namespace ActionTool unitRoot.transform.localScale = Vector3.one;
unitRoot.transform.rotation = s_InitRotation;
unitRoot.transform.position = s_InitPosition;
+
unit.transform.SetParent(unitRoot.transform);
s_RootActionTool = GameObject.Find(kRootActionTool);
diff --git a/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs b/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs index 8bad9869..51a8194f 100644 --- a/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Erika/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs @@ -115,13 +115,16 @@ namespace ActionTool GUI_Detail(ref y);
GUI_ActionSettings(ref y);
GUI_Properties(ref y);
+ GUI_TimeRelatedBg(ref y, 4);
+ y += 5;
GUI_Parameters(ref y);
GUI_Toggle(ref y);
GUI_Curves(ref y);
GUI_Curve(ref y);
- GUI_PlaybackTime(ref y);
- y += 5;
+ y += 12;
GUI_Setting(ref y);
+ y += 5;
+ GUI_PlaybackTime(ref y);
GUI_TimeLineView(ref y);
}
@@ -147,7 +150,7 @@ namespace ActionTool x += 20;
GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.animationData != null;
- GUI_Toolbar_NewHurtBox(ref x, ref y);
+ //GUI_Toolbar_NewHurtBox(ref x, ref y);
GUI_Toolbar_NewHitBox(ref x, ref y);
GUI_Toolbar_NewThrowBox(ref x, ref y);
GUI_Toolbar_NewBlockBox(ref x, ref y);
@@ -284,7 +287,7 @@ namespace ActionTool AnimationData animData = ActionManager.animationData;
ActionInfoEditor.ShowContent("AnimationData Info",
"Events: " + (animData.animationEvents == null ? 0 : animData.animationEvents.Count) + "\n" +
- "HurtBoxes: " + (animData.hurtBoxes == null ? 0 : animData.hurtBoxes.Count) + "\n" +
+ // "HurtBoxes: " + (animData.hurtBoxes == null ? 0 : animData.hurtBoxes.Count) + "\n" +
"HitBoxes: " + (animData.hitBoxes == null ? 0 : animData.hitBoxes.Count) + "\n" +
"ThrowBoxes: " + (animData.throwBoxes == null ? 0 : animData.throwBoxes.Count) + "\n" +
"BlockBoxes: " + (animData.blockBoxes == null ? 0 : animData.blockBoxes.Count) + "\n" +
@@ -400,6 +403,12 @@ namespace ActionTool y += 15;
}
+ void GUI_TimeRelatedBg(ref float y, int lineCount)
+ {
+ Rect bgRect = new Rect(3, y + 3, position.width - 6, 15 * lineCount + 6);
+ EditorGUI.DrawRect(bgRect, new Color32(65, 65, 65, 255));
+ }
+
void GUI_ActionSettings(ref float y)
{
AnimationData animData = ActionManager.animationData;
@@ -640,8 +649,8 @@ namespace ActionTool float y = m_GridY + (ActionManager.MaxEventsPerFrame + 1 + (hasRM ? 1:0)) * kFrameHeight;
if (animData == null)
return;
- DrawBoxList(animData.hurtBoxes, ref y, Color.green);
- DrawBoxList(animData.hitBoxes, ref y, Color.red);
+ //DrawBoxList(animData.hurtBoxes, ref y, Color.green);
+ DrawBoxList(animData.hitBoxes, ref y, Color.red);
DrawBoxList(animData.throwBoxes, ref y, Color.blue);
DrawBoxList(animData.blockBoxes, ref y, Color.yellow);
DrawBoxList(animData.defendBoxes, ref y, Color.magenta);
@@ -771,16 +780,16 @@ namespace ActionTool ui.DrawVerticalLineFast(x+1, y, y +height, lineColor);
}
- void GUI_Toolbar_NewHurtBox(ref float x, ref float y)
- {
- x += kToolbarControlMargin;
- Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewHurtBox, "New hurt box")))
- {
- ActionManager.NewHurtBox();
- }
- x += kToolbarControlSize;
- }
+ //void GUI_Toolbar_NewHurtBox(ref float x, ref float y)
+ //{
+ // x += kToolbarControlMargin;
+ // Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
+ // if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewHurtBox, "New hurt box")))
+ // {
+ // ActionManager.NewHurtBox();
+ // }
+ // x += kToolbarControlSize;
+ //}
void GUI_Toolbar_NewHitBox(ref float x, ref float y)
{
@@ -797,7 +806,7 @@ namespace ActionTool {
x += kToolbarControlMargin;
Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewThrowBox, "New hit box")))
+ if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewThrowBox, "New throw box")))
{
ActionManager.NewHitBox();
}
@@ -808,7 +817,7 @@ namespace ActionTool {
x += kToolbarControlMargin;
Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewDefendBox, "New hit box")))
+ if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewDefendBox, "New guard box")))
{
ActionManager.NewHitBox();
}
@@ -819,7 +828,7 @@ namespace ActionTool {
x += kToolbarControlMargin;
Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize);
- if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewBlockBox, "New hit box")))
+ if (GUI.Button(rect, new GUIContent(" + ", m_UITextureNewBlockBox, "New block box")))
{
ActionManager.NewHitBox();
}
diff --git a/Erika/Assets/_TerrainAutoUpgrade.meta b/Erika/Assets/_TerrainAutoUpgrade.meta deleted file mode 100644 index 45fb1489..00000000 --- a/Erika/Assets/_TerrainAutoUpgrade.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ab7ddab3f407bd947a73e0a1f236db70 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: |