Game/Fishing2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改arm

Browse Source
This commit is contained in:
BobSong
2026-01-17 22:46:58 +08:00
parent f7d44f1f8d
commit a46436ae45
34 changed files with 47057 additions and 26303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3622
Assets/ResRaw/AnimEditor/player_umotion_project.asset
View File

File diff suppressed because it is too large Load Diff

899
Assets/ResRaw/Prefabs/Player/Human_Male.prefab
View File

@@ -88,7 +88,7 @@ Transform:
m_GameObject: {fileID: 6590233066953704931}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.0813, y: -0.0252, z: 0.0167}
m_LocalPosition: {x: 0.0833, y: -0.021, z: 0.0127}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1502,21 +1502,12 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 611371305119728321}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 3240100199825760526}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 7252651708200185185}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 5877784012066507173}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 6338707748352164799}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 3949944256829685679}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 408230832252209712}
@@ -1613,6 +1604,12 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -3730080606814098470, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 6016553604923642245}
- targetCorrespondingSourceObject: {fileID: -3730080606814098470, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 482972912705027537}
- targetCorrespondingSourceObject: {fileID: -3730080606814098470, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 7930562370591767886}
- targetCorrespondingSourceObject: {fileID: 1535234366023964051, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 6169046181914052140}
@@ -1631,6 +1628,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 451809770695059392, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 7349252505575811302}
- targetCorrespondingSourceObject: {fileID: 451809770695059392, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 5186464396902472690}
- targetCorrespondingSourceObject: {fileID: 3458617767690807809, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 3087610321163389405}
@@ -1658,6 +1658,12 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -6129159399009855392, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 691440225234637521}
- targetCorrespondingSourceObject: {fileID: -6129159399009855392, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 6957666202517838931}
- targetCorrespondingSourceObject: {fileID: -6129159399009855392, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 3561778948716785322}
- targetCorrespondingSourceObject: {fileID: -1671728854875497787, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 6093703794471638895}
@@ -1676,6 +1682,9 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 4233267774880236520, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 6404535510816487054}
- targetCorrespondingSourceObject: {fileID: 4233267774880236520, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 2621265606016813142}
- targetCorrespondingSourceObject: {fileID: -2232643536353331922, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
insertIndex: -1
addedObject: {fileID: 8197385170441587585}
@@ -2016,6 +2025,66 @@ CapsuleCollider:
m_Height: 0.15
m_Direction: 0
m_Center: {x: -0.08, y: 0.01, z: 0}
--- !u!114 &5186464396902472690
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 369889900427220922}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ee545149746b44547897f32030465e57, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.FingerRig
fixTransforms: 1
weight: 1
fingers:
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 8051379755066791583}
bone2: {fileID: 7816763006155150945}
bone3: {fileID: 4693813302939473802}
tip: {fileID: 5846016401355539460}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 170817331142502322}
bone2: {fileID: 6453181790150556897}
bone3: {fileID: 4014404208254679525}
tip: {fileID: 6301386145274228855}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 4807590041877949891}
bone2: {fileID: 953009028475150556}
bone3: {fileID: 7187595698308317337}
tip: {fileID: 8883680450800883812}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 7428053653744285340}
bone2: {fileID: 20818995400621327}
bone3: {fileID: 7276490395042413622}
tip: {fileID: 8980801153161431298}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 4872804949504305600}
bone2: {fileID: 2105885441890941762}
bone3: {fileID: 0}
tip: {fileID: 7298730282022663582}
target: {fileID: 0}
--- !u!4 &442046535108825186 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8843578131576594408, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
@@ -2288,497 +2357,6 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
spineTargetOffset: {x: 0, y: 0, z: 0}
--- !u!114 &3240100199825760526
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1127680710956633387}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5013856973b27429d937d256dc082f2e, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.AimIK
fixTransforms: 1
solver:
executedInEditor: 0
IKPosition: {x: 0, y: 0, z: 0}
IKPositionWeight: 1
root: {fileID: 355084039068129169}
target: {fileID: 0}
tolerance: 0
maxIterations: 1
useRotationLimits: 1
XY: 0
bones: []
transform: {fileID: 2827152078700489346}
axis: {x: 0, y: 1, z: 0}
poleAxis: {x: 0, y: 0, z: 0}
polePosition: {x: 0, y: 0, z: 0}
poleWeight: 0
poleTarget: {fileID: 0}
clampWeight: 0
clampSmoothing: 2
--- !u!114 &7252651708200185185
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1127680710956633387}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a70e525c82ce9413fa4d940ad7fcf1db, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.FullBodyBipedIK
fixTransforms: 1
references:
root: {fileID: 355084039068129169}
pelvis: {fileID: 2121359798269357256}
leftThigh: {fileID: 3104385414327709699}
leftCalf: {fileID: 7381561621663260314}
leftFoot: {fileID: 4457324603513269534}
rightThigh: {fileID: 4059199278320271846}
rightCalf: {fileID: 3552169064037092373}
rightFoot: {fileID: 4949742290617717304}
leftUpperArm: {fileID: 2033492467443228789}
leftForearm: {fileID: 2505921912821122484}
leftHand: {fileID: 598725328980423127}
rightUpperArm: {fileID: 1858722287799507030}
rightForearm: {fileID: 7537462892583471047}
rightHand: {fileID: 1692311248695680736}
head: {fileID: 2969368279271697047}
spine:
- {fileID: 1943306321056295650}
- {fileID: 6415842150371127895}
eyes: []
solver:
executedInEditor: 0
IKPosition: {x: 0, y: 0, z: 0}
IKPositionWeight: 1
root: {fileID: 355084039068129169}
iterations: 4
chain:
- pin: 0
pull: 1
push: 0
pushParent: 0
reach: 0.1
reachSmoothing: 1
pushSmoothing: 1
nodes:
- transform: {fileID: 6415842150371127895}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
children: 01000000020000000300000004000000
childConstraints:
- pushElasticity: 0
pullElasticity: 1
bone1: {fileID: 2033492467443228789}
bone2: {fileID: 4059199278320271846}
- pushElasticity: 0
pullElasticity: 1
bone1: {fileID: 1858722287799507030}
bone2: {fileID: 3104385414327709699}
- pushElasticity: 0
pullElasticity: 0
bone1: {fileID: 2033492467443228789}
bone2: {fileID: 1858722287799507030}
- pushElasticity: 0
pullElasticity: 0
bone1: {fileID: 3104385414327709699}
bone2: {fileID: 4059199278320271846}
bendConstraint:
bone1: {fileID: 0}
bone2: {fileID: 0}
bone3: {fileID: 0}
bendGoal: {fileID: 0}
direction: {x: 1, y: 0, z: 0}
rotationOffset: {x: 0, y: 0, z: 0, w: 0}
weight: 0
defaultLocalDirection: {x: 0, y: 0, z: 0}
defaultChildDirection: {x: 0, y: 0, z: 0}
- pin: 0
pull: 1
push: 0
pushParent: 0
reach: 0.1
reachSmoothing: 1
pushSmoothing: 1
nodes:
- transform: {fileID: 2033492467443228789}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 2505921912821122484}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 598725328980423127}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
children:
childConstraints: []
bendConstraint:
bone1: {fileID: 0}
bone2: {fileID: 0}
bone3: {fileID: 0}
bendGoal: {fileID: 0}
direction: {x: 1, y: 0, z: 0}
rotationOffset: {x: 0, y: 0, z: 0, w: 0}
weight: 0
defaultLocalDirection: {x: 0, y: 0, z: 0}
defaultChildDirection: {x: 0, y: 0, z: 0}
- pin: 0
pull: 1
push: 0
pushParent: 0
reach: 0.1
reachSmoothing: 1
pushSmoothing: 1
nodes:
- transform: {fileID: 1858722287799507030}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 7537462892583471047}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 1692311248695680736}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
children:
childConstraints: []
bendConstraint:
bone1: {fileID: 0}
bone2: {fileID: 0}
bone3: {fileID: 0}
bendGoal: {fileID: 0}
direction: {x: 1, y: 0, z: 0}
rotationOffset: {x: 0, y: 0, z: 0, w: 0}
weight: 0
defaultLocalDirection: {x: 0, y: 0, z: 0}
defaultChildDirection: {x: 0, y: 0, z: 0}
- pin: 0
pull: 1
push: 0
pushParent: 0
reach: 0.1
reachSmoothing: 1
pushSmoothing: 1
nodes:
- transform: {fileID: 3104385414327709699}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 7381561621663260314}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 4457324603513269534}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
children:
childConstraints: []
bendConstraint:
bone1: {fileID: 0}
bone2: {fileID: 0}
bone3: {fileID: 0}
bendGoal: {fileID: 0}
direction: {x: 1, y: 0, z: 0}
rotationOffset: {x: 0, y: 0, z: 0, w: 0}
weight: 0
defaultLocalDirection: {x: 0, y: 0, z: 0}
defaultChildDirection: {x: 0, y: 0, z: 0}
- pin: 0
pull: 1
push: 0
pushParent: 0
reach: 0.1
reachSmoothing: 1
pushSmoothing: 1
nodes:
- transform: {fileID: 4059199278320271846}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 3552169064037092373}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
- transform: {fileID: 4949742290617717304}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
length: 0
effectorPositionWeight: 0
effectorRotationWeight: 0
offset: {x: 0, y: 0, z: 0}
children:
childConstraints: []
bendConstraint:
bone1: {fileID: 0}
bone2: {fileID: 0}
bone3: {fileID: 0}
bendGoal: {fileID: 0}
direction: {x: 1, y: 0, z: 0}
rotationOffset: {x: 0, y: 0, z: 0, w: 0}
weight: 0
defaultLocalDirection: {x: 0, y: 0, z: 0}
defaultChildDirection: {x: 0, y: 0, z: 0}
effectors:
- bone: {fileID: 6415842150371127895}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones:
- {fileID: 3104385414327709699}
- {fileID: 4059199278320271846}
planeBone1: {fileID: 0}
planeBone2: {fileID: 0}
planeBone3: {fileID: 0}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 2033492467443228789}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 0}
planeBone2: {fileID: 0}
planeBone3: {fileID: 0}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 1858722287799507030}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 0}
planeBone2: {fileID: 0}
planeBone3: {fileID: 0}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 3104385414327709699}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 0}
planeBone2: {fileID: 0}
planeBone3: {fileID: 0}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 4059199278320271846}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 0}
planeBone2: {fileID: 0}
planeBone3: {fileID: 0}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 598725328980423127}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 2033492467443228789}
planeBone2: {fileID: 1858722287799507030}
planeBone3: {fileID: 6415842150371127895}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 1692311248695680736}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 1858722287799507030}
planeBone2: {fileID: 2033492467443228789}
planeBone3: {fileID: 6415842150371127895}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 4457324603513269534}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 3104385414327709699}
planeBone2: {fileID: 4059199278320271846}
planeBone3: {fileID: 6415842150371127895}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
- bone: {fileID: 4949742290617717304}
target: {fileID: 0}
positionWeight: 0
rotationWeight: 0
position: {x: 0, y: 0, z: 0}
rotation: {x: 0, y: 0, z: 0, w: 1}
positionOffset: {x: 0, y: 0, z: 0}
effectChildNodes: 1
maintainRelativePositionWeight: 0
childBones: []
planeBone1: {fileID: 4059199278320271846}
planeBone2: {fileID: 3104385414327709699}
planeBone3: {fileID: 6415842150371127895}
planeRotationOffset: {x: 0, y: 0, z: 0, w: 1}
spineMapping:
spineBones:
- {fileID: 2121359798269357256}
- {fileID: 1943306321056295650}
- {fileID: 6415842150371127895}
leftUpperArmBone: {fileID: 2033492467443228789}
rightUpperArmBone: {fileID: 1858722287799507030}
leftThighBone: {fileID: 3104385414327709699}
rightThighBone: {fileID: 4059199278320271846}
iterations: 3
twistWeight: 1
boneMappings:
- bone: {fileID: 2969368279271697047}
maintainRotationWeight: 0
limbMappings:
- parentBone: {fileID: 8188030492782012229}
bone1: {fileID: 2033492467443228789}
bone2: {fileID: 2505921912821122484}
bone3: {fileID: 598725328980423127}
maintainRotationWeight: 0
weight: 1
- parentBone: {fileID: 2567282459398973367}
bone1: {fileID: 1858722287799507030}
bone2: {fileID: 7537462892583471047}
bone3: {fileID: 1692311248695680736}
maintainRotationWeight: 0
weight: 1
- parentBone: {fileID: 0}
bone1: {fileID: 3104385414327709699}
bone2: {fileID: 7381561621663260314}
bone3: {fileID: 4457324603513269534}
maintainRotationWeight: 1
weight: 1
- parentBone: {fileID: 0}
bone1: {fileID: 4059199278320271846}
bone2: {fileID: 3552169064037092373}
bone3: {fileID: 4949742290617717304}
maintainRotationWeight: 1
weight: 1
FABRIKPass: 1
rootNode: {fileID: 6415842150371127895}
spineStiffness: 0.5
pullBodyVertical: 0.5
pullBodyHorizontal: 0
--- !u!114 &5877784012066507173
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2793,7 +2371,8 @@ MonoBehaviour:
m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerAsset
NeckTransform: {fileID: 6949574408561493093}
LookIk: {fileID: 0}
RodRoot: {fileID: 2827152078700489346}
LeftArm: {fileID: 7930562370591767886}
RightArm: {fileID: 3561778948716785322}
--- !u!114 &6338707748352164799
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2807,115 +2386,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerIK
UpdateSelected: 2
_LeftHandTransform: {fileID: 953009028475150556}
isAimEnabled: 0
transitionWeightTimeScale: 2
--- !u!114 &3949944256829685679
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1127680710956633387}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5d9643e11c77c0d4fb27fbcf6ff4839c, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.ArmIK
fixTransforms: 1
solver:
executedInEditor: 0
IKPosition: {x: -0.26268584, y: 1.0446655, z: 0.15698874}
IKPositionWeight: 1
root: {fileID: 355084039068129169}
IKRotationWeight: 1
IKRotation: {x: -0.8537147, y: -0.37494278, z: 0.36129636, w: -0.0073638856}
chest:
transform: {fileID: 2877038072211694270}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0, y: 0, z: 0}
defaultLocalRotation: {x: 0, y: 0, z: 0, w: 0}
shoulder:
transform: {fileID: 8188030492782012229}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.055162687, y: 0.0131476605, z: -0.014279042}
defaultLocalRotation: {x: 0.08327826, y: -0.7545604, z: 0.041289933, w: 0.6496141}
upperArm:
transform: {fileID: 2033492467443228789}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.17809522, y: 1.9095835e-16, z: -2.842171e-16}
defaultLocalRotation: {x: -0.01994785, y: -0.39173076, z: 0.020190157, w: 0.91964203}
forearm:
transform: {fileID: 2505921912821122484}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.27771124, y: 0.000000007581779, z: -0.000000035743135}
defaultLocalRotation: {x: 1.3674641e-17, y: 2.1093738e-16, z: 0.33363262, w: 0.9427032}
hand:
transform: {fileID: 598725328980423127}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.27251065, y: 0.00000007348005, z: -0.00000009979712}
defaultLocalRotation: {x: -0.55758685, y: -0.0016783397, z: -0.020560935, w: 0.82986224}
isLeft: 1
arm:
bones:
- readPosition: {x: 0.20072097, y: 1.4630107, z: -0.017398238}
readRotation: {x: -0.7048171, y: -0.07039979, z: 0.03784513, w: 0.7048722}
solverPosition: {x: 0.20072097, y: 1.4630107, z: -0.017398238}
solverRotation: {x: -0.7048171, y: -0.07039979, z: 0.03784513, w: 0.7048722}
length: 0.17809524
sqrMag: 0.031717915
axis: {x: -0.17809525, y: 0.000000112324756, z: -0.00000013515462}
- readPosition: {x: 0.024901226, y: 1.435835, z: -0.025572538}
readRotation: {x: -0.6488364, y: -0.32738727, z: 0.32372963, w: 0.60582864}
solverPosition: {x: 0.024901226, y: 1.435835, z: -0.025572538}
solverRotation: {x: -0.6488364, y: -0.32738727, z: 0.32372963, w: 0.60582864}
length: 0.2777112
sqrMag: 0.077123515
axis: {x: -0.27771124, y: -0.000000008299487, z: -0.000000014053828}
- readPosition: {x: -0.13506973, y: 1.2089198, z: -0.019070148}
readRotation: {x: -0.7208871, y: -0.09215604, z: 0.507305, w: 0.4631098}
solverPosition: {x: -0.13506973, y: 1.2089198, z: -0.019070148}
solverRotation: {x: -0.7208871, y: -0.09215604, z: 0.507305, w: 0.4631098}
length: 0.2725107
sqrMag: 0.07426208
axis: {x: -0.2725107, y: 0.000000113400894, z: -0.00000010141518}
- readPosition: {x: -0.26268584, y: 1.0446655, z: 0.15698874}
readRotation: {x: -0.8537147, y: -0.37494278, z: 0.36129636, w: -0.0073638856}
solverPosition: {x: -0.26268584, y: 1.0446655, z: 0.15698874}
solverRotation: {x: -0.8537147, y: -0.37494278, z: 0.36129636, w: -0.0073638856}
length: 0
sqrMag: 0
axis: {x: 0, y: 0, z: 0}
target: {fileID: 0}
positionWeight: 1
rotationWeight: 1
shoulderRotationWeight: 1
shoulderRotationMode: 1
shoulderTwistWeight: 1
shoulderYawOffset: 0
shoulderPitchOffset: 0
bendGoal: {fileID: 0}
bendGoalWeight: 1
swivelOffset: 0
wristToPalmAxis: {x: 0, y: 0, z: 0}
palmToThumbAxis: {x: 0, y: 0, z: 0}
armLengthMlp: 1
stretchCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &408230832252209712
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3926,6 +3397,80 @@ CharacterJoint:
m_EnablePreprocessing: 0
m_MassScale: 1
m_ConnectedMassScale: 1
--- !u!114 &6957666202517838931
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2997110849533454362}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4db3c450680fd4c809d5ad90a2f24e5f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.LimbIK
fixTransforms: 1
solver:
executedInEditor: 0
IKPosition: {x: 0.69268286, y: 1.0446646, z: 0.15698773}
IKPositionWeight: 1
root: {fileID: 1858722287799507030}
target: {fileID: 0}
IKRotationWeight: 1
IKRotation: {x: -0.007364005, y: -0.36129636, z: -0.3749426, w: 0.8537148}
bendNormal: {x: -0.03888165, y: -0.027333977, z: 0.0026820549}
bone1:
transform: {fileID: 1858722287799507030}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0.17809625, y: 0.000000028716144, z: 0.000004380969}
defaultLocalRotation: {x: -0.01994785, y: -0.39173076, z: 0.020190157, w: 0.91964203}
length: 0
sqrMag: 0
axis: {x: -1, y: -0, z: -0}
bone2:
transform: {fileID: 7537462892583471047}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0.2777068, y: -0.0000000030854732, z: 0.00000003097679}
defaultLocalRotation: {x: -9.217045e-17, y: -2.3871787e-16, z: 0.33363262, w: 0.9427032}
length: 0
sqrMag: 0
axis: {x: -1, y: -0, z: -0}
bone3:
transform: {fileID: 1692311248695680736}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: 0.27251002, y: -0.00000007729276, z: 0.00000009536689}
defaultLocalRotation: {x: -0.55758685, y: -0.001678249, z: -0.02056061, w: 0.82986224}
length: 0
sqrMag: 0
axis: {x: -1, y: -0, z: -0}
goal: 3
bendModifier: 0
maintainRotationWeight: 0
bendModifierWeight: 1
bendGoal: {fileID: 0}
--- !u!114 &3561778948716785322
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2997110849533454362}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01ef40348d8b4d4da250acf0a921fc2a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerArm
IsLeft: 0
IK: {fileID: 6957666202517838931}
RodContainer: {fileID: 2827152078700489346}
FingerRig: {fileID: 2621265606016813142}
interactionTargetWeight: 0
--- !u!4 &3104385414327709699 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -6308482710477979527, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
@@ -4421,6 +3966,66 @@ CapsuleCollider:
m_Height: 0.15
m_Direction: 0
m_Center: {x: 0.08, y: -0.01, z: 0}
--- !u!114 &2621265606016813142
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4168271588643582866}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ee545149746b44547897f32030465e57, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.FingerRig
fixTransforms: 1
weight: 1
fingers:
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 1064147856239390919}
bone2: {fileID: 8654875108666998477}
bone3: {fileID: 2280759650940466857}
tip: {fileID: 5443714921551745548}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 2022831027562307448}
bone2: {fileID: 3801429788621648645}
bone3: {fileID: 8335625637296707817}
tip: {fileID: 5318146266925428887}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 6906464404312155570}
bone2: {fileID: 5066168232618540521}
bone3: {fileID: 3567907781463788470}
tip: {fileID: 4815995212812396351}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 7383204048877361040}
bone2: {fileID: 6963909853335939081}
bone3: {fileID: 1588964892496090810}
tip: {fileID: 6798048092758060568}
target: {fileID: 0}
- weight: 1
rotationWeight: 1
rotationDOF: 0
fixBone1Twist: 0
bone1: {fileID: 6458669706399983992}
bone2: {fileID: 2303736469140380280}
bone3: {fileID: 0}
tip: {fileID: 3737764462742904548}
target: {fileID: 0}
--- !u!1 &4224279791349998120 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4177249625128522322, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}
@@ -5381,6 +4986,80 @@ CharacterJoint:
m_EnablePreprocessing: 0
m_MassScale: 1
m_ConnectedMassScale: 1
--- !u!114 &482972912705027537
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5718213644125854624}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4db3c450680fd4c809d5ad90a2f24e5f, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::RootMotion.FinalIK.LimbIK
fixTransforms: 1
solver:
executedInEditor: 0
IKPosition: {x: -0.26268584, y: 1.0446655, z: 0.15698874}
IKPositionWeight: 1
root: {fileID: 2033492467443228789}
target: {fileID: 0}
IKRotationWeight: 1
IKRotation: {x: -0.8537147, y: -0.37494278, z: 0.36129636, w: -0.0073638856}
bendNormal: {x: -0.0388824, y: 0.027334498, z: -0.0026821215}
bone1:
transform: {fileID: 2033492467443228789}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.17809522, y: 1.9095835e-16, z: -2.842171e-16}
defaultLocalRotation: {x: -0.01994785, y: -0.39173076, z: 0.020190157, w: 0.91964203}
length: 0
sqrMag: 0
axis: {x: -1, y: -0, z: -0}
bone2:
transform: {fileID: 2505921912821122484}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.27771124, y: 0.000000007581779, z: -0.000000035743135}
defaultLocalRotation: {x: 1.3674641e-17, y: 2.1093738e-16, z: 0.33363262, w: 0.9427032}
length: 0
sqrMag: 0
axis: {x: -1, y: -0, z: -0}
bone3:
transform: {fileID: 598725328980423127}
weight: 1
solverPosition: {x: 0, y: 0, z: 0}
solverRotation: {x: 0, y: 0, z: 0, w: 1}
defaultLocalPosition: {x: -0.27251065, y: 0.00000007348005, z: -0.00000009979712}
defaultLocalRotation: {x: -0.55758685, y: -0.0016783397, z: -0.020560935, w: 0.82986224}
length: 0
sqrMag: 0
axis: {x: -1, y: -0, z: -0}
goal: 2
bendModifier: 0
maintainRotationWeight: 0
bendModifierWeight: 1
bendGoal: {fileID: 0}
--- !u!114 &7930562370591767886
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5718213644125854624}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 01ef40348d8b4d4da250acf0a921fc2a, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::NBF.PlayerArm
IsLeft: 1
IK: {fileID: 482972912705027537}
RodContainer: {fileID: 5757538020472164704}
FingerRig: {fileID: 5186464396902472690}
interactionTargetWeight: 0
--- !u!1 &5796140469138918087 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -3236050204391703875, guid: 284185ec1f1e5c6409bed7bc27c6c215, type: 3}

1070
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodIdle_1.anim
View File

File diff suppressed because it is too large Load Diff

914
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodIdle_2.anim
View File

File diff suppressed because it is too large Load Diff

926
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodIdle_3.anim
View File

File diff suppressed because it is too large Load Diff

2502
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodPowerup.anim
View File

File diff suppressed because it is too large Load Diff

874
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodPowerupWait.anim
View File

File diff suppressed because it is too large Load Diff

29768
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodThrown.anim
View File

File diff suppressed because it is too large Load Diff

16
Assets/ResRaw/Prefabs/Player/NewAnim/HandRodWaitIdle.anim
View File

@@ -17,7 +17,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0, w: 1}
value: {x: 0, y: 0.1305262, z: 0, w: 0.9914449}
inSlope: {x: 0, y: 0, z: 0, w: 0}
outSlope: {x: 0, y: 0, z: 0, w: 0}
tangentMode: 0
@@ -26,7 +26,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334, w: 0.33333334}
- serializedVersion: 3
time: 0.033333335
value: {x: 0, y: 0, z: 0, w: 1}
value: {x: 0, y: 0.1305262, z: 0, w: 0.9914449}
inSlope: {x: 0, y: 0, z: 0, w: 0}
outSlope: {x: 0, y: 0, z: 0, w: 0}
tangentMode: 0
@@ -9087,7 +9087,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 0.1305262
inSlope: 0
outSlope: 0
tangentMode: 1
@@ -9096,7 +9096,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0
value: 0.1305262
inSlope: 0
outSlope: 0
tangentMode: 1
@@ -9147,7 +9147,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 0.9914449
inSlope: 0
outSlope: 0
tangentMode: 1
@@ -9156,7 +9156,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 1
value: 0.9914449
inSlope: 0
outSlope: 0
tangentMode: 1
@@ -9208,7 +9208,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 0
value: 15
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -9217,7 +9217,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
value: 0
value: 15
inSlope: 0
outSlope: 0
tangentMode: 0

32274
Assets/Scenes/AnimEditor.unity
View File

File diff suppressed because it is too large Load Diff

116
Assets/Scenes/StartUp.unity
View File

@@ -694,6 +694,115 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b189222c6db8433db1239d314f92cf9f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &646846706
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 283968323323339957, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalPosition.x
value: 478.1521
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalPosition.z
value: 420.17905
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 355084039068129169, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 990664945663656999, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1127680710956633387, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Name
value: Human_Male
objectReference: {fileID: 0}
- target: {fileID: 1127680710956633387, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2193713676330198984, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2230723136735691572, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2263881400462092212, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3226961578869652419, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4470943717256989569, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5989632670989542622, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6160823490684935472, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7028571683806752057, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8402586498002032639, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9079039044289722421, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0893171cfcdca8943a3322a9a261c693, type: 3}
--- !u!1 &832575517
GameObject:
m_ObjectHideFlags: 0
@@ -1520,8 +1629,8 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 5000
near clip plane: 0.1
far clip plane: 3000
field of view: 60.000004
orthographic: 0
orthographic size: 5
@@ -1649,7 +1758,7 @@ MonoBehaviour:
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 2
m_Time: 0.2
m_CustomCurve:
serializedVersion: 2
m_Curve: []
@@ -1728,3 +1837,4 @@ SceneRoots:
- {fileID: 174907469}
- {fileID: 1199298675}
- {fileID: 1688884899048394910}
- {fileID: 646846706}

22
Assets/Scripts/Common/Assets/PlayerModelAsset.cs
View File

@@ -15,8 +15,23 @@ namespace NBF
public Transform NeckTransform;
public LookAtIK LookIk;
public PlayerArm LeftArm;
public PlayerArm RightArm;
public Transform RodRoot;
public Transform RodRoot
{
get
{
if (RightArm == null)
{
return transform;
}
return RightArm.RodContainer;
}
}
// public Transform RodRoot;
private void Awake()
@@ -28,5 +43,10 @@ namespace NBF
IK = GetComponent<PlayerIK>();
PlayerAnimator = GetComponent<PlayerAnimator>();
}
public void SetPlayer(FPlayer player)
{
LookIk.solver.target = player.FppLook;
}
}
}

21
Assets/Scripts/Common/Common/Services/Camera/CameraManager.cs
View File

@@ -48,12 +48,11 @@ namespace NBF
{
_cameraAsset.fppVCam.LookAt = player.FppLook;
_cameraAsset.fppVCam.Follow = player.ModelAsset.NeckTransform;
player.ModelAsset.LookIk.solver.target = player.FppLook;
}
_cameraAsset.fppVCam.Priority = 10;
_cameraAsset.tppVCam.Priority = 0;
StartCoroutine(SnapToTarget());
// StartCoroutine(SnapToTarget());
}
public void SetFppLook(Transform fppCamLook)
@@ -65,22 +64,6 @@ namespace NBF
{
_cameraAsset.fppVCam.Follow = fppCamFollow;
}
IEnumerator SnapToTarget()
{
// 等 Cinemachine 先激活并跑一帧
yield return null;
Transform follow = _cameraAsset.fppVCam.Follow;
_cameraAsset.fppVCam.OnTargetObjectWarped(
follow,
follow.position - _cameraAsset.fppVCam.transform.position
);
// _cameraAsset.fppVCam.OnTargetObjectWarped(
// FPlayer.Instance.ModelAsset.NeckTransform,
// FPlayer.Instance.ModelAsset.NeckTransform.position - _cameraAsset.fppVCam.transform.position
// );
}
}
}

2
Assets/Scripts/Common/Common/Services/Input/InputManager.cs
View File

@@ -185,6 +185,7 @@ namespace NBF
var actionName = context.action.name;
if (actionName == "Op1")
{
IsOp1 = true;
OnOp1Action?.Invoke(true);
}
else if (actionName == "Op2")
@@ -201,6 +202,7 @@ namespace NBF
var actionName = context.action.name;
if (actionName == "Op1")
{
IsOp1 = false;
OnOp1Action?.Invoke(false);
}
else if (actionName == "Op2")

2
Assets/Scripts/Fishing/Player/FPlayer.cs
View File

@@ -52,6 +52,7 @@ namespace NBF
private void Update()
{
UpdateMove();
Fsm?.Update();
}
private void OnDestroy()
@@ -82,6 +83,7 @@ namespace NBF
modelObject.transform.localPosition = Vector3.zero;
ModelGameObject = modelObject;
ModelAsset = modelObject.GetComponent<PlayerModelAsset>();
ModelAsset.SetPlayer(this);
}
#endregion

10
Assets/Scripts/Fishing/Player/PlayerAnimator.cs
View File

@@ -102,7 +102,7 @@ namespace NBF
private void OnFishingSetUnequip()
{
_isRodLayerEnabled = false;
_IK.SetBipedLeftHandIK(enabled: false, null);
// _IK.SetBipedLeftHandIK(enabled: false, null);
}
@@ -284,6 +284,10 @@ namespace NBF
/// </summary>
public void OnRodThrowStart()
{
if (Player.Fsm.CurrentState is PlayerStateThrow playerStateThrow)
{
playerStateThrow.OnRodThrowStart();
}
}
/// <summary>
@@ -291,6 +295,10 @@ namespace NBF
/// </summary>
public void OnRodThrownEnd()
{
if (Player.Fsm.CurrentState is PlayerStateThrow playerStateThrow)
{
playerStateThrow.OnRodThrownEnd();
}
}
#endregion

15
Assets/Scripts/Fishing/Player/PlayerArm.cs Normal file
View File

@@ -0,0 +1,15 @@
using RootMotion.FinalIK;
using UnityEngine;
namespace NBF
{
public class PlayerArm : MonoBehaviour
{
public bool IsLeft;
public LimbIK IK;
public Transform RodContainer;
public FingerRig FingerRig;
[HideInInspector] public float interactionTargetWeight;
}
}

3
Assets/Scripts/Fishing/Player/PlayerArm.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 01ef40348d8b4d4da250acf0a921fc2a
timeCreated: 1768660096

147
Assets/Scripts/Fishing/Player/PlayerIK.cs
View File

@@ -1,4 +1,5 @@
using RootMotion.FinalIK;
using System;
using RootMotion.FinalIK;
using UnityEngine;
namespace NBF
@@ -15,39 +16,41 @@ namespace NBF
public UpdateType UpdateSelected;
[SerializeField] private Transform _LeftHandTransform;
// [SerializeField] private Transform _LeftHandTransform;
private LookAtIK _LookAtIK;
private AimIK _AimIK;
// private AimIK _AimIK;
private FullBodyBipedIK _FullBodyIK;
// private FullBodyBipedIK _FullBodyIK;
private ArmIK _ArmIK;
// private ArmIK _ArmIK;
private bool _isLeftHandEnabled;
// private bool _isLeftHandEnabled;
private bool _isRightHandEnabled;
// private bool _isRightHandEnabled;
public bool isAimEnabled;
// public bool isAimEnabled;
private bool _isFishingLeftArmEnabled;
[SerializeField] private float transitionWeightTimeScale = 1f;
public Transform CurrentTarget => _FullBodyIK.solver.leftHandEffector.target;
// public Transform CurrentTarget => _FullBodyIK.solver.leftHandEffector.target;
public Transform LeftHandTransform => _LeftHandTransform;
// public Transform LeftHandTransform => _LeftHandTransform;
private void Awake()
{
_LookAtIK = GetComponent<LookAtIK>();
_AimIK = GetComponent<AimIK>();
_FullBodyIK = GetComponent<FullBodyBipedIK>();
_ArmIK = GetComponent<ArmIK>();
SetAimIK(enabled: false);
// _AimIK = GetComponent<AimIK>();
// _FullBodyIK = GetComponent<FullBodyBipedIK>();
// _ArmIK = GetComponent<ArmIK>();
// SetAimIK(enabled: false);
}
public void SetBipedIK(bool enabled)
{
}
@@ -57,54 +60,54 @@ namespace NBF
_isFishingLeftArmEnabled = enabled;
}
public void SetFishingLeftArm(bool enabled, Transform target)
{
_isFishingLeftArmEnabled = enabled;
_ArmIK.solver.arm.target = target;
}
// public void SetFishingLeftArm(bool enabled, Transform target)
// {
// _isFishingLeftArmEnabled = enabled;
// _ArmIK.solver.arm.target = target;
// }
public void SetBipedLeftHandIK(bool enabled, bool instant = false)
{
_isLeftHandEnabled = enabled;
if (instant)
{
_FullBodyIK.solver.leftArmMapping.weight = (enabled ? 1f : 0f);
}
}
// public void SetBipedLeftHandIK(bool enabled, bool instant = false)
// {
// _isLeftHandEnabled = enabled;
// if (instant)
// {
// _FullBodyIK.solver.leftArmMapping.weight = (enabled ? 1f : 0f);
// }
// }
public void SetBipedRightHandIK(bool enabled, bool instant = false)
{
_isRightHandEnabled = enabled;
if (instant)
{
_FullBodyIK.solver.rightArmMapping.weight = (enabled ? 1f : 0f);
}
}
// public void SetBipedRightHandIK(bool enabled, bool instant = false)
// {
// _isRightHandEnabled = enabled;
// if (instant)
// {
// _FullBodyIK.solver.rightArmMapping.weight = (enabled ? 1f : 0f);
// }
// }
public void SetBipedLeftHandIK(bool enabled, Transform target, bool instant = false)
{
_isLeftHandEnabled = enabled;
_FullBodyIK.solver.leftHandEffector.target = target;
if (instant)
{
_FullBodyIK.solver.leftArmMapping.weight = (enabled ? 1f : 0f);
}
}
// public void SetBipedLeftHandIK(bool enabled, Transform target, bool instant = false)
// {
// _isLeftHandEnabled = enabled;
// _FullBodyIK.solver.leftHandEffector.target = target;
// if (instant)
// {
// _FullBodyIK.solver.leftArmMapping.weight = (enabled ? 1f : 0f);
// }
// }
public void SetBipedRightHandIK(bool enabled, Transform target, bool instant = false)
{
_isRightHandEnabled = enabled;
_FullBodyIK.solver.rightHandEffector.target = target;
if (instant)
{
_FullBodyIK.solver.rightArmMapping.weight = (enabled ? 1f : 0f);
}
}
// public void SetBipedRightHandIK(bool enabled, Transform target, bool instant = false)
// {
// _isRightHandEnabled = enabled;
// _FullBodyIK.solver.rightHandEffector.target = target;
// if (instant)
// {
// _FullBodyIK.solver.rightArmMapping.weight = (enabled ? 1f : 0f);
// }
// }
public void SetAimIK(bool enabled)
{
isAimEnabled = enabled;
}
// public void SetAimIK(bool enabled)
// {
// isAimEnabled = enabled;
// }
private void Update()
{
@@ -132,22 +135,22 @@ namespace NBF
private void IKUpdateHandler()
{
_AimIK.UpdateSolverExternal();
// _AimIK.UpdateSolverExternal();
_LookAtIK.UpdateSolverExternal();
_FullBodyIK.UpdateSolverExternal();
_FullBodyIK.solver.Update();
_AimIK.solver.IKPositionWeight = Mathf.MoveTowards(_AimIK.solver.IKPositionWeight, isAimEnabled ? 1f : 0f,
Time.deltaTime * transitionWeightTimeScale);
_FullBodyIK.solver.leftArmMapping.weight = Mathf.MoveTowards(_FullBodyIK.solver.leftArmMapping.weight,
_isLeftHandEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
_FullBodyIK.solver.rightArmMapping.weight = Mathf.MoveTowards(_FullBodyIK.solver.rightArmMapping.weight,
_isRightHandEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
_FullBodyIK.solver.IKPositionWeight = Mathf.MoveTowards(_FullBodyIK.solver.IKPositionWeight,
_isLeftHandEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
_ArmIK.solver.IKPositionWeight = Mathf.MoveTowards(_ArmIK.solver.IKPositionWeight,
_isFishingLeftArmEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
_ArmIK.solver.IKRotationWeight = Mathf.MoveTowards(_ArmIK.solver.IKRotationWeight,
_isFishingLeftArmEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
// _FullBodyIK.UpdateSolverExternal();
// _FullBodyIK.solver.Update();
// _AimIK.solver.IKPositionWeight = Mathf.MoveTowards(_AimIK.solver.IKPositionWeight, isAimEnabled ? 1f : 0f,
// Time.deltaTime * transitionWeightTimeScale);
// _FullBodyIK.solver.leftArmMapping.weight = Mathf.MoveTowards(_FullBodyIK.solver.leftArmMapping.weight,
// _isLeftHandEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
// _FullBodyIK.solver.rightArmMapping.weight = Mathf.MoveTowards(_FullBodyIK.solver.rightArmMapping.weight,
// _isRightHandEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
// _FullBodyIK.solver.IKPositionWeight = Mathf.MoveTowards(_FullBodyIK.solver.IKPositionWeight,
// _isLeftHandEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
// _ArmIK.solver.IKPositionWeight = Mathf.MoveTowards(_ArmIK.solver.IKPositionWeight,
// _isFishingLeftArmEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
// _ArmIK.solver.IKRotationWeight = Mathf.MoveTowards(_ArmIK.solver.IKRotationWeight,
// _isFishingLeftArmEnabled ? 1f : 0f, Time.deltaTime * transitionWeightTimeScale);
}
}
}

2
Assets/Scripts/Fishing/Player/States/PlayerStateFight.cs
View File

@@ -2,7 +2,7 @@
{
public class PlayerStateFight : PlayerStateBase
{
public override uint StateId => (uint)PlayerState.Fishing;
public override uint StateId => (uint)PlayerState.Fight;
protected override void onEnter()
{

8
Assets/Scripts/Fishing/Player/States/PlayerStateFishing.cs
View File

@@ -1,4 +1,7 @@
namespace NBF
using NBC;
using UnityEngine;
namespace NBF
{
/// <summary>
/// 钓鱼中
@@ -9,10 +12,13 @@
protected override void onEnter()
{
Debug.LogError("enter PlayerStateFishing");
_owner.ModelAsset.PlayerAnimator.BaitThrown = true;
}
protected override void onExit()
{
_owner.ModelAsset.PlayerAnimator.BaitThrown = false;
}
protected override uint onUpdate()

5
Assets/Scripts/Fishing/Player/States/PlayerStateIdle.cs
View File

@@ -1,4 +1,6 @@
namespace NBF
using NBC;
namespace NBF
{
/// <summary>
/// 闲置中
@@ -10,6 +12,7 @@
protected override void onEnter()
{
Log.Info("enter PlayerStateIdle");
_nextState = false;
InputManager.OnOp1Action += OnOp1Action;
}

6
Assets/Scripts/Fishing/Player/States/PlayerStatePrepare.cs
View File

@@ -1,4 +1,5 @@
using UnityEngine;
using NBC;
using UnityEngine;
namespace NBF
{
@@ -27,6 +28,7 @@ namespace NBF
protected override void onEnter()
{
Log.Info("enter PlayerStatePrepare");
Stage = Phase.Charged;
Player.ModelAsset.PlayerAnimator.PrepareThrow = true;
Player.ModelAsset.PlayerAnimator.FishingUp = 0;
@@ -62,7 +64,7 @@ namespace NBF
{
ChargedProgress = 1;
}
if (!InputManager.IsOp1)
{
Stage = Phase.Confirm;

130
Assets/Scripts/Fishing/Player/States/PlayerStateThrow.cs
View File

@@ -10,41 +10,43 @@ namespace NBF
{
public override uint StateId => (uint)PlayerState.Throw;
public enum Phase
{
/// <summary>
/// 等待动画事件回调
/// </summary>
Waiting,
/// <summary>
/// 前摇动画
/// </summary>
AnimBegin,
/// <summary>
/// 抛线动画
/// </summary>
ThrowAnim,
/// <summary>
/// 结束
/// </summary>
Done,
ErrorDone
}
public Phase Stage = Phase.Waiting;
// public enum Phase
// {
// /// <summary>
// /// 等待动画事件回调
// /// </summary>
// Waiting,
//
// /// <summary>
// /// 前摇动画
// /// </summary>
// AnimBegin,
//
// /// <summary>
// /// 抛线动画
// /// </summary>
// ThrowAnim,
//
// /// <summary>
// /// 结束
// /// </summary>
// Done,
// ErrorDone
// }
//
// public Phase Stage = Phase.Waiting;
private bool _nextState = false;
public float ChargedProgress;
protected override void onEnter()
{
Log.Info("enter PlayerStateThrow");
_owner.ModelAsset.PlayerAnimator.StartThrow = true;
ChargedProgress = (float)Params.Get(0);
Debug.Log($"PlayerThrow ChargedProgress={ChargedProgress}");
Stage = Phase.Waiting;
_nextState = false;
// Stage = Phase.Waiting;
// _owner.Gears.Reel?.Unlock();
}
@@ -52,23 +54,10 @@ namespace NBF
protected override uint onUpdate()
{
CheckStateTimeout(10);
if (Stage == Phase.AnimBegin)
{
AnimBegin();
ThrowPosition();
}
else if (Stage == Phase.ThrowAnim)
{
ThrowAnim();
}
else if (Stage == Phase.Done)
if (_nextState)
{
return (uint)PlayerState.Fishing;
}
else if (Stage == Phase.ErrorDone)
{
return (uint)PlayerState.Idle;
}
return base.onUpdate();
}
@@ -78,66 +67,17 @@ namespace NBF
/// <summary>
/// 抛竿动画事件
/// </summary>
public void RodForceThrowStart()
public void OnRodThrowStart()
{
// Debug.LogError($"RodForceThrowStart==");
Debug.LogError("OnRodThrowStart");
_owner.ModelAsset.PlayerAnimator.PrepareThrow = false;
_owner.ModelAsset.PlayerAnimator.StartThrow = false;
Stage = Phase.AnimBegin;
}
#endregion
#region 抛线前摇动画
private void AnimBegin()
public void OnRodThrownEnd()
{
_owner.ModelAsset.PlayerAnimator.PrepareThrow = false;
_owner.ModelAsset.PlayerAnimator.StartThrow = false;
_owner.ModelAsset.PlayerAnimator.BaitThrown = true;
Stage = Phase.ThrowAnim;
}
#endregion
#region 抛竿线飞出相关动画
private NTask _throwAnim;
private void ThrowPosition()
{
// if (_owner.PlayerAnimatorCtrl.ThrowMode == ThrowModeEnum.Float)
// {
// _owner.Gears.Rod.lineHandler.pinchController?.ReleasePinch();
// _throwAnim = new BobThrowAnim(_owner);
// _throwAnim.Run(DefRunner.Scheduler);
// }
// else
// {
// _throwAnim = new LureThrowAnim(_owner);
// _throwAnim.Run(DefRunner.Scheduler);
// }
}
private void ThrowAnim()
{
if (_throwAnim.IsDone)
{
// if (_throwAnim.Status == NTaskStatus.Success)
// {
// if (_owner.PlayerAnimatorCtrl.ThrowMode == ThrowModeEnum.Spin)
// {
// SetArm();
// }
//
// Stage = Phase.Done;
// Debug.LogError($"抛线后，线长度={_owner.Data.lineLength}");
// }
// else
// {
// Stage = Phase.ErrorDone;
// }
}
Debug.LogError("OnRodThrownEnd");
_nextState = true;
}
#endregion

1
Assets/Scripts/Fishing/Tackle/FRod.cs
View File

@@ -178,6 +178,7 @@ namespace NBF
}
yield return 2; //等待1帧
transform.SetParent(Player.ModelAsset.RodRoot);
transform.localPosition = Vector3.zero;
transform.rotation = Player.ModelAsset.RodRoot.rotation;

4
Assets/UMotionEditor/Data/EditorUndoStackPointer.asset
View File

@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: -1063058285, guid: 448d62fcada76fd4ab5702190add98fd, type: 3}
m_Name: EditorUndoStackPointer
m_EditorClassIdentifier: "UMotionEditor.dll::\u0389\u0389\u0389\u0389\u038A\u0389\u0389\u0389\u038A\u038A\u038A\u038A\u038A\u0389\u038A\u038A\u038A\u0389\u038A\u038A\u0389\u0389\u0389\u038A\u038A\u038A\u038A\u038A\u038A\u0389\u038A\u038A\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u038A\u0389\u0389\u0389\u0389\u0389\u038A"
"\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u0389\u038A\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u038A": 1.29p03
"\u038A\u038A\u0389\u038A\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u038A\u0389\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389": 30
"\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u038A\u0389\u0389\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u0389\u038A\u038A\u0389\u0389\u038A\u0389\u038A\u038A\u0389\u038A":
"\u038A\u038A\u0389\u038A\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u038A\u0389\u038A\u0389\u038A\u038A\u038A\u038A\u038A\u0389\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389\u0389\u038A\u038A\u0389\u038A\u0389\u0389\u0389": -1

1
Fishing2.sln.DotSettings.user
View File

@@ -23,6 +23,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F59bd7c40c082431db25e1e728ab6278946ae00_003Fb4_003F05ce572a_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F59bd7c40c082431db25e1e728ab6278946ae00_003Fb4_003F05ce572a_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFullScreenMode_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003F7c_003F0044d980_003FFullScreenMode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGameObjectInspector_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1acad9deef3549c4b9617dfa169c66599f7e00_003Fef_003F654c7b7e_003FGameObjectInspector_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGameObject_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003F28_003F384825fa_003FGameObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIconAttribute_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003F6a_003F44c4467c_003FIconAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4f75f0eb2d14004826911645c6175d61fbe00_003F49_003F22dd7281_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

BIN
UMotionData/AutoBackups/20260111_125052_player_umotion_project.bak
View File

Binary file not shown.

BIN
UMotionData/AutoBackups/20260111_171615_player_umotion_project.bak
View File

Binary file not shown.

BIN
UMotionData/AutoBackups/20260111_172632_player_umotion_project.bak
View File

Binary file not shown.

BIN
UMotionData/AutoBackups/20260111_233030_player_umotion_project.bak
View File

Binary file not shown.

BIN
UMotionData/AutoBackups/20260111_233536_player_umotion_project.bak
View File

Binary file not shown.

BIN
UMotionData/Temp/EditorUndoStack.dat
View File

Binary file not shown.

BIN
UMotionData/Temp/EditorUndoTable.dat
View File

Binary file not shown.