保存进度
This commit is contained in:
@@ -35,6 +35,7 @@ MonoBehaviour:
|
||||
- ACTk.Runtime
|
||||
- Assembly-CSharp
|
||||
- Assembly-CSharp-firstpass
|
||||
- ECM2
|
||||
- Enviro3.Runtime
|
||||
- FairyGUI
|
||||
- NBC.Asset
|
||||
|
||||
@@ -316,10 +316,7 @@ MonoBehaviour:
|
||||
obiRopeSegment_1: {fileID: 114690977222484832}
|
||||
obiRopeSegment_2: {fileID: 0}
|
||||
obiRopeSegment_3: {fileID: 0}
|
||||
obiRopeCursor_1: {fileID: 0}
|
||||
obiRopeCursor_2: {fileID: 0}
|
||||
obiRopeCursor_3: {fileID: 0}
|
||||
LineConnector_0: {fileID: 138566828508176764}
|
||||
LineConnector_0: {fileID: 9062216202701781222}
|
||||
LineConnector_1: {fileID: 145265253818817148}
|
||||
LineConnector_2: {fileID: 0}
|
||||
LineConnector_3: {fileID: 0}
|
||||
@@ -343,7 +340,7 @@ GameObject:
|
||||
- component: {fileID: 23032032856956722}
|
||||
- component: {fileID: 54064796885498670}
|
||||
- component: {fileID: 114159388627441457}
|
||||
- component: {fileID: 138566828508176764}
|
||||
- component: {fileID: 9062216202701781222}
|
||||
m_Layer: 10
|
||||
m_Name: LineConnector_0
|
||||
m_TagString: Untagged
|
||||
@@ -442,7 +439,7 @@ Rigidbody:
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_IsKinematic: 1
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 3
|
||||
@@ -459,22 +456,19 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
kinematicForParticles: 1
|
||||
--- !u!138 &138566828508176764
|
||||
FixedJoint:
|
||||
--- !u!114 &9062216202701781222
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1704301629453161}
|
||||
serializedVersion: 1
|
||||
m_ConnectedBody: {fileID: 0}
|
||||
m_ConnectedArticulationBody: {fileID: 0}
|
||||
m_BreakForce: Infinity
|
||||
m_BreakTorque: Infinity
|
||||
m_EnableCollision: 0
|
||||
m_EnablePreprocessing: 1
|
||||
m_MassScale: 1
|
||||
m_ConnectedMassScale: 1
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 112f7ad42d8149c1944bb51067ef1966, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
target: {fileID: 0}
|
||||
--- !u!1 &1724694220950691
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -5432,7 +5432,7 @@ GameObject:
|
||||
- component: {fileID: 4874838258577666918}
|
||||
- component: {fileID: 8072573713298176091}
|
||||
- component: {fileID: 4304401782308419094}
|
||||
- component: {fileID: 8377096431775024172}
|
||||
- component: {fileID: 5719705420115594249}
|
||||
m_Layer: 9
|
||||
m_Name: male
|
||||
m_TagString: Untagged
|
||||
@@ -5487,7 +5487,7 @@ Animator:
|
||||
m_Avatar: {fileID: 9000000, guid: 87cb93ef70bc36f44abec8aecabee74e, type: 2}
|
||||
m_Controller: {fileID: 9100000, guid: ae0f4839e215f19418e1c1a4300e0761, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 1
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
@@ -6020,74 +6020,20 @@ LineRenderer:
|
||||
m_UseWorldSpace: 1
|
||||
m_Loop: 0
|
||||
m_ApplyActiveColorSpace: 1
|
||||
--- !u!114 &8377096431775024172
|
||||
--- !u!114 &5719705420115594249
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5559475303044247694}
|
||||
m_Enabled: 1
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5013856973b27429d937d256dc082f2e, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: ad83af85ff21b474ca9354a150f14517, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
fixTransforms: 1
|
||||
solver:
|
||||
executedInEditor: 0
|
||||
IKPosition: {x: 0, y: 0, z: 0}
|
||||
IKPositionWeight: 1
|
||||
root: {fileID: 7989316057193859911}
|
||||
target: {fileID: 5227202611651070453}
|
||||
tolerance: 0
|
||||
maxIterations: 4
|
||||
useRotationLimits: 1
|
||||
XY: 0
|
||||
bones:
|
||||
- transform: {fileID: 7924575327048162712}
|
||||
weight: 1
|
||||
solverPosition: {x: 0, y: 0, z: 0}
|
||||
solverRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
defaultLocalPosition: {x: -0.08792384, y: 2.0145358e-17, z: -3.0093565e-17}
|
||||
defaultLocalRotation: {x: 0.000000002548722, y: -0.000000115037196, z: 0.022150198, w: 0.99975467}
|
||||
length: 0
|
||||
sqrMag: 0
|
||||
axis: {x: 0, y: 0, z: 0}
|
||||
- transform: {fileID: 6129647324769652196}
|
||||
weight: 1
|
||||
solverPosition: {x: 0, y: 0, z: 0}
|
||||
solverRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
defaultLocalPosition: {x: -0.11753322, y: -3.907985e-16, z: -2.1006417e-21}
|
||||
defaultLocalRotation: {x: -0.00000016013375, y: 0.00000012153694, z: -0.04784908, w: 0.9988546}
|
||||
length: 0
|
||||
sqrMag: 0
|
||||
axis: {x: 0, y: 0, z: 0}
|
||||
- transform: {fileID: 2935101413777606001}
|
||||
weight: 1
|
||||
solverPosition: {x: 0, y: 0, z: 0}
|
||||
solverRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
defaultLocalPosition: {x: -0.12223645, y: -1.1324275e-16, z: 3.6614018e-17}
|
||||
defaultLocalRotation: {x: -0.0000000014483407, y: -0.000000017549914, z: -0.08224734, w: 0.99661195}
|
||||
length: 0
|
||||
sqrMag: 0
|
||||
axis: {x: 0, y: 0, z: 0}
|
||||
- transform: {fileID: 246890519160273793}
|
||||
weight: 1
|
||||
solverPosition: {x: 0, y: 0, z: 0}
|
||||
solverRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
defaultLocalPosition: {x: -0.0729259, y: 0.039617877, z: -0.040887676}
|
||||
defaultLocalRotation: {x: -0.12766209, y: -0.7104194, z: 0.25252518, w: 0.6443894}
|
||||
length: 0
|
||||
sqrMag: 0
|
||||
axis: {x: 0, y: 0, z: 0}
|
||||
transform: {fileID: 0}
|
||||
axis: {x: 0, y: 0, z: 1}
|
||||
poleAxis: {x: 0, y: 1, z: 0}
|
||||
polePosition: {x: 0, y: 0, z: 0}
|
||||
poleWeight: 0
|
||||
poleTarget: {fileID: 0}
|
||||
clampWeight: 0.1
|
||||
clampSmoothing: 2
|
||||
target: {x: 0, y: 0, z: 0}
|
||||
targetTransform: {fileID: 2935101413777606001}
|
||||
--- !u!1 &5616185268039533525
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -3,15 +3,33 @@ using UnityEngine;
|
||||
|
||||
public class ArmTest : MonoBehaviour
|
||||
{
|
||||
public Vector3 target;
|
||||
public Vector3 target = new Vector3(0, 0, 0);
|
||||
|
||||
public Transform targetTransform;
|
||||
// public float Value;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
target = transform.localEulerAngles;
|
||||
// target = transform.localEulerAngles;
|
||||
}
|
||||
|
||||
private void LateUpdate()
|
||||
{
|
||||
transform.localEulerAngles = target;
|
||||
if (!targetTransform) return;
|
||||
// transform.localEulerAngles = target;
|
||||
targetTransform.localRotation *= Quaternion.Euler(target.x, target.y, target.z);
|
||||
//我草拟吗。transform.localEulerAngle = target;
|
||||
//wo shi da sha bi. ArmTest Monobehaviour
|
||||
//我草拟大爷的。transofrm.localEulerAngles = target;
|
||||
|
||||
// void LateUpdate()
|
||||
// {
|
||||
// Transform shoulder = animator.GetBoneTransform(HumanBodyBones.RightUpperArm);
|
||||
// if (shoulder != null)
|
||||
// {
|
||||
// // 局部旋转叠加(例如绕Z轴微调)
|
||||
// shoulder.localRotation *= Quaternion.Euler(0, 0, shoulderOffsetAngle);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -333,6 +333,7 @@ namespace NBF
|
||||
{
|
||||
animator = GetComponent<Animator>();
|
||||
}
|
||||
|
||||
|
||||
#region 动画事件回调
|
||||
|
||||
|
||||
22
Assets/Scripts/Fishing/Player/FixedLine.cs
Normal file
22
Assets/Scripts/Fishing/Player/FixedLine.cs
Normal file
@@ -0,0 +1,22 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
namespace NBF
|
||||
{
|
||||
public class FixedLine : MonoBehaviour
|
||||
{
|
||||
public Transform target;
|
||||
private Rigidbody _rigidbody;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
_rigidbody = GetComponent<Rigidbody>();
|
||||
}
|
||||
|
||||
private void FixedUpdate()
|
||||
{
|
||||
if (!target) return;
|
||||
_rigidbody.MovePosition(target.position);
|
||||
}
|
||||
}
|
||||
}
|
||||
3
Assets/Scripts/Fishing/Player/FixedLine.cs.meta
Normal file
3
Assets/Scripts/Fishing/Player/FixedLine.cs.meta
Normal file
@@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 112f7ad42d8149c1944bb51067ef1966
|
||||
timeCreated: 1747411443
|
||||
@@ -21,14 +21,8 @@ public class FLineHandler : MonoBehaviour
|
||||
public ObiRope obiRopeSegment_2;
|
||||
|
||||
public ObiRope obiRopeSegment_3;
|
||||
|
||||
public ObiRopeCursor obiRopeCursor_1;
|
||||
|
||||
public ObiRopeCursor obiRopeCursor_2;
|
||||
|
||||
public ObiRopeCursor obiRopeCursor_3;
|
||||
|
||||
public FixedJoint LineConnector_0;
|
||||
|
||||
public FixedLine LineConnector_0;
|
||||
|
||||
public SpringJoint LineConnector_1;
|
||||
|
||||
|
||||
@@ -261,7 +261,7 @@ public class FRod : FPlayerGear
|
||||
lineHandler = obj.GetComponent<FLineHandler>();
|
||||
// lineHandler.transform.SetParent(toRodConnector.transform);
|
||||
lineHandler.transform.position = rodAsset.lineConnector.position;
|
||||
lineHandler.LineConnector_0.connectedBody = rodAsset.lineConnector.GetComponent<Rigidbody>();
|
||||
lineHandler.LineConnector_0.target = rodAsset.lineConnector;//.GetComponent<Rigidbody>();
|
||||
// lineHandler.toRodConnector.target = rodAsset.lineConnector;
|
||||
lineHandler.Rod = this;
|
||||
var obiSolver = lineHandler.GetComponent<ObiSolver>();
|
||||
|
||||
@@ -9,35 +9,35 @@ EditorUserSettings:
|
||||
value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-0:
|
||||
value: 0705515f0650505f5457092744210e4440154a2c792c2434752f1862b6e6353e
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-1:
|
||||
value: 5752565e54545e5a0f575c2144770848444e1c7e287a7036752a1c6bbbb2606d
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-2:
|
||||
value: 5a00505e51040c59550b097016700f44451649797c7e2265282d486bbab0376d
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-3:
|
||||
RecentlyUsedSceneGuid-1:
|
||||
value: 000104565554500c0c5c547013720c44154e4a2e7e7c2264742d4a65e3b7613e
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-4:
|
||||
RecentlyUsedSceneGuid-2:
|
||||
value: 070903035354510c085e557541250b44174f4c28757922327d2b4b61b7b8306a
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-5:
|
||||
RecentlyUsedSceneGuid-3:
|
||||
value: 55030157570d5108595b557213770a47434e4d7f797e27667e2a1963e6b2323b
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-6:
|
||||
RecentlyUsedSceneGuid-4:
|
||||
value: 5407555107065c0c550a0d7645260e4410151a7e7a71706729781c31e6b86469
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-7:
|
||||
RecentlyUsedSceneGuid-5:
|
||||
value: 05010d5107025b5d5b0f0a24487b5c44154f49787c7877612b7a4c35b1b86d69
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-8:
|
||||
RecentlyUsedSceneGuid-6:
|
||||
value: 5057005200535b5808565a75457a0b4414161b7b2e7e74322979186ab2e6323a
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-9:
|
||||
RecentlyUsedSceneGuid-7:
|
||||
value: 5403075056035e03540c0e7b467707411416492c7e292734752b456bb1b73161
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-8:
|
||||
value: 5505015f5c515a085f5b092149760f441716407a787d7564287b1b36e7e1366e
|
||||
flags: 0
|
||||
RecentlyUsedSceneGuid-9:
|
||||
value: 0150055704510808545c0a26467506444516197a747874637b7e1860b5b6616c
|
||||
flags: 0
|
||||
vcSharedLogLevel:
|
||||
value: 0d5e400f0650
|
||||
flags: 0
|
||||
|
||||
Reference in New Issue
Block a user