WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://37c67607.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-09-05 11:11:06 +08:00
parent 1716fe491d 5b6b2924a7
commit db56f71289
6 changed files with 150 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/ArtRes/Models/Tools/扳手.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b98bbb1271c4bd844b1a04d06396c5b9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/ArtRes/Models/Tools/扳手/扳手.fbx Normal file
View File

Binary file not shown.

107
Assets/ArtRes/Models/Tools/扳手/扳手.fbx.meta Normal file
View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 3e688e9d7f9c3eb43b0d7f03cc31666d
ModelImporter:
serializedVersion: 21300
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 1
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

60
Assets/Resources/Prefabs/Objects/Tools/扳手.prefab
View File

@ -32,7 +32,7 @@ Transform:
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7829523123839521089}
- {fileID: 7729041787556459420}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -67,8 +67,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.05094013, y: 0.05094013, z: 0.30404854}
m_Center: {x: 0, y: 0.00000011920929, z: -0.15774488}
m_Size: {x: 0.061399538, y: 0.005925794, z: 0.24038354}
m_Center: {x: 0.0004428625, y: -0.00012303382, z: -0.1198405}
--- !u!114 &6231094815727103799
MonoBehaviour:
m_ObjectHideFlags: 0
@ -235,7 +235,7 @@ MonoBehaviour:
seeThroughTexture: {fileID: 0}
seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1
rmsCount: 0
rmsCount: 3
hitFxInitialIntensity: 0
hitFxMode: 0
hitFxFadeOutDuration: 0.25
@ -258,65 +258,65 @@ MonoBehaviour:
_highlight: {fileID: 0}
toolType: 0
isMoving: 0
--- !u!1001 &7719931383897142954
--- !u!1001 &7838985687785182327
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8478404885969365012}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalPosition.z
value: -0.15680003
value: -0.1199
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalRotation.w
value: 0.00000008146034
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: 180
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 18e3d012d42595243afc97129c371624, type: 3}
- target: {fileID: 919132149155446097, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
propertyPath: m_Name
value: "\u7EDD\u7F18\u87BA\u4E1D\u5200"
value: "\u6273\u624B"
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 18e3d012d42595243afc97129c371624, type: 3}
--- !u!4 &7829523123839521089 stripped
m_SourcePrefab: {fileID: 100100000, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
--- !u!4 &7729041787556459420 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 18e3d012d42595243afc97129c371624, type: 3}
m_PrefabInstance: {fileID: 7719931383897142954}
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3e688e9d7f9c3eb43b0d7f03cc31666d, type: 3}
m_PrefabInstance: {fileID: 7838985687785182327}
m_PrefabAsset: {fileID: 0}

1
Assets/Scenes/05_LiveScene 经互感器接入式低压电能计量装置.unity
View File

@ -10267,6 +10267,7 @@ MonoBehaviour:
spawnToolPos: {fileID: 1927580343}
tMDTips: {fileID: 1180096483}
triggerName: "\u6536\u56DE\u5DE5\u5177"
device_Control: {fileID: 0}
--- !u!4 &2109812127
Transform:
m_ObjectHideFlags: 0

8
Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
View File

@ -109,8 +109,8 @@ public class StepState_1002 : StepState
//移动任务位置
LiveSceneManager.Instance.transform.position = new Vector3(-166.3514f, 0.8813821f, -53.70396f);
LiveSceneManager.Instance.transform.eulerAngles = new Vector3(0, -97.211f, 0);
LiveSceneManager.Instance.firstPersonController.transform.position = new Vector3(-166.3514f, 0.8813821f, -53.70396f);
LiveSceneManager.Instance.firstPersonController.transform.eulerAngles = new Vector3(0, -97.211f, 0);
//完成第一步点击去工具间
if (num == lastNum)
{
@ -166,8 +166,8 @@ public class StepState_1002 : StepState
//接线检查
//移动任务位置
LiveSceneManager.Instance.transform.position = new Vector3(-174.7603f, 0.8813825f, -56.58477f);
LiveSceneManager.Instance.transform.eulerAngles = new Vector3(0, -94.411f, 0);
LiveSceneManager.Instance.firstPersonController.transform.position = new Vector3(-174.7603f, 0.8813825f, -56.58477f);
LiveSceneManager.Instance.firstPersonController.transform.eulerAngles = new Vector3(0, -94.411f, 0);
//还原npc负责人
GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
{