summaryrefslogtreecommitdiff
path: root/Assets/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scenes')
-rw-r--r--Assets/Scenes/Demo/FightDemoScene.unity295
1 files changed, 202 insertions, 93 deletions
diff --git a/Assets/Scenes/Demo/FightDemoScene.unity b/Assets/Scenes/Demo/FightDemoScene.unity
index a6c4b65f..ad31c277 100644
--- a/Assets/Scenes/Demo/FightDemoScene.unity
+++ b/Assets/Scenes/Demo/FightDemoScene.unity
@@ -143,7 +143,7 @@ Transform:
- {fileID: 1984679655}
- {fileID: 400483142}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5686688
MonoBehaviour:
@@ -365,6 +365,110 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 917973d9786b9e5488cb518e35122ef2, type: 3}
+--- !u!1001 &143546716
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1280833115598205507, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1347291035898103031, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_ApplyRootMotion
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1347291035898103031, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_Controller
+ value:
+ objectReference: {fileID: 9100000, guid: 0fbec02f0e3874646b9342d731933d20, type: 2}
+ - target: {fileID: 3769745176331499790, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3769745176331499790, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3769745176331499790, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5742459430391570408, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_Name
+ value: untitled
+ objectReference: {fileID: 0}
+ - target: {fileID: 5742459430391570408, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 5.638426
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.082049966
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.28178883
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 9196132907034535819, guid: 995e3fad32d92974280b0ad02f99d8b9,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 995e3fad32d92974280b0ad02f99d8b9, type: 3}
--- !u!1 &167449965
GameObject:
m_ObjectHideFlags: 0
@@ -396,7 +500,7 @@ Transform:
- {fileID: 705651394}
- {fileID: 1737075742}
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &170076733
GameObject:
@@ -826,8 +930,34 @@ Transform:
m_LocalScale: {x: 1, y: 1.7, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!21 &350590445
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Height Fog Global
+ m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: 3001
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs: []
+ m_Floats:
+ - _HeightFogGlobal: 1
+ - _IsHeightFogShader: 1
+ - _IsStandardPipeline: 0
+ - _TITLE: 1
+ - _TransparentQueue: 3000
+ m_Colors: []
--- !u!1 &400483141
GameObject:
m_ObjectHideFlags: 0
@@ -1112,7 +1242,7 @@ Transform:
- {fileID: 1418006278}
- {fileID: 1156861647}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &476164677
MonoBehaviour:
@@ -1480,7 +1610,7 @@ MonoBehaviour:
manualPositionAndScale: 0
renderPriority: 1
styledSpace0: 0
- overrideMaterial: {fileID: 1383880771}
+ overrideMaterial: {fileID: 606781236}
overrideCamToVolumeDistance: 1
overrideVolumeDistanceFade: 0
version: 180
@@ -1510,7 +1640,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2091916510}
+ - {fileID: 350590445}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -1530,6 +1660,63 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
+--- !u!21 &606781236
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Override
+ m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs: []
+ m_Floats:
+ - _DIRECTIONALL: 1
+ - _DirectionalFalloff: 2
+ - _DirectionalIntensity: 1
+ - _DirectionalMode: 1
+ - _FOGG: 1
+ - _FogAxisMode: 1
+ - _FogColorDuo: 1
+ - _FogDistanceEnd: 200
+ - _FogDistanceFalloff: 2
+ - _FogDistanceStart: -200
+ - _FogHeightEnd: 200
+ - _FogHeightFalloff: 2
+ - _FogHeightStart: 0
+ - _FogIntensity: 1
+ - _FogLayersMode: 0
+ - _IsHeightFogPreset: 1
+ - _IsHeightFogShader: 1
+ - _IsStandardPipeline: 0
+ - _NOISEE: 1
+ - _NoiseDistanceEnd: 50
+ - _NoiseIntensity: 1
+ - _NoiseMode: 2
+ - _NoiseModeBlend: 1
+ - _NoiseScale: 30
+ - _SKYBOXX: 1
+ - _SkyboxFogFalloff: 1
+ - _SkyboxFogFill: 1
+ - _SkyboxFogHeight: 1
+ - _SkyboxFogIntensity: 1
+ - _TITLE: 1
+ m_Colors:
+ - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
+ - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
+ - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
+ - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
+ - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
+ - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
--- !u!1001 &636332096
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1628,7 +1815,7 @@ PrefabInstance:
- target: {fileID: 6928033330946439154, guid: d363b3ad62ec16249ba21ed8d1e81289,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
type: 3}
@@ -6921,7 +7108,7 @@ Transform:
- {fileID: 439421269}
- {fileID: 1549629386}
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &902182889 stripped
GameObject:
@@ -12095,7 +12282,7 @@ Transform:
- {fileID: 2106396715}
- {fileID: 906348741}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1239221725
PrefabInstance:
@@ -12426,63 +12613,6 @@ MonoBehaviour:
m_MaximumFOV: 60
m_MinimumOrthoSize: 1
m_MaximumOrthoSize: 5000
---- !u!21 &1383880771
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Override
- m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs: []
- m_Floats:
- - _DIRECTIONALL: 1
- - _DirectionalFalloff: 2
- - _DirectionalIntensity: 1
- - _DirectionalMode: 1
- - _FOGG: 1
- - _FogAxisMode: 1
- - _FogColorDuo: 1
- - _FogDistanceEnd: 200
- - _FogDistanceFalloff: 2
- - _FogDistanceStart: -200
- - _FogHeightEnd: 200
- - _FogHeightFalloff: 2
- - _FogHeightStart: 0
- - _FogIntensity: 1
- - _FogLayersMode: 0
- - _IsHeightFogPreset: 1
- - _IsHeightFogShader: 1
- - _IsStandardPipeline: 0
- - _NOISEE: 1
- - _NoiseDistanceEnd: 50
- - _NoiseIntensity: 1
- - _NoiseMode: 2
- - _NoiseModeBlend: 1
- - _NoiseScale: 30
- - _SKYBOXX: 1
- - _SkyboxFogFalloff: 1
- - _SkyboxFogFill: 1
- - _SkyboxFogHeight: 1
- - _SkyboxFogIntensity: 1
- - _TITLE: 1
- m_Colors:
- - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1}
- - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0}
- - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0}
- - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1}
- - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1}
- - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0}
--- !u!1 &1418006277
GameObject:
m_ObjectHideFlags: 0
@@ -12726,6 +12856,11 @@ PrefabInstance:
propertyPath: m_Name
value: Erika
objectReference: {fileID: 0}
+ - target: {fileID: 6163880392690750894, guid: 932ebfa005172fc4ca50e58f38109268,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6647175493896403125, guid: 932ebfa005172fc4ca50e58f38109268,
type: 3}
propertyPath: m_LocalPosition.x
@@ -13165,7 +13300,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1795871319 stripped
GameObject:
@@ -13286,32 +13421,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 446448032557589059}
m_PrefabAsset: {fileID: 0}
---- !u!21 &2091916510
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Height Fog Global
- m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3001
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs: []
- m_Floats:
- - _HeightFogGlobal: 1
- - _IsHeightFogShader: 1
- - _IsStandardPipeline: 0
- - _TITLE: 1
- - _TransparentQueue: 3000
- m_Colors: []
--- !u!4 &2106396715 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 446758, guid: 86f7c62be03142846a1efe2b5645a42c,