summaryrefslogtreecommitdiff
path: root/Assets/Prefabs
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Prefabs')
-rw-r--r--Assets/Prefabs/Characters/ArmorSoldierWhite.prefab97
-rw-r--r--Assets/Prefabs/Characters/Saionji.prefab46
2 files changed, 105 insertions, 38 deletions
diff --git a/Assets/Prefabs/Characters/ArmorSoldierWhite.prefab b/Assets/Prefabs/Characters/ArmorSoldierWhite.prefab
index 440455b9..bbfe17b8 100644
--- a/Assets/Prefabs/Characters/ArmorSoldierWhite.prefab
+++ b/Assets/Prefabs/Characters/ArmorSoldierWhite.prefab
@@ -1260,7 +1260,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446448032419612090}
- m_LocalRotation: {x: 0.3093767, y: 0.22277376, z: 0.915506, w: 0.12847826}
+ m_LocalRotation: {x: 0.3093767, y: 0.22277379, z: 0.915506, w: 0.12847829}
m_LocalPosition: {x: 0.000000028610229, y: 0, z: 0.000000114440915}
m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 0.9999999}
m_Children:
@@ -1719,7 +1719,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446448032419612120}
- m_LocalRotation: {x: 0.0044334624, y: -0.5963963, z: 0.004780873, w: 0.8026636}
+ m_LocalRotation: {x: 0.0044334633, y: -0.5963963, z: 0.004780874, w: 0.8026636}
m_LocalPosition: {x: -0.1166621, y: 0.000666765, z: 0.030558}
m_LocalScale: {x: 0.9999999, y: 1, z: 1}
m_Children:
@@ -4936,6 +4936,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 446448032419714640}
+ - component: {fileID: 2018469940}
m_Layer: 0
m_Name: root hips
m_TagString: Untagged
@@ -4959,6 +4960,29 @@ Transform:
m_Father: {fileID: 446448032419714642}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2018469940
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 446448032419613296}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 637138a0ba30abc498c5c9dcf6bb5d78, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IsActive: 1
+ m_Group: 5
+ m_Tag: 2
+ m_Label: ArmorWhite
+ m_Title: ArmorWhite.HurtBox
+ m_Desc: "\u767D\u8272\u58EB\u5175\u7684hurtbox"
+ m_HintColor: {r: 1, g: 0.9094448, b: 0, a: 0.5}
+ m_Body: {fileID: 0}
+ m_Center: {x: 0, y: -0.18, z: 0}
+ m_Size: {x: 0.69, y: 1.86, z: 1}
+ m_DrawGizmo: 1
--- !u!1 &446448032419613298
GameObject:
m_ObjectHideFlags: 0
@@ -7478,6 +7502,9 @@ GameObject:
m_Component:
- component: {fileID: 446448032419714826}
- component: {fileID: 446448032429013226}
+ - component: {fileID: 2018470250}
+ - component: {fileID: 2018470252}
+ - component: {fileID: 2018470254}
m_Layer: 0
m_Name: ArmorSoldierWhite
m_TagString: Untagged
@@ -7527,15 +7554,75 @@ Animator:
m_GameObject: {fileID: 446448032419613482}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: a57cb87b65c257d46a0200e3798043e3, type: 3}
- m_Controller: {fileID: 0}
- m_CullingMode: 1
- m_UpdateMode: 0
+ m_Controller: {fileID: 9100000, guid: 5d43cd91c81ceed4c8858a8e8ee1fca2, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 1
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &2018470250
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 446448032419613482}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 637138a0ba30abc498c5c9dcf6bb5d78, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IsActive: 1
+ m_Group: 0
+ m_Tag: 2
+ m_Label: ArmorWhite
+ m_Title: ArmorWhite.Body
+ m_Desc: "\u767D\u8272\u76D4\u7532\u58EB\u5175\u7684\u8EAB\u4F53"
+ m_HintColor: {r: 0.14796188, g: 0.8962264, b: 0.183694, a: 0.5}
+ m_Body: {fileID: 2018470252}
+ m_Center: {x: 0, y: 0.74, z: 0}
+ m_Size: {x: 0.66, y: 1.48, z: 1}
+ m_DrawGizmo: 1
+--- !u!114 &2018470252
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 446448032419613482}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: cd65b198d10c5b441b5c40b05c8f3d41, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_LocalVelocity: {x: 0, y: 0, z: 0}
+ m_Weight: 50
+ m_UseGravity: 1
+ m_Accelaration: {x: 0, y: 0, z: 0}
+ m_Frication: 0
+ m_AirFriction: 0
+ m_Force: {x: 0, y: 0, z: 0}
+ m_Primitive: {fileID: 2018470250}
+--- !u!114 &2018470254
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 446448032419613482}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6c58b0c0555555e4c9fbd344b5162103, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Body: {fileID: 2018470252}
+ m_BodyCollider: {fileID: 2018470250}
+ m_Hitbox: []
+ m_Hurtbox:
+ - {fileID: 2018469940}
--- !u!1 &446448032419613484
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Characters/Saionji.prefab b/Assets/Prefabs/Characters/Saionji.prefab
index 5fb0517d..4c288e6a 100644
--- a/Assets/Prefabs/Characters/Saionji.prefab
+++ b/Assets/Prefabs/Characters/Saionji.prefab
@@ -105,10 +105,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Renderer: {fileID: 7892098139105315744}
Materials:
- - {fileID: 2100000, guid: 55592d1917b963942bab26f8fdbae507, type: 2}
- - {fileID: 2100000, guid: 060253b9b3d97a841addf8e029fa15c7, type: 2}
- - {fileID: 2100000, guid: 953cbf717e2f67f40afc9e640cdbf9f1, type: 2}
- - {fileID: 2100000, guid: b5902a72ec5053945a565c16b69f5058, type: 2}
+ - {fileID: 2100000, guid: e07419b2da43f394b9d0320522a98b97, type: 2}
+ - {fileID: 2100000, guid: fe27a77335691184a9614ea455f66a1b, type: 2}
+ - {fileID: 2100000, guid: 3bc37f9aaa16e434aa2bcf5dc4e7f464, type: 2}
+ - {fileID: 2100000, guid: 5384a215c78e13e4293236f2783b2c25, type: 2}
SubmeshShareMaterial: 1
UseRangedSubmesh: 1
SubmeshRange: {x: 4, y: 7}
@@ -545,7 +545,6 @@ GameObject:
m_Component:
- component: {fileID: 4721566464291151502}
- component: {fileID: 4380598530412210718}
- - component: {fileID: 657065973}
m_Layer: 0
m_Name: J_Bip_C_Hips
m_TagString: Untagged
@@ -593,29 +592,6 @@ MonoBehaviour:
m_Center: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 1, z: 1}
m_DrawGizmo: 1
---- !u!114 &657065973
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1091578199452354369}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 637138a0ba30abc498c5c9dcf6bb5d78, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IsActive: 0
- m_Group: 0
- m_Tag: 1
- m_Label: Saionji
- m_Title: Saionji.HitBox
- m_Desc: saionji's hitbox
- m_HintColor: {r: 1, g: 0, b: 0, a: 0.5}
- m_Body: {fileID: 0}
- m_Center: {x: 0, y: 0, z: 0}
- m_Size: {x: 1, y: 1, z: 1}
- m_DrawGizmo: 1
--- !u!1 &1116262850384336476
GameObject:
m_ObjectHideFlags: 0
@@ -4345,6 +4321,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2788004f7d291b40a1ac1c11c3bdc3d, type: 3}
m_Name:
m_EditorClassIdentifier:
+ m_Body: {fileID: 6037765075253890941}
+ m_BodyCollider: {fileID: 6037765075253890940}
+ m_Hitbox:
+ - {fileID: 758480958}
+ m_Hurtbox:
+ - {fileID: 4380598530412210718}
Go_PistolL: {fileID: 1226857665675379995}
Go_PistolR: {fileID: 8973641233767307476}
Go_Blade: {fileID: 3741668520236251698}
@@ -4353,9 +4335,6 @@ MonoBehaviour:
EnableAbilitySystem: 1
Effects:
- {fileID: 564123362}
- m_Hitbox: []
- m_Hurtbox: []
- m_Body: {fileID: 6037765075253890941}
--- !u!114 &6037765075253890939
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4406,11 +4385,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cd65b198d10c5b441b5c40b05c8f3d41, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Velocity: {x: 0, y: 0, z: 0}
+ m_LocalVelocity: {x: 0, y: 0, z: 0}
m_Weight: 40
m_UseGravity: 1
m_Accelaration: {x: 0, y: 0, z: 0}
- m_Frication: 0
+ m_Frication: 1
+ m_AirFriction: 1
m_Force: {x: 0, y: 0, z: 0}
m_Primitive: {fileID: 6037765075253890940}
--- !u!114 &1314072688
generated by cgit v1.1-26-g67d0 at 2025-06-01 09:52:04 +0000