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

Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
YangHua 2024-08-30 13:26:49 +08:00
parent 148ed39fbf 7eecd1f011
commit 4766fa4d06
15 changed files with 821 additions and 597 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ArtRes/Models/Device/计量柜/插排.fbx Normal file
View File

Binary file not shown.

107
Assets/ArtRes/Models/Device/计量柜/插排.fbx.meta Normal file
View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 50ee47915839b7f44886804e3e12f633
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:

BIN
Assets/ArtRes/Models/Device/计量柜/杂物.fbx Normal file
View File

Binary file not shown.

107
Assets/ArtRes/Models/Device/计量柜/杂物.fbx.meta Normal file
View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 179a5688a95dfd44788db3e0947c79b0
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:

4
Assets/Scenes/04_ToolMaterialScene.unity
View File

@ -694,6 +694,10 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 1342273091210630203, guid: fe4c1814d44af964c94c33808b704426, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: b9f45527b9d758746ba04747688797b6, type: 2}
- target: {fileID: 1711505207429034123, guid: fe4c1814d44af964c94c33808b704426, type: 3}
propertyPath: m_Layer
value: 6

1158
Assets/Scenes/05_LiveScene.unity
View File

File diff suppressed because it is too large Load Diff

3
Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
View File

@ -211,7 +211,8 @@ public class Device_3Phase4WireMeter : Device_Base
transform.localEulerAngles = Vector3.zero;
}).OnComplete(() =>
{
LiveSceneManager.Instance.currentTool = null;
LiveSceneManager.Instance.OnCheckSubProcess(false);
Debug.Log("电能表已安装");
CallScoreAction(true);
endAction?.Invoke();

4
Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
View File

@ -31,6 +31,7 @@ public class Device_CabinetDoor : Device_Base
transform.DOLocalRotate(new Vector3(0, 0, 180), 3).OnComplete(() =>
{
isOpen = true;
int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
endAction?.Invoke();
});
});
@ -46,6 +47,7 @@ public class Device_CabinetDoor : Device_Base
transform.Find("¼ÆÁ¿¹ñËø2/¼ÆÁ¿¹ñËø3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() =>
{
isOpen = false;
int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
endAction?.Invoke();
});
});
@ -55,7 +57,7 @@ public class Device_CabinetDoor : Device_Base
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê")
return;
if ((triggerAction==null?0: triggerAction.Invoke(triggerName, true)) == 0)
if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
{
base.OnMDown();
if (isOpen)

8
Assets/Scripts/CXX/Score/Score_1002.cs
View File

@ -133,6 +133,14 @@ public class Score_1002 : ScoreBase
steps[3002].SetScore(true);
}
}
else if(triggerName== "됴箕묏鱗튿횅훰객큐")
{
steps[3003].SetScore(true);
}
else if(triggerName== "뀔陋묏데객큐")
{
steps[3004].SetScore(true);
}
else if (triggerName == "现场按钮")
{
//检查是否穿戴

3
Assets/Scripts/CXX/Tools/Tool_Base.cs
View File

@ -87,7 +87,7 @@ public class Tool_Base : PermanentTriggerBase
/// <summary>
/// 工具回到手中
/// </summary>
public void ReBackHead()
public void ReBackHead(Action back=null)
{
isMoving = true;
transform.parent = Camera.main.transform;
@ -98,6 +98,7 @@ public class Tool_Base : PermanentTriggerBase
transform.localEulerAngles = head_LocalEulerAnglesl;
isMoving = false;
endAction?.Invoke();
back?.Invoke();
});
}
}

5
Assets/Scripts/CXX/Tools/Tool_TestPen.cs
View File

@ -75,6 +75,7 @@ public class Tool_TestPen : Tool_Base
{
var tmp = ((Device_Socket)device_base);
//位置移动
base.startAction?.Invoke();
transform.parent = null;
transform.DORotate(tmp.testPosAndRot.eulerAngles, 0.5f);
transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() =>
@ -83,6 +84,7 @@ public class Tool_TestPen : Tool_Base
isFlicker = tmp.hasElectricity;
screem.materials[0].color = isFlicker ? Color.red : Color.white;
int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true));
base.endAction?.Invoke();
base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}");
});
}
@ -91,6 +93,7 @@ public class Tool_TestPen : Tool_Base
var tmp = ((Device_CabinetDoor)device_base);
//位置移动
base.startAction?.Invoke();
transform.parent = null;
transform.DOLocalRotate(tmp.testPosAndRot.localEulerAngles, 0.5f);
transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() =>
@ -99,6 +102,7 @@ public class Tool_TestPen : Tool_Base
isFlicker = tmp.hasElectricity;
screem.materials[0].color = isFlicker ? Color.red : Color.white;
int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true));
base.endAction?.Invoke();
base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}");
});
}
@ -125,6 +129,7 @@ public class Tool_TestPen : Tool_Base
Debug.Log("螺丝 已验电");
isFlicker = tmp.hasElectricity;
screem.materials[0].color = isFlicker ? Color.red : Color.white;
base.endAction?.Invoke();
base.CallScoreAction(null, $"{triggerName}+{tool_base.triggerName}");
});
}

6
Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
View File

@ -53,8 +53,10 @@ public class Tool_WireStripper : Tool_Base
device_Seal.Cut();
isMoving = false;
ReBackHead();
int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true));
ReBackHead(() =>
{
int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true));
});
}
private void Update()

5
Assets/Scripts/Project/Manager/LiveSceneManager.cs
View File

@ -88,9 +88,10 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
}
}
public void OnCheckSubProcess()
public void OnCheckSubProcess(bool ifdestroy=true)
{
tMDTips.gameObject.SetActive(false);
Destroy(currentTool);
if (ifdestroy)
Destroy(currentTool);
}
}

1
Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
View File

@ -46,6 +46,7 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
Debug.Log(submit);
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
{
ScoreManager.instance.Check(triggerName, null);
//GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.UIMgr.HidePanel<UI_InstallAndDismantleTicketPanel>();
}

1
Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
View File

@ -35,6 +35,7 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
case "ConfirmBtn":
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
{
ScoreManager.instance.Check(triggerName, null);
GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
}
break;