diff --git a/Assets/Resources/Prefabs/高粱预制体.prefab b/Assets/Resources/Prefabs/高粱预制体.prefab index baa1e98..ee39e0f 100644 --- a/Assets/Resources/Prefabs/高粱预制体.prefab +++ b/Assets/Resources/Prefabs/高粱预制体.prefab @@ -73,6 +73,7 @@ GameObject: - component: {fileID: 963909014448707086} - component: {fileID: 6594386118979159493} - component: {fileID: 4258570619904434678} + - component: {fileID: 3262949078777193882} m_Layer: 0 m_Name: "\u9AD8\u7CB1\u9884\u5236\u4F53" m_TagString: Untagged @@ -129,6 +130,178 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.6, y: 1.84, z: 0.6} m_Center: {x: 0, y: 0.92, z: 0} +--- !u!114 &3262949078777193882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963909014448707081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} + m_Name: + m_EditorClassIdentifier: + profile: {fileID: 0} + profileSync: 0 + camerasLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + effectGroup: 0 + effectGroupLayer: + serializedVersion: 2 + m_Bits: 4294967295 + effectNameFilter: + combineMeshes: 0 + alphaCutOff: 0 + cullBackFaces: 1 + ignoreObjectVisibility: 0 + reflectionProbes: 0 + GPUInstancing: 1 + optimizeSkinnedMesh: 1 + depthClip: 0 + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + normalsOption: 0 + ignore: 0 + _highlighted: 0 + fadeInDuration: 0 + fadeOutDuration: 0 + flipY: 0 + constantWidth: 1 + subMeshMask: -1 + overlay: 0 + overlayMode: 0 + overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + overlayAnimationSpeed: 1 + overlayMinIntensity: 0.5 + overlayBlending: 1 + overlayTexture: {fileID: 0} + overlayTextureUVSpace: 0 + overlayTextureScale: 1 + overlayVisibility: 0 + outline: 1 + outlineColor: {r: 0.34440607, g: 0.990566, b: 0.0046724924, a: 1} + outlineColorStyle: 0 + outlineGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + outlineGradientInLocalSpace: 0 + outlineWidth: 0.45 + outlineBlurPasses: 2 + outlineQuality: 3 + outlineEdgeMode: 0 + outlineEdgeThreshold: 0.995 + outlineDownsampling: 1 + outlineVisibility: 0 + glowBlendMode: 0 + outlineBlitDebug: 0 + outlineIndependent: 0 + outlineContourStyle: 0 + glow: 0 + glowWidth: 0.4 + glowQuality: 3 + glowBlurMethod: 0 + glowDownsampling: 2 + glowHQColor: {r: 0.64, g: 1, b: 0, a: 1} + glowDithering: 1 + glowMagicNumber1: 0.75 + glowMagicNumber2: 0.5 + glowAnimationSpeed: 1 + glowVisibility: 0 + glowBlitDebug: 0 + glowBlendPasses: 1 + glowPasses: + - offset: 4 + alpha: 0.1 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 3 + alpha: 0.2 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 2 + alpha: 0.3 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 1 + alpha: 0.4 + color: {r: 0.64, g: 1, b: 0, a: 1} + glowIgnoreMask: 0 + innerGlow: 0 + innerGlowWidth: 1 + innerGlowColor: {r: 1, g: 1, b: 1, a: 1} + innerGlowBlendMode: 0 + innerGlowVisibility: 0 + targetFX: 0 + targetFXTexture: {fileID: 0} + targetFXColor: {r: 1, g: 1, b: 1, a: 1} + targetFXCenter: {fileID: 0} + targetFXRotationSpeed: 50 + targetFXInitialScale: 4 + targetFXEndScale: 1.5 + targetFXScaleToRenderBounds: 1 + targetFXAlignToGround: 0 + targetFXFadePower: 32 + targetFXGroundMaxDistance: 10 + targetFXGroundLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + targetFXTransitionDuration: 0.5 + targetFXStayDuration: 1.5 + targetFXVisibility: 1 + seeThrough: 2 + seeThroughOccluderMask: + serializedVersion: 2 + m_Bits: 4294967295 + seeThroughOccluderThreshold: 0.3 + seeThroughOccluderMaskAccurate: 0 + seeThroughOccluderCheckInterval: 1 + seeThroughOccluderCheckIndividualObjects: 0 + seeThroughDepthOffset: 0 + seeThroughMaxDepth: 0 + seeThroughIntensity: 0.8 + seeThroughTintAlpha: 0.5 + seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} + seeThroughNoise: 1 + seeThroughBorder: 0 + seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} + seeThroughBorderOnly: 0 + seeThroughBorderWidth: 0.45 + seeThroughOrdered: 0 + seeThroughTexture: {fileID: 0} + seeThroughTextureUVSpace: 0 + seeThroughTextureScale: 1 + rmsCount: 0 + hitFxInitialIntensity: 0 + hitFxMode: 0 + hitFxFadeOutDuration: 0.25 + hitFxColor: {r: 1, g: 1, b: 1, a: 1} + hitFxRadius: 0.5 --- !u!1 &5495461739195588011 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/HQB/SorghumController.cs b/Assets/Scripts/HQB/SorghumController.cs index 95a9092..64aaaac 100644 --- a/Assets/Scripts/HQB/SorghumController.cs +++ b/Assets/Scripts/HQB/SorghumController.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SocialPlatforms; public enum SorghumState { @@ -35,6 +36,20 @@ public class SorghumController : PermanentTriggerBase // ӦµתǶ transform.eulerAngles = currentRotation; } + + + switch (State) + { + case SorghumState.Diseased: + triggerName = "_"; + this.gameObject.name = "_"; + break; + case SorghumState.Healthy: + triggerName = "_"; + this.gameObject.name = "_"; + break; + } + } protected override void OnMDown() @@ -47,7 +62,7 @@ public class SorghumController : PermanentTriggerBase GameObject targetObj = GameObject.Find("Split_Obj"); - + GameObject targetHD = targetObj.transform.GetChild(0).gameObject; GameObject targetSD = targetObj.transform.GetChild(1).gameObject; if (State == SorghumState.Diseased) @@ -65,4 +80,25 @@ public class SorghumController : PermanentTriggerBase GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, (p) => { p.Init(); }); } } + + protected override void OnMEnter() + { + base.OnMEnter(); + //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study) + //{ + _highlight.SetHighlighted(true); + //} + } + + protected override void OnMExit() + { + //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study) + _highlight.SetHighlighted(false); + base.OnMExit(); + } + + protected override void OnAwake() + { + base.OnAwake(); + } } diff --git a/Assets/Scripts/Project/Objects/Other/NPCController.cs b/Assets/Scripts/Project/Objects/Other/NPCController.cs index c6d2618..6e86bf5 100644 --- a/Assets/Scripts/Project/Objects/Other/NPCController.cs +++ b/Assets/Scripts/Project/Objects/Other/NPCController.cs @@ -42,14 +42,14 @@ public class NPCController : PermanentTriggerBase { base.OnMEnter(); if (!isClose) return; - if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study) - { + //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study) + //{ _highlight.SetHighlighted(true); - } + //} } protected override void OnMExit() { - if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study) + //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study) _highlight.SetHighlighted(false); base.OnMExit(); } diff --git a/Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml b/Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml index 2c4b4ad..5c02305 100644 --- a/Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml +++ b/Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml @@ -4,15 +4,15 @@ - + - + - +