1 files changed, 256 insertions, 4 deletions
diff --git a/Assets/Prefabs/Characters/Saionji.prefab b/Assets/Prefabs/Characters/Saionji.prefab
index ca4a6084..e1b411fe 100644
--- a/Assets/Prefabs/Characters/Saionji.prefab
+++ b/Assets/Prefabs/Characters/Saionji.prefab
@@ -2025,6 +2025,36 @@ Transform:
   m_Father: {fileID: 6003038901570665998}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2528607727879950532
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3743173033695073248}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3743173033695073248
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2528607727879950532}
+  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: 6836637912472462891}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2579749256589666590
 GameObject:
   m_ObjectHideFlags: 0
@@ -2086,6 +2116,36 @@ Transform:
   m_Father: {fileID: 5454015509661445535}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2765987224441550593
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7938087974208878210}
+  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 &7938087974208878210
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2765987224441550593}
+  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: 6836637912472462891}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2871991389283324378
 GameObject:
   m_ObjectHideFlags: 0
@@ -3046,7 +3106,9 @@ Transform:
   - {fileID: 7842373365219757414}
   - {fileID: 7962427196249371924}
   - {fileID: 3741668520236251699}
+  - {fileID: 1148501203892122477}
   - {fileID: 8973641233766810868}
+  - {fileID: 6836637912472462891}
   m_Father: {fileID: 8386501289761731598}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4243,11 +4305,13 @@ MonoBehaviour:
   Go_PistolL: {fileID: 1226857665675379995}
   Go_PistolR: {fileID: 8973641233767307476}
   Go_Blade: {fileID: 3741668520236251698}
-  UsePistol: 0
-  UseBlade: 1
+  Go_Reaper: {fileID: 1148501203892481869}
+  Go_LongSword: {fileID: 8423417671875454545}
+  m_Weapon: 3
   EnableAbilitySystem: 1
   Effects:
   - {fileID: 0}
+  m_Hips: {fileID: 4721566464291151502}
 --- !u!114 &6037765075253890939
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4302,7 +4366,7 @@ MonoBehaviour:
   m_Weight: 40
   m_UseGravity: 1
   m_Accelaration: {x: 0, y: 0, z: 0}
-  m_Frication: 1
+  m_Frication: 10
   m_AirFriction: 1
   m_Force: {x: 0, y: 0, z: 0}
   m_Primitive: {fileID: 6037765075253890940}
@@ -5564,6 +5628,121 @@ Transform:
   m_Father: {fileID: 7447072760603604941}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8423417671875454545
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6836637912472462891}
+  - component: {fileID: 5562140445699311197}
+  - component: {fileID: 5397773656567945986}
+  - component: {fileID: 703591655243008234}
+  - component: {fileID: 8837087457335269861}
+  m_Layer: 0
+  m_Name: LongSword
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6836637912472462891
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8423417671875454545}
+  m_LocalRotation: {x: -0, y: 0.066068396, z: -0, w: 0.99781513}
+  m_LocalPosition: {x: 0.083, y: -0.0147, z: 0.199}
+  m_LocalScale: {x: 0.019999996, y: 0.03, z: 2.5288317}
+  m_Children:
+  - {fileID: 3743173033695073248}
+  - {fileID: 7938087974208878210}
+  m_Father: {fileID: 7447072760603604941}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 7.576, z: 0}
+--- !u!33 &5562140445699311197
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8423417671875454545}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5397773656567945986
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8423417671875454545}
+  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!65 &703591655243008234
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8423417671875454545}
+  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!114 &8837087457335269861
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8423417671875454545}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c2c9828fec98747a1b0680f47bed80, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UseWith2D: 0
+  SortingLayerName: 
+  SortingOrder: 0
+  PointStart: {fileID: 7938087974208878210}
+  PointEnd: {fileID: 3743173033695073248}
+  MaxFrame: 10
+  Granularity: 60
+  MyColor: {r: 1, g: 1, b: 1, a: 0.5019608}
+  MyMaterial: {fileID: 2100000, guid: 9db63a4774ae8954ab6f503f10fb20e4, type: 2}
 --- !u!1 &8461173562809581919
 GameObject:
   m_ObjectHideFlags: 0
@@ -5867,6 +6046,79 @@ Transform:
   m_Father: {fileID: 1876809530285738590}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1148501203892513261
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7447072760603604941}
+    m_Modifications:
+    - target: {fileID: 100000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_Name
+      value: Reaper
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.044
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.016
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.527
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.040676292
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.03947636
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.7171337
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.69462687
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.006
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 6.499
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -268.174
+      objectReference: {fileID: 0}
+    - target: {fileID: 2300000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 06391d0022643554e973d62dfc2e814b, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b199612d64e19664080e2f464c83df38, type: 3}
+--- !u!1 &1148501203892481869 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: b199612d64e19664080e2f464c83df38,
+    type: 3}
+  m_PrefabInstance: {fileID: 1148501203892513261}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1148501203892122477 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400000, guid: b199612d64e19664080e2f464c83df38,
+    type: 3}
+  m_PrefabInstance: {fileID: 1148501203892513261}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1226857665675281339
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5977,7 +6229,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ffe9971ac75494746b9dc21c63dc7836, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ffe9971ac75494746b9dc21c63dc7836, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x