summaryrefslogtreecommitdiff
path: root/Assets/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Scenes')
-rw-r--r--Assets/Scenes/Demo/AnimationPreviewScene.unity71
-rw-r--r--Assets/Scenes/Demo/FightDemoScene.unity78
2 files changed, 147 insertions, 2 deletions
diff --git a/Assets/Scenes/Demo/AnimationPreviewScene.unity b/Assets/Scenes/Demo/AnimationPreviewScene.unity
index 72c9bd15..2b8e5c09 100644
--- a/Assets/Scenes/Demo/AnimationPreviewScene.unity
+++ b/Assets/Scenes/Demo/AnimationPreviewScene.unity
@@ -15698,6 +15698,75 @@ Transform:
m_Father: {fileID: 7570325740622164655}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &6927653711274454254
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 6928033330946439154, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_Name
+ value: Rifle Mech2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 3.54
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3.34
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -12.52
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d363b3ad62ec16249ba21ed8d1e81289, type: 3}
--- !u!4 &6988702268014338625
Transform:
m_ObjectHideFlags: 0
@@ -15802,7 +15871,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &7246387479881274483
Transform:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Demo/FightDemoScene.unity b/Assets/Scenes/Demo/FightDemoScene.unity
index a76362cf..65d17ae3 100644
--- a/Assets/Scenes/Demo/FightDemoScene.unity
+++ b/Assets/Scenes/Demo/FightDemoScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 170076734}
- m_IndirectSpecularColor: {r: 0.44092834, g: 0.4896462, b: 0.5697487, a: 1}
+ m_IndirectSpecularColor: {r: 0.44092876, g: 0.4896468, b: 0.5697499, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1207,6 +1207,75 @@ MonoBehaviour:
m_EditorClassIdentifier:
Name: Air_Attk2
LifeTime: 1
+--- !u!1001 &701037481
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 861183510}
+ m_Modifications:
+ - target: {fileID: 6928033330946439154, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_Name
+ value: Rifle Mech2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 25.08
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.081
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: d363b3ad62ec16249ba21ed8d1e81289, type: 3}
--- !u!1 &705651392
GameObject:
m_ObjectHideFlags: 0
@@ -6356,6 +6425,7 @@ Transform:
- {fileID: 1429005016}
- {fileID: 9190676758873534539}
- {fileID: 2018047305}
+ - {fileID: 1488695564}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11951,6 +12021,12 @@ Transform:
m_Father: {fileID: 861183510}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &1488695564 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 6930345995811640846, guid: d363b3ad62ec16249ba21ed8d1e81289,
+ type: 3}
+ m_PrefabInstance: {fileID: 701037481}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1490460890
GameObject:
m_ObjectHideFlags: 0