修改livescene客户和负责人效果

This commit is contained in:
YangHua 2024-09-06 13:18:32 +08:00
parent 2e82cd11a3
commit c64d8daf2f
13 changed files with 791 additions and 340 deletions

View File

@ -86,7 +86,7 @@ ModelImporter:
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: fe94d708b7ef8044b9b0d18a19d53f3f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -0,0 +1,159 @@
fileFormatVersion: 2
guid: 5836d6344f7a5b149b3976f56f6b0326
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
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
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 2
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
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: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 8192
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -340,6 +340,90 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 500, y: 761.86084, z: 1.2776842}
m_Center: {x: 0, y: 119.0697, z: -0.60743433}
--- !u!1 &165813676
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 165813677}
- component: {fileID: 165813678}
m_Layer: 0
m_Name: Tips
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &165813677
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165813676}
m_LocalRotation: {x: -0, y: -1, z: -0, w: 0}
m_LocalPosition: {x: 0, y: 0.64, z: 0}
m_LocalScale: {x: 0.20000018, y: 0.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 890581128}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!212 &165813678
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 165813676}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: fe94d708b7ef8044b9b0d18a19d53f3f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &199107786 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541081356017717, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@ -2191,7 +2275,7 @@ Transform:
m_GameObject: {fileID: 680750128}
m_LocalRotation: {x: -0, y: -0.033108294, z: -0, w: 0.9994518}
m_LocalPosition: {x: -0.104, y: 1.096, z: -0.123}
m_LocalScale: {x: 1.5, y: 1.5, z: 0.27768508}
m_LocalScale: {x: 0.3, y: 0.3, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1198127457}
@ -2238,7 +2322,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: a11d39002c2f59743a59ba54bb343040, type: 3}
m_Sprite: {fileID: 21300000, guid: 5836d6344f7a5b149b3976f56f6b0326, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -2597,17 +2681,18 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890581127}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: 0.55538327, z: -0, w: 0.8315945}
m_LocalPosition: {x: -170.37, y: 1.26, z: -57.03}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1638246612}
- {fileID: 165813677}
- {fileID: 1417925981}
- {fileID: 543450652139532038}
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 67.474, z: 0}
--- !u!114 &890581129
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2774,7 +2859,7 @@ MonoBehaviour:
seeThroughTexture: {fileID: 0}
seeThroughTextureUVSpace: 0
seeThroughTextureScale: 1
rmsCount: 3
rmsCount: 4
hitFxInitialIntensity: 0
hitFxMode: 0
hitFxFadeOutDuration: 0.25
@ -2801,6 +2886,8 @@ MonoBehaviour:
spriteRenderer: {fileID: 1638246613}
animator: {fileID: 0}
animatorParameters:
target: {fileID: 1501092963}
minDistance: 2
--- !u!136 &890581131
CapsuleCollider:
m_ObjectHideFlags: 0
@ -3830,6 +3917,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cf1df5cdcab28254cb3cc96edfa143da, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
_highlight: {fileID: 0}
isOpen: 0
zhouEnum: 2
angele: 90
@ -4472,6 +4562,8 @@ MonoBehaviour:
spriteRenderer: {fileID: 680750130}
animator: {fileID: 897986306}
animatorParameters: NPCState
target: {fileID: 1501092963}
minDistance: 2
--- !u!4 &1198127457
Transform:
m_ObjectHideFlags: 0
@ -4507,6 +4599,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cf1df5cdcab28254cb3cc96edfa143da, type: 3}
m_Name:
m_EditorClassIdentifier:
triggerID: 0
triggerName:
_highlight: {fileID: 0}
isOpen: 0
zhouEnum: 2
angele: -90
@ -5014,13 +5109,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1417925980}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 890581128}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &1417925983
MeshRenderer:
@ -5138,6 +5233,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2399593117623680742, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
m_PrefabInstance: {fileID: 1501092961}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1501092963 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
m_PrefabInstance: {fileID: 1501092961}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1566240508 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541079921355267, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@ -5194,9 +5294,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1638246611}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.996, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 0.27768508}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.99600005, z: 0}
m_LocalScale: {x: 0.30000013, y: 0.3, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 890581128}
@ -5243,7 +5343,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: a11d39002c2f59743a59ba54bb343040, type: 3}
m_Sprite: {fileID: 21300000, guid: 5836d6344f7a5b149b3976f56f6b0326, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@ -6246,7 +6346,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 919132148467463612}
m_LocalRotation: {x: -0, y: 0.5839868, z: -0, w: 0.81176317}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -1.15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -6254,8 +6354,8 @@ Transform:
- {fileID: 5465940245800636306}
- {fileID: 6886943050835836889}
m_Father: {fileID: 890581128}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 71.463, z: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &543450652271447145
Transform:
m_ObjectHideFlags: 0

View File

@ -8,7 +8,7 @@ using UnityEngine.EventSystems;
/// <summary>
/// ÆÕͨÃÅ
/// </summary>
public class Door : MonoBehaviour
public class Door : PermanentTriggerBase
{
public bool isOpen;
public ZhouEnum zhouEnum;
@ -22,30 +22,26 @@ public class Door : MonoBehaviour
[SerializeField]
private Vector3 nextR;
private HighlightEffect highlightEffect;
private void Awake()
protected override void OnAwake()
{
base.OnAwake();
GetEndAngle();
highlightEffect = GetComponent<HighlightEffect>();
}
private void OnMouseDown()
protected override void OnMDown()
{
if (EventSystem.current.IsPointerOverGameObject()) return;
base.OnMDown();
isOpen = !isOpen;
transform.DOLocalRotate(dic[isOpen], duration);
}
private void OnMouseEnter()
protected override void OnMEnter()
{
if (EventSystem.current.IsPointerOverGameObject()) return;
highlightEffect.SetHighlighted(true);
base.OnMEnter();
_highlight.SetHighlighted(true);
}
private void OnMouseExit()
protected override void OnMExit()
{
if (EventSystem.current.IsPointerOverGameObject()) return;
highlightEffect.SetHighlighted(false);
_highlight.SetHighlighted(false);
base.OnMExit();
}
private void GetEndAngle()

View File

@ -4,9 +4,19 @@ using UnityEngine;
public class MirrorController : PermanentTriggerBase
{
protected override void OnStart()
protected override void OnMEnter()
{
base.OnStart();
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 OnMDown()
{

View File

@ -7,7 +7,20 @@ using UnityEngine.EventSystems;
public class MobileController : PermanentTriggerBase
{
public int downIndex = 0;
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 OnMDown()
{
switch (downIndex)

View File

@ -9,10 +9,47 @@ public class NPCController : PermanentTriggerBase
public SpriteRenderer spriteRenderer;
public Animator animator;
public string animatorParameters;
public Transform target;
private float distance;
public float minDistance;
/// <summary>
/// ÊÇ·ñ¿¿½ü
/// </summary>
private bool isClose = false;
private void Update()
{
if (target != null)
distance = Vector3.Distance(transform.position, target.position);
if (distance < minDistance)
{
transform.LookAt(target.position);
transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0);
isClose = true;
}
else
{
isClose = false;
}
}
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 OnMDown()
{
base.OnMDown();
if (!isClose) return;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0)
{
GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
@ -21,7 +58,7 @@ public class NPCController : PermanentTriggerBase
});
_highlight.SetHighlighted(false);
spriteRenderer.gameObject.SetActive(false);
if(animator != null)
if (animator != null)
{
animator.SetInteger(animatorParameters, 1);
}

View File

@ -72,7 +72,6 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
currentTool.GetComponent<Collider>().enabled = false;
currentTool.name = currentItem.toolName;
GameManager.EventMgr.EventTrigger<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, currentTool);
//LiveSceneManager.Instance.SetSpawnToolInfo(currentTool);
GameManager.UIMgr.imageTips.HideTips();
}
break;

View File

@ -51,6 +51,10 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
LayoutRebuilder.ForceRebuildLayoutImmediate(Content.GetComponent<RectTransform>());
temp.callBack += OnSetUIRect;
break;
case "BackBtn":
GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>();
GameManager.UIMgr.HidePanel<UI_LowTensionWorkTicketPanel>();
break;
default:
break;
}

View File

@ -36,26 +36,26 @@
{
"index": 6,
"subProcessId": 6,
"currentScore": 2.99999928,
"currentScore": 0.0,
"isDone": true
},
{
"index": 7,
"subProcessId": 7,
"currentScore": 0.0,
"isDone": false
"currentScore": 5.0,
"isDone": true
},
{
"index": 8,
"subProcessId": 8,
"currentScore": 0.0,
"isDone": true
"isDone": false
},
{
"index": 9,
"subProcessId": 9,
"currentScore": 0.0,
"isDone": true
"isDone": false
},
{
"index": 10,
@ -73,7 +73,7 @@
"index": 12,
"subProcessId": 12,
"currentScore": 0.0,
"isDone": true
"isDone": false
},
{
"index": 13,
@ -113,59 +113,61 @@
}
],
"allToolAndMaterial": [
"三相四线电能表",
"三相四线电能表",
"绝缘螺丝刀",
"绝缘螺丝刀",
"剥线钳",
"验电笔"
"工作证"
],
"allWear": [],
"sceneName": "05_LiveScene",
"currentSceneTools": [
"currentSceneTools": [],
"currentSceneTriggers": [
{
"toolId": 0,
"triggerID": 0,
"toolName": "",
"selfPosInToolRoom": {
"triggerName": "空开1",
"selfPosInScene": {
"x": 0.0278625488,
"y": 0.08226776,
"z": -0.008735657
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"toolId": 0,
"triggerID": 0,
"toolName": "",
"selfPosInToolRoom": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
}
],
"currentSceneTriggers": [
{
"triggerID": 0,
"triggerName": "",
"triggerID": 5023,
"triggerName": "电能表封印2",
"selfPosInScene": {
"x": -176.113083,
"y": 1.43965042,
"z": -56.50579
"x": 0.0612678528,
"y": 0.07292634,
"z": -0.109647989
},
"selfRotInScene": {
"x": 1.00179141E-05,
"y": 270.0,
"z": 0.0
"x": 0.0,
"y": 0.0,
"z": 180.0
}
},
{
"triggerID": 5023,
"triggerName": "电能表封印1",
"selfPosInScene": {
"x": -0.06092453,
"y": 0.07292634,
"z": -0.109647989
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 180.0
}
},
{
"triggerID": 5024,
"triggerName": "电能表盖子",
"selfPosInScene": {
"x": 0.0001220703,
"y": 0.1388763,
"z": -0.2485413
"x": -0.000122070313,
"y": 0.0416763425,
"z": -0.09854126
},
"selfRotInScene": {
"x": 0.0,
@ -191,9 +193,9 @@
"triggerID": 0,
"triggerName": "电能表拆装螺丝2",
"selfPosInScene": {
"x": -0.06737137,
"y": 0.0210711714,
"z": -0.109404683
"x": -0.06473,
"y": 0.051071167,
"z": -0.10885
},
"selfRotInScene": {
"x": 0.0,
@ -206,7 +208,7 @@
"triggerName": "电能表拆装螺丝1",
"selfPosInScene": {
"x": 0.06592941,
"y": 0.0210711714,
"y": 0.051071167,
"z": -0.109404683
},
"selfRotInScene": {
@ -216,12 +218,12 @@
}
},
{
"triggerID": 0,
"triggerName": "A_in_螺丝up",
"triggerID": 5025,
"triggerName": "电能表盖子固定螺丝2",
"selfPosInScene": {
"x": 0.0501709,
"y": -0.00430419855,
"z": -0.09305191
"x": -0.06129074,
"y": -0.0140533447,
"z": -0.101232052
},
"selfRotInScene": {
"x": 0.0,
@ -230,152 +232,12 @@
}
},
{
"triggerID": 0,
"triggerName": "A_in_螺丝down",
"triggerID": 5025,
"triggerName": "电能表盖子固定螺丝1",
"selfPosInScene": {
"x": 0.0501709,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "A_out_螺丝down",
"selfPosInScene": {
"x": 0.03305435,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "A_out_螺丝up",
"selfPosInScene": {
"x": 0.03305435,
"y": -0.00430419855,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "B_in_螺丝down",
"selfPosInScene": {
"x": 0.0237312317,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "B_in_螺丝up",
"selfPosInScene": {
"x": 0.0237312317,
"y": -0.00430419855,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "B_out_螺丝down",
"selfPosInScene": {
"x": 0.006591797,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "B_out_螺丝up",
"selfPosInScene": {
"x": 0.006591797,
"y": -0.00430419855,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_in_螺丝down",
"selfPosInScene": {
"x": -0.002609253,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_in_螺丝up",
"selfPosInScene": {
"x": -0.002609253,
"y": -0.00430419855,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_out_螺丝down",
"selfPosInScene": {
"x": -0.0201148987,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_out_螺丝up",
"selfPosInScene": {
"x": -0.0201148987,
"y": -0.00430419855,
"z": -0.09305191
"x": 0.0612869263,
"y": -0.0140533447,
"z": -0.101232052
},
"selfRotInScene": {
"x": 0.0,
@ -388,7 +250,7 @@
"triggerName": "零_地_螺丝up",
"selfPosInScene": {
"x": -0.0295066833,
"y": -0.00430419855,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
@ -397,26 +259,12 @@
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "零_地_螺丝down",
"selfPosInScene": {
"x": -0.0295066833,
"y": -0.00430419855,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "零_out_螺丝up",
"selfPosInScene": {
"x": -0.0381965637,
"y": -0.00779845938,
"y": 0.0222015381,
"z": -0.09305191
},
"selfRotInScene": {
@ -425,82 +273,12 @@
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "零_out_螺丝down",
"selfPosInScene": {
"x": -0.0381965637,
"y": -0.00779845938,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 5025,
"triggerName": "电能表盖子固定螺丝2",
"selfPosInScene": {
"x": -0.06129077,
"y": -0.1840469,
"z": -0.251232177
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": -5.008956E-06
}
},
{
"triggerID": 5025,
"triggerName": "电能表盖子固定螺丝1",
"selfPosInScene": {
"x": 0.06128691,
"y": -0.1840469,
"z": -0.251232177
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": -5.008956E-06
}
},
{
"triggerID": 0,
"triggerName": "",
"selfPosInScene": {
"x": 0.146900177,
"y": -0.126495361,
"z": 0.5191498
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 180.0
}
},
{
"triggerID": 0,
"triggerName": "空开1",
"selfPosInScene": {
"x": 0.0278625488,
"y": 0.08226776,
"z": -0.008735657
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "B_out_线",
"selfPosInScene": {
"x": 20.0205078,
"y": 142.2929,
"y": 142.292862,
"z": 21.0742188
},
"selfRotInScene": {
@ -514,7 +292,7 @@
"triggerName": "C_out_线",
"selfPosInScene": {
"x": 17.5166016,
"y": 142.2929,
"y": 142.292862,
"z": 21.0742188
},
"selfRotInScene": {
@ -528,7 +306,7 @@
"triggerName": "C_in_线",
"selfPosInScene": {
"x": 13.3569336,
"y": 129.0804,
"y": 131.0804,
"z": 22.4726563
},
"selfRotInScene": {
@ -570,7 +348,7 @@
"triggerName": "零_out_线",
"selfPosInScene": {
"x": 16.4960938,
"y": 142.2929,
"y": 142.292862,
"z": 21.0742188
},
"selfRotInScene": {
@ -579,6 +357,34 @@
"z": 4.85314136E-20
}
},
{
"triggerID": 0,
"triggerName": "B_out_螺丝up",
"selfPosInScene": {
"x": 0.006591797,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_out_螺丝up",
"selfPosInScene": {
"x": -0.0201148987,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 5021,
"triggerName": "插座",
@ -595,14 +401,28 @@
},
{
"triggerID": 0,
"triggerName": "垃圾",
"triggerName": "B_in_螺丝down",
"selfPosInScene": {
"x": 0.161129,
"y": -0.371765137,
"z": -0.0119395256
"x": 0.0237312317,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 90.0,
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "A_in_螺丝up",
"selfPosInScene": {
"x": 0.0501709,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
@ -626,7 +446,7 @@
"triggerName": "A_out_线",
"selfPosInScene": {
"x": 22.70166,
"y": 142.2929,
"y": 142.292862,
"z": 21.0742188
},
"selfRotInScene": {
@ -649,6 +469,48 @@
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_in_螺丝up",
"selfPosInScene": {
"x": -0.002609253,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "B_out_螺丝down",
"selfPosInScene": {
"x": 0.006591797,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "零_地_螺丝down",
"selfPosInScene": {
"x": -0.0295066833,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 5020,
"triggerName": "NPC负责人",
@ -663,6 +525,20 @@
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "C_out_螺丝down",
"selfPosInScene": {
"x": -0.0201148987,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "零_地_线",
@ -679,11 +555,25 @@
},
{
"triggerID": 0,
"triggerName": "in开关_螺丝2",
"triggerName": "",
"selfPosInScene": {
"x": 0.0108642578,
"y": -0.07393646,
"z": 0.03310418
"x": 0.146900177,
"y": -0.1265,
"z": 0.5191498
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 180.0
}
},
{
"triggerID": 0,
"triggerName": "零_out_螺丝down",
"selfPosInScene": {
"x": -0.0381965637,
"y": 0.0222015381,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
@ -693,15 +583,15 @@
},
{
"triggerID": 0,
"triggerName": "in开关_螺丝3",
"triggerName": "B_in_螺丝up",
"selfPosInScene": {
"x": 0.0108642578,
"y": -0.111083522,
"z": 0.0330979824
"x": 0.0237312317,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 253.5234,
"y": 0.0,
"z": 0.0
}
},
@ -721,15 +611,57 @@
},
{
"triggerID": 0,
"triggerName": "in开关_螺丝1",
"triggerName": "C_in_螺丝down",
"selfPosInScene": {
"x": 0.0108642578,
"y": -0.05678177,
"z": 0.0330979824
"x": -0.002609253,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 70.98747,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "A_out_螺丝down",
"selfPosInScene": {
"x": 0.03305435,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "A_in_螺丝down",
"selfPosInScene": {
"x": 0.0501709,
"y": 0.0256958,
"z": -0.101950169
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "A_out_螺丝up",
"selfPosInScene": {
"x": 0.03305435,
"y": 0.0256958,
"z": -0.09305191
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
@ -742,9 +674,51 @@
"z": 0.47206974
},
"selfRotInScene": {
"x": 2.72990741E-35,
"y": 9.03968E-29,
"z": -1.73028438E-05
}
},
{
"triggerID": 0,
"triggerName": "in开关_螺丝3",
"selfPosInScene": {
"x": 0.0,
"y": 0.0,
"z": 170.0
"z": 0.0
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "in开关_螺丝2",
"selfPosInScene": {
"x": 0.01717,
"y": -0.00067,
"z": 0.0
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
},
{
"triggerID": 0,
"triggerName": "in开关_螺丝1",
"selfPosInScene": {
"x": 0.03411,
"y": -0.00094,
"z": 0.0
},
"selfRotInScene": {
"x": 0.0,
"y": 0.0,
"z": 0.0
}
}
]