huangjiayu
/
ShanxiKnowledgeBase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

7.25修改

This commit is contained in:
taosuqi 2024-07-25 17:42:37 +08:00
parent e942102737
commit 6d581ec7ca
12 changed files with 2515 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SXElectricityInformationAcquisition/Assets/Model/工器具间/工器具间展板.fbm.meta Normal file
View File

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

BIN
SXElectricityInformationAcquisition/Assets/Model/工器具间/工器具间展板.fbm/工具间展板.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 449 KiB

114
SXElectricityInformationAcquisition/Assets/Model/工器具间/工器具间展板.fbm/工具间展板.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: ede1b70eb20d6be46adce27b85077495
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
SXElectricityInformationAcquisition/Assets/Model/工器具间/工器具间展板.fbm/工器具间展板.fbx Normal file
View File

Binary file not shown.

109
SXElectricityInformationAcquisition/Assets/Model/工器具间/工器具间展板.fbm/工器具间展板.fbx.meta Normal file
View File

@ -0,0 +1,109 @@
fileFormatVersion: 2
guid: 08349211e45de17489e61d77777accdb
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
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
importPhysicalCameras: 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
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

12
SXElectricityInformationAcquisition/Assets/Model/电线杆/Mat/绝缘胶带绑线p1.mat
View File

@ -114,12 +114,12 @@ Material:
- _UVSec: 0
- _ZWrite: 1
- __dirty: 0
- _step_p1: 1
- _step_p2: 1
- _step_p3: 1
- _step_p4: 1
- _step_p5: 1
- _step_p6: 1
- _step_p1: 0
- _step_p2: 0
- _step_p3: 0
- _step_p4: 0
- _step_p5: 0
- _step_p6: 0
m_Colors:
- _BaseCol: {r: 0.23429155, g: 0.28497556, b: 0.3679245, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}

1970
SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
View File

File diff suppressed because it is too large Load Diff

83
SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity
View File

@ -2053,6 +2053,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 83531191}
m_CullTransparentMesh: 1
--- !u!1 &85454864 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9155057588692886009, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 601364440}
m_PrefabAsset: {fileID: 0}
--- !u!1 &89844431
GameObject:
m_ObjectHideFlags: 0
@ -6269,11 +6274,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 318329855}
m_CullTransparentMesh: 1
--- !u!1 &320402034 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2066500893675139563, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 601364440}
m_PrefabAsset: {fileID: 0}
--- !u!1 &324693196
GameObject:
m_ObjectHideFlags: 0
@ -11215,6 +11215,10 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4363590651331151068, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4551507190943069657, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Name
value: "JZQ_\u87BA\u4E1D0044"
@ -11231,6 +11235,10 @@ PrefabInstance:
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4827577959686483970, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4923871345237612518, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_IsActive
value: 1
@ -11239,6 +11247,10 @@ PrefabInstance:
propertyPath: outlineWidth
value: 0.09
objectReference: {fileID: 0}
- target: {fileID: 5341922230783362696, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5424038881333046194, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
@ -11275,6 +11287,10 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6243532757139534451, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6384924956409684290, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: outlineWidth
value: 0.1
@ -11307,6 +11323,10 @@ PrefabInstance:
propertyPath: m_Center.z
value: 0.3934136
objectReference: {fileID: 0}
- target: {fileID: 6974019854989268235, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7238574848161893510, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalPosition.y
value: -0.0034
@ -11551,6 +11571,10 @@ PrefabInstance:
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8219398056856457891, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: outlineWidth
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 8322912254063910965, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
propertyPath: m_LocalPosition.x
value: -40.889526
@ -20727,14 +20751,23 @@ MonoBehaviour:
- {fileID: 180043805}
- {fileID: 1131712852}
- {fileID: 502117451}
NewScrewObj:
- {fileID: 1485260157}
- {fileID: 1485260156}
- {fileID: 1485260155}
- {fileID: 1485260154}
- {fileID: 1485260153}
- {fileID: 1485260152}
- {fileID: 1485260151}
- {fileID: 1485260150}
- {fileID: 1485260147}
- {fileID: 1485260146}
ElectricWireSMR: {fileID: 1061297896}
ElectricWireBcr: {fileID: 1061297897}
HubCoverObj: {fileID: 570059132}
ConcentratorScrewObj:
- {fileID: 1974144506}
- {fileID: 1799615883}
- {fileID: 245574502}
- {fileID: 320402034}
ConcentratorObj: {fileID: 177045583}
TapeMar: {fileID: 2100000, guid: ddf175dcba94e8d46bc6b6d68d61c395, type: 2}
OpenScrewScrewdriverTrans:
@ -20747,6 +20780,11 @@ MonoBehaviour:
- {fileID: 1799387243}
- {fileID: 274585741}
PlayerCamera: {fileID: 6121626523118833245}
OldConcentrator: {fileID: 85454864}
Cover: {fileID: 1755457971}
screw:
- {fileID: 402936984}
- {fileID: 2058113440}
--- !u!114 &1112936946
MonoBehaviour:
m_ObjectHideFlags: 0
@ -26168,7 +26206,7 @@ BoxCollider:
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
m_Enabled: 0
serializedVersion: 3
m_Size: {x: 3.1789246, y: 1, z: 3.1007233}
m_Center: {x: 0.046676636, y: 0, z: 1.0503616}
@ -32576,7 +32614,6 @@ GameObject:
- component: {fileID: 1707754173}
- component: {fileID: 1707754177}
- component: {fileID: 1707754176}
- component: {fileID: 1707754175}
- component: {fileID: 1707754174}
m_Layer: 5
m_Name: Tiparrow
@ -32618,27 +32655,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ArrowImage: {fileID: 1707754176}
--- !u!65 &1707754175
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1707754172}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 100, y: 100, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1707754176
MonoBehaviour:
m_ObjectHideFlags: 0
@ -34762,11 +34778,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c2fdec81d61c01241a90f21b4368eaf8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1799615883 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6244883231775281554, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
m_PrefabInstance: {fileID: 601364440}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1801563362
GameObject:
m_ObjectHideFlags: 0
@ -36633,7 +36644,7 @@ MonoBehaviour:
screw:
- {fileID: 402936984}
- {fileID: 2058113440}
ScrewObj:
NewScrewObj:
- {fileID: 1485260157}
- {fileID: 1485260156}
- {fileID: 1485260155}

235
SXElectricityInformationAcquisition/Assets/Screwdriver.cs
View File

@ -46,6 +46,12 @@ public class Screwdriver : MonoBehaviour
/// </summary>
public GameObject[] ScrewObj;
/// <summary>
/// 新集中器下端螺丝
/// </summary>
public GameObject[] NewScrewObj;
/// <summary>
/// 集线盒电线动画
/// </summary>
@ -67,7 +73,7 @@ public class Screwdriver : MonoBehaviour
public GameObject[] ConcentratorScrewObj;
/// <summary>
/// 跟换下来的集中器
/// 更换下的旧的集中器
/// </summary>
public Transform ConcentratorObj;
@ -102,6 +108,31 @@ public class Screwdriver : MonoBehaviour
/// 工具解绑的父物体
/// </summary>
public GameObject PlayerCamera;
/// <summary>
/// 旧集中器
/// </summary>
public GameObject OldConcentrator;
[Header("集中器盖子")]
/// <summary>
/// 集中器盖子
/// </summary>
public GameObject Cover;
[Header("新集中器盖子上左右两颗螺丝")]
/// <summary>
/// 新集中器盖子上左右两颗螺丝
/// </summary>
public GameObject[] screw;
[Header("是否播放集线器螺丝拆完后电线动画")]
/// <summary>
/// 是否播放集线器螺丝拆完后电线动画
/// </summary>
public static bool isPlayAni = true;
bool Ischaiwan = true;
// Start is called before the first frame update
void Start()
{
@ -119,7 +150,7 @@ public class Screwdriver : MonoBehaviour
//ElectricWireSMR.SetBlendShapeWeight(2, 0);
//ElectricWireSMR.SetBlendShapeWeight(3, 0);
//ElectricWireSMR.SetBlendShapeWeight(4, 0);
ElectricWireSMR.SetBlendShapeWeight(5, 0);
//ElectricWireSMR.SetBlendShapeWeight(5, 0);
TapeMar.SetFloat("_step_p1", 0);
TapeMar.SetFloat("_step_p2", 0);
TapeMar.SetFloat("_step_p3", 0);
@ -135,10 +166,14 @@ public class Screwdriver : MonoBehaviour
// Update is called once per frame
void Update()
{
if (EventSystem.current.IsPointerOverGameObject())
return;
//if (EventSystem.current.IsPointerOverGameObject())
// return;
if (Ischaiwan == true)
{
chaiwan();
}
if (Input.GetMouseButtonDown(0))
{//Camera.transform.forward
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
@ -230,27 +265,39 @@ public class Screwdriver : MonoBehaviour
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
if (AreAllObjectsHidden())
{
isPlayAni = false;
}
}
}
chaiwan();
if (ConcentratorScrew())
{
StartCoroutine(IEConcentratorScrew());
}
//集中器螺丝全隐藏后播放电线动画
if (AreAllObjectsHidden()&& concentrator.isPlayAni)
if (AreAllObjectsHiddens()/*&& concentrator.isPlayAni*/)
{
//issplit =false;
StartCoroutine(ScrewdriverBack());
ElectricWireSMR.SetBlendShapeWeight(0, 100);
ElectricWireSMR.SetBlendShapeWeight(1, 100);
ElectricWireSMR.SetBlendShapeWeight(2, 100);
ElectricWireSMR.SetBlendShapeWeight(3, 100);
ElectricWireSMR.SetBlendShapeWeight(4, 100);
ElectricWireSMR.SetBlendShapeWeight(5, 100);
ElectricWireBcr.enabled = true;
//拆完集中器下端螺丝后才能拆掉集中器后端四颗螺丝
for (int i = 0; i < ConcentratorScrewObj.Length; i++)
{
ConcentratorScrewObj[i].GetComponent<BoxCollider>().enabled = true;
}
ElectricWireBcr.enabled = true;
//StartCoroutine(IEElectricWire());
// Debug.Log("所有螺丝都已隐藏");
}
//集中器外壳上的封印和螺丝
//集中器外壳上的封印和螺丝全拆完后盖子位移
if (AllHubOfHubs())
{
HubCoverObj.gameObject.transform.DOLocalMove(new Vector3(0, 0.0167f, -0.2387f),1);
@ -268,47 +315,93 @@ public class Screwdriver : MonoBehaviour
{
StartCoroutine(Frist());
issplit = true;
//Ischaiwan = false;
}
if (!ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy)
{
StartCoroutine(Second());
issplit = true;
}
if (!ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy)
{
StartCoroutine(Thrid());
issplit = true;
}
if (!ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy)
{
StartCoroutine(Fourth());
issplit = true;
}
if (!ScrewObj[9].activeInHierarchy)
{
StartCoroutine(Sixth());
issplit = true;
issplit = true;
}
if (!ScrewObj[8].activeInHierarchy)
{
StartCoroutine(Fivth());
issplit = true;
}
if (!ScrewObj[0].activeInHierarchy && !ScrewObj[1].activeInHierarchy&& !ScrewObj[2].activeInHierarchy && !ScrewObj[3].activeInHierarchy&& !ScrewObj[4].activeInHierarchy && !ScrewObj[5].activeInHierarchy&& !ScrewObj[6].activeInHierarchy && !ScrewObj[7].activeInHierarchy&& !ScrewObj[8].activeInHierarchy)
{
Ischaiwan = false;
}
}
//Ischaiwan = false;
}
/// <summary>
/// 判断集中器螺丝
/// 螺丝是否全部显示
/// </summary>
int allls;
/// <summary>
/// 新集中器螺丝全部安装上
/// </summary>
/// <returns></returns>
public bool AreAllObjectsHidden()
{
allls = 0;
for (int i = 0; i < NewScrewObj.Length; i++)
{
if (NewScrewObj[i].gameObject.GetComponent<MeshRenderer>().enabled == true)
{
//StartCoroutine(IEElectricWire());
allls++;
}
}
if (allls >= NewScrewObj.Length)
{
StartCoroutine(IEElectricWireGai());
return true;
}
else
{
return false;
}
}
/// <summary>
/// 判断集中器螺丝下端螺丝
/// </summary>
/// <returns></returns>
public bool AreAllObjectsHiddens()
{
foreach (GameObject obj in ScrewObj)
{
@ -353,6 +446,22 @@ public class Screwdriver : MonoBehaviour
return true;
}
/// <summary>
/// 集中器盖子后续动画
/// </summary>
/// <returns></returns>
IEnumerator IEElectricWireGai()
{
ElectricWireBcr.enabled = false;
yield return new WaitForSeconds(1f);
Cover.gameObject.SetActive(true);
yield return new WaitForSeconds(0.5f);
Cover.gameObject.transform.DOLocalMove(new Vector3(0, 0.01672375f, -0.09654188f), 1f);
yield return new WaitForSeconds(1.1f);
screw[0].gameObject.SetActive(true);
yield return new WaitForSeconds(1.0f);
screw[1].gameObject.SetActive(true);
}
/// <summary>
/// 螺丝刀返回动画
/// </summary>
@ -509,6 +618,87 @@ public class Screwdriver : MonoBehaviour
}
#endregion
/// <summary>
/// 第一个螺丝和第二个安装完成后卸下胶带和电线安装的动画
/// </summary>
/// <returns></returns>
//IEnumerator TapeBackFrist()
//{
// TapeMar.SetFloat("_step_p1", 0);
// if (ElectricWireSMR.GetBlendShapeWeight(0) != 0 && ElectricWireSMR.GetBlendShapeWeight(0) == 100)
// {
// for (int i = 100; i >= 0; i--)
// {
// yield return new WaitForSeconds(0.01f);
// ElectricWireSMR.SetBlendShapeWeight(0, i);
// }
// }
//}
//IEnumerator TapeBackSecond()
//{
// TapeMar.SetFloat("_step_p2", 0);
// if (ElectricWireSMR.GetBlendShapeWeight(1) != 0 && ElectricWireSMR.GetBlendShapeWeight(1) == 100)
// {
// for (int i = 100; i >= 0; i--)
// {
// yield return new WaitForSeconds(0.01f);
// ElectricWireSMR.SetBlendShapeWeight(1, i);
// }
// }
//}
//IEnumerator TapeBackThird()
//{
// TapeMar.SetFloat("_step_p3", 0);
// if (ElectricWireSMR.GetBlendShapeWeight(2) != 0 && ElectricWireSMR.GetBlendShapeWeight(2) == 100)
// {
// for (int i = 100; i >= 0; i--)
// {
// yield return new WaitForSeconds(0.01f);
// ElectricWireSMR.SetBlendShapeWeight(2, i);
// }
// }
//}
//IEnumerator TapeBackFourth()
//{
// TapeMar.SetFloat("_step_p4", 0);
// if (ElectricWireSMR.GetBlendShapeWeight(3) != 0 && ElectricWireSMR.GetBlendShapeWeight(3) == 100)
// {
// for (int i = 100; i >= 0; i--)
// {
// yield return new WaitForSeconds(0.01f);
// ElectricWireSMR.SetBlendShapeWeight(3, i);
// }
// }
//}
//IEnumerator TapeBackFifth()
//{
// TapeMar.SetFloat("_step_p5", 0);
// if (ElectricWireSMR.GetBlendShapeWeight(4) != 0 && ElectricWireSMR.GetBlendShapeWeight(4) == 100)
// {
// for (int i = 100; i >= 0; i--)
// {
// yield return new WaitForSeconds(0.01f);
// ElectricWireSMR.SetBlendShapeWeight(4, i);
// }
// }
//}
//IEnumerator TapeBackSixth()
//{
// TapeMar.SetFloat("_step_p6", 0);
// if (ElectricWireSMR.GetBlendShapeWeight(5) != 0 && ElectricWireSMR.GetBlendShapeWeight(5) == 100)
// {
// for (int i = 100; i >= 0; i--)
// {
// yield return new WaitForSeconds(0.01f);
// ElectricWireSMR.SetBlendShapeWeight(5, i);
// }
// }
//}
/// <summary>
/// 集中器背后螺丝全部拆完集中器动画
@ -518,7 +708,8 @@ public class Screwdriver : MonoBehaviour
{
ConcentratorObj.gameObject.transform.DOLocalMove(new Vector3(-0.2719f, 2.24768f, -0.0772f), 0.5f);
yield return new WaitForSeconds(1f);
ConcentratorObj.gameObject.SetActive(false);
Destroy(ConcentratorObj.gameObject);
//OldConcentrator.gameObject.SetActive(false);
}
/// <summary>
/// 旧的集线器背后右边螺丝
@ -529,14 +720,20 @@ public class Screwdriver : MonoBehaviour
ScrewdriverTrans.transform.position = OpenScrewScrewdriverTrans[4].transform.position;
yield return new WaitForSeconds(0.5f);
ConcentratorScrewObj[0].SetActive(false);
ConcentratorScrewObj[1].SetActive(false);
//ConcentratorScrewObj[1].SetActive(false);
}
/// <summary>
/// 旧的集线器背后左边螺丝
/// </summary>
/// <returns></returns>
IEnumerator left()
{
ScrewdriverTrans.transform.position = OpenScrewScrewdriverTrans[4].transform.position;
yield return new WaitForSeconds(0.5f);
ConcentratorScrewObj[2].SetActive(false);
ConcentratorScrewObj[3].SetActive(false);
ConcentratorScrewObj[1].SetActive(false);
//ConcentratorScrewObj[2].SetActive(false);
//ConcentratorScrewObj[3].SetActive(false);
}
}

72
SXElectricityInformationAcquisition/Assets/concentrator.cs
View File

@ -64,12 +64,15 @@ public class concentrator : MonoBehaviour
/// </summary>
public GameObject[] screw;
[Header("集中器端子螺丝")]
[Header("м¯ÖÐÆ÷¶Ë×ÓÂÝË¿")]
/// <summary>
/// 集中器端子螺丝
/// </summary>
public GameObject[] ScrewObj;
public GameObject[] NewScrewObj;
public static concentrator instean;
private Coroutine coroutine;
public GameObject 透明盖子封印碰撞R;
public GameObject 透明盖子封印碰撞L;
@ -82,12 +85,16 @@ public class concentrator : MonoBehaviour
{
}
private void Awake()
{
instean = this;
}
// Update is called once per frame
void Update()
{
if (EventSystem.current.IsPointerOverGameObject())
return;
//if (EventSystem.current.IsPointerOverGameObject())
// return;
if (Input.GetMouseButtonDown(0))
{
@ -112,41 +119,41 @@ public class concentrator : MonoBehaviour
if (hit.collider.gameObject.name == "JZQ_螺丝1")
{
StartCoroutine(TapeBackFrist());
ScrewObj[0].GetComponent<MeshRenderer>().enabled = true;
ScrewObj[1].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[0].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[1].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
else if (hit.collider.gameObject.name == "JZQ_螺丝2")
{
StartCoroutine(TapeBackSecond());
ScrewObj[2].GetComponent<MeshRenderer>().enabled = true;
ScrewObj[3].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[2].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[3].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
else if (hit.collider.gameObject.name == "JZQ_螺丝3")
{
StartCoroutine(TapeBackThird());
ScrewObj[4].GetComponent<MeshRenderer>().enabled = true;
ScrewObj[5].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[4].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[5].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
else if (hit.collider.gameObject.name == "JZQ_螺丝4")
{
StartCoroutine(TapeBackFourth());
ScrewObj[6].GetComponent<MeshRenderer>().enabled = true;
ScrewObj[7].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[6].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[7].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
else if (hit.collider.gameObject.name == "JZQ_螺丝6")
{
StartCoroutine(TapeBackFifth());
ScrewObj[8].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[8].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
else if (hit.collider.gameObject.name == "JZQ_螺丝7")
{
StartCoroutine(TapeBackSixth());
ScrewObj[9].GetComponent<MeshRenderer>().enabled = true;
NewScrewObj[9].GetComponent<MeshRenderer>().enabled = true;
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
@ -186,25 +193,8 @@ public class concentrator : MonoBehaviour
if (AreAllObjectsHidden())
{
isPlayAni = false;
//StartCoroutine(IEElectricWire());
//MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
// Debug.Log("所有螺丝都显示");
}
// if (hit.collider.gameObject.name == "JZQ_螺丝007")
// {
// MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
// }
//if (hit.collider.gameObject.name == "pCylinder170")
//{
// if (isplaying)
// {
// StartCoroutine(IEElectricWire());// MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
// isplaying = false;
// }
//}
}
}
}
@ -216,16 +206,16 @@ public class concentrator : MonoBehaviour
public bool AreAllObjectsHidden()
{
allls = 0;
for (int i = 0; i < ScrewObj.Length; i++)
for (int i = 0; i < NewScrewObj.Length; i++)
{
if (ScrewObj[i].gameObject.GetComponent<MeshRenderer>().enabled == true)
if (NewScrewObj[i].gameObject.GetComponent<MeshRenderer>().enabled == true)
{
//StartCoroutine(IEElectricWire());
allls++;
}
}
if (allls >= ScrewObj.Length)
if (allls >= NewScrewObj.Length)
{
StartCoroutine(IEElectricWire());
return true;
@ -243,14 +233,24 @@ public class concentrator : MonoBehaviour
IEnumerator Newconcentrator()
{
ConcentratorObj.gameObject.transform.DOLocalMove(oncentratorTrans.gameObject.transform.localPosition, 1f); //3.0778f, 2.2149f, -1.4581f
ConcentratorObj.gameObject.transform.rotation = oncentratorTrans.transform.rotation;
yield return new WaitForSeconds(1f);
}
public void ElectricWire()
{
if (coroutine != null)
{
StopCoroutine(coroutine);
}
coroutine = StartCoroutine(IEElectricWire());
}
/// <summary>
/// 集中器盖子后续动画
/// </summary>
/// <returns></returns>
IEnumerator IEElectricWire()
private IEnumerator IEElectricWire()
{
TapeMarCol.enabled = false;
yield return new WaitForSeconds(1f);

4
SXElectricityInformationAcquisition/Assets/taoruiqi/AdhesiveTape.cs
View File

@ -74,8 +74,8 @@ using UnityEngine.EventSystems;
// Update is called once per frame
void Update()
{
if (EventSystem.current.IsPointerOverGameObject())
return;
//if (EventSystem.current.IsPointerOverGameObject())
// return;
if (Input.GetMouseButtonDown(0))

14
SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs
View File

@ -53,8 +53,8 @@ public class ElectricCheckPen : MonoBehaviour
/// </summary>
void Update()
{
if (EventSystem.current.IsPointerOverGameObject())
return;
//if (EventSystem.current.IsPointerOverGameObject())
// return;
if (Input.GetMouseButtonDown(0))
@ -68,7 +68,7 @@ public class ElectricCheckPen : MonoBehaviour
if (hit.collider.gameObject.name == "ĎäĚĺ")
{
ElectricCheckPenOBJ.gameObject.transform.SetParent(null);
ElectricCheckPenOBJ.gameObject.transform.DOLocalMove(new Vector3(303.038f, 2.655f, 163.822f), 2f);
ElectricCheckPenOBJ.gameObject.transform.DOLocalMove(new Vector3(303.038f, 2.655f, 163.822f), 1f);
Debug.Log(hit.collider.gameObject.name);
MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject.name);
}
@ -130,15 +130,15 @@ public class ElectricCheckPen : MonoBehaviour
/// <returns></returns>
async void Warninglight()
{
ElectricCheckPenMater.SetFloat("_SwitchOfEmi", 1);
ElectricCheckPenMater.SetFloat("_SwitchOfEmi", 0.5f);
//ElectricCheckPenMater.SetColor("Int_E",Color.red);
//ElectricCheckPenSpr.color = new Color(255, 0, 0);
await Task.Delay(TimeSpan.FromSeconds(0.5f));
await Task.Delay(TimeSpan.FromSeconds(0.2f));
ElectricCheckPenMater.SetFloat("_SwitchOfEmi", 0);
//ElectricCheckPenMater.SetColor("Int_E", Color.white);
//ElectricCheckPenSpr.color = new Color(166, 183, 213);
await Task.Delay(TimeSpan.FromSeconds(0.5f));
ElectricCheckPenMater.SetFloat("_SwitchOfEmi", 1);
await Task.Delay(TimeSpan.FromSeconds(0.2f));
ElectricCheckPenMater.SetFloat("_SwitchOfEmi", 0.5f);
//ElectricCheckPenMater.SetColor("Int_E", Color.red);
//ElectricCheckPenSpr.color = new Color(255, 0, 0);
await Task.Delay(TimeSpan.FromSeconds(0.5f));