考核模式工具显示相关功能整理优化

摄像机出现弹窗后停止位移
This commit is contained in:
“CongG” 2025-01-04 19:56:41 +08:00
parent e5edb2c508
commit e3a815c7d0
29 changed files with 7656 additions and 1943 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

View File

@ -1,140 +0,0 @@
fileFormatVersion: 2
guid: fe1c0641cc0b51942b59e247318cc598
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
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: 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
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: WebGL
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
- serializedVersion: 3
buildTarget: Server
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

View File

@ -1,140 +0,0 @@
fileFormatVersion: 2
guid: 051ccf1dc1f46264fb2a348f6bb6f2cb
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
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: 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
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: WebGL
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
- serializedVersion: 3
buildTarget: Server
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 KiB

View File

@ -1,140 +0,0 @@
fileFormatVersion: 2
guid: f58d4605054445b4c98063d8bcd2bc64
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
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: 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
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: WebGL
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
- serializedVersion: 3
buildTarget: Server
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 KiB

View File

@ -1,140 +0,0 @@
fileFormatVersion: 2
guid: 93dbe3e1c93235e46b7e6ea6b162b97b
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
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: 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
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: WebGL
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
- serializedVersion: 3
buildTarget: Server
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6000,6 +6000,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5619060300398104530
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8752347318625391028}
- component: {fileID: 3976269380085761735}
- component: {fileID: 6255801844008871486}
m_Layer: 5
m_Name: Text (Legacy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8752347318625391028
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5619060300398104530}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1507436169004188609}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3976269380085761735
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5619060300398104530}
m_CullTransparentMesh: 1
--- !u!114 &6255801844008871486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5619060300398104530}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3}
m_FontSize: 26
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u751F\u6210\u76F8\u673A\u4F4D\u7F6E"
--- !u!1 &5689420434344347380
GameObject:
m_ObjectHideFlags: 0
@ -6886,6 +6965,127 @@ MonoBehaviour:
rightTop: 1
leftBottom: 1
rightBottom: 1
--- !u!1 &7084970365372067865
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1507436169004188609}
- component: {fileID: 850170901198076854}
- component: {fileID: 7711614877414335093}
- component: {fileID: 7786064180011559778}
m_Layer: 5
m_Name: CreatCameraPosBtn_N
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1507436169004188609
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7084970365372067865}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8752347318625391028}
m_Father: {fileID: 1034991785916772890}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 7, y: -481}
m_SizeDelta: {x: 160, y: 53.1768}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &850170901198076854
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7084970365372067865}
m_CullTransparentMesh: 1
--- !u!114 &7711614877414335093
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7084970365372067865}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &7786064180011559778
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7084970365372067865}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 7711614877414335093}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &7088656243416743519
GameObject:
m_ObjectHideFlags: 0
@ -9454,6 +9654,7 @@ RectTransform:
- {fileID: 6124579142209774286}
- {fileID: 4888245697772597048}
- {fileID: 8052589572268344594}
- {fileID: 1507436169004188609}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}

View File

@ -1229,7 +1229,7 @@ MonoBehaviour:
m_Left: 18
m_Right: 10
m_Top: 20
m_Bottom: 20
m_Bottom: 35
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0

View File

@ -120,7 +120,7 @@
"ExamEvvr": "物品选择错误,当前模块中,不需要该物品",
"Question": "",
"OptionsAll": "",
"OptionErro": "孕马血清促性腺激素PMSG|聚乙烯哔咯烷酮PVP|卡波前列腺素(甲基-PGF2α",
"OptionErro": "孕马血清促性腺激素(PMSG)|聚乙烯哔咯烷酮(PVP)|卡波前列腺素(甲基-PGF2α)",
"OptionRight": "",
"Score": 7.0
},
@ -1055,10 +1055,10 @@
"TaskName": "操作准备",
"ThreeTaskName": "物品准备",
"TaskType": "物品展示",
"ToolsName": "注射器|促卵泡生成素(FSH)|孕马血清促性腺激素(PMSG)|孕酮阴道栓(CIDR)|长柄钳|聚乙烯哔咯烷酮(PVP)|卡波前列腺素(甲基-PGF2α)|消毒纸巾|前列腺素F(PGF)|保定架|前列腺素(PG)|垃圾袋",
"ToolsName": "注射器|促卵泡生成素(FSH)|孕马血清促性腺激素(PMSG)|孕酮阴道硅胶栓(CIDR)|长柄钳|聚乙烯哔咯烷酮(PVP)|卡波前列腺素(甲基-PGF2α)|消毒纸巾|前列腺素F(PGF)|保定架|前列腺素(PG)|垃圾袋",
"ModelBT": "",
"Operation": "",
"ProcessDescription": "注射器、促卵泡生成素FSH、孕马血清促性腺激素PMSG孕酮阴道栓CIDR、长柄钳、聚乙烯哔咯烷酮PVP、卡波前列腺素甲基-PGF2α、消毒纸巾、前列腺素FPGF、保定架",
"ProcessDescription": "注射器、促卵泡生成素FSH、孕马血清促性腺激素PMSG孕酮阴道硅胶CIDR、长柄钳、聚乙烯哔咯烷酮PVP、卡波前列腺素甲基-PGF2α、消毒纸巾、前列腺素FPGF、保定架",
"SoundPath": "",
"VideoPath": "",
"TimelineLength": 0,
@ -1070,7 +1070,7 @@
"ExamEvvr": "",
"Question": "",
"OptionsAll": "",
"OptionErro": "显微镜|玻璃棒|镊子|",
"OptionErro": "双筒显微镜|玻璃棒|长柄镊子",
"OptionRight": "",
"Score": 10.0
},
@ -2155,8 +2155,8 @@
"TaskName": "操作准备",
"ThreeTaskName": "物品准备",
"TaskType": "物品展示",
"ToolsName": "显微镜|载玻片|盖玻片|玻璃棒|恒温载物台|牛的精液A|牛的精液B|牛的精液C",
"ModelBT": "显微镜|载玻片|盖玻片|玻璃棒|恒温载物台|牛的精液A|牛的精液B|牛的精液C",
"ToolsName": "双筒显微镜|载玻片|盖玻片|玻璃棒|恒温载物台|牛的精液",
"ModelBT": "显微镜|载玻片|盖玻片|玻璃棒|恒温载物台|牛的精液",
"Operation": "",
"ProcessDescription": "显微镜、载玻片、盖玻片、玻璃棒、恒温载物台、牛的精液",
"SoundPath": "",
@ -3555,7 +3555,7 @@
"TaskName": "操作准备",
"ThreeTaskName": "物品准备",
"TaskType": "物品展示",
"ToolsName": "保定架|一次性长臂塑料手套|消毒纸巾|扩张棒|冲卵管|注射器|容器|冲卵液|青霉素|链霉素|氯前列烯醇",
"ToolsName": "保定架|一次性长臂塑料手套|消毒纸巾|扩张棒|冲卵管|注射器|杯子|冲卵液|青霉素|链霉素|氯前列烯醇|垃圾袋",
"ModelBT": "",
"Operation": "",
"ProcessDescription": "保定架、一次性长臂塑料手套、消毒纸巾、扩张棒、冲卵管、注射器、容器、冲卵液、青霉素、链霉素、氯前列烯醇",
@ -3570,7 +3570,7 @@
"ExamEvvr": "",
"Question": "",
"OptionsAll": "",
"OptionErro": "",
"OptionErro": "输精枪|开窒器|长柄钳",
"OptionRight": "",
"Score": 0
},
@ -4488,8 +4488,8 @@
"VideoPath": "",
"TimelineLength": 120,
"CameraDefaultTR": "",
"CameraNearTR": "",
"QNextNum": 180,
"CameraNearTR": "1",
"QNextNum": 181,
"ExamModelBT": "",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误,应选择盛放胚胎液的培养皿",
@ -4514,7 +4514,7 @@
"TimelineLength": 420,
"CameraDefaultTR": "",
"CameraNearTR": "",
"QNextNum": 181,
"QNextNum": 182,
"ExamModelBT": "",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误,应选择玻璃细管和口吸管",
@ -4539,7 +4539,7 @@
"TimelineLength": 480,
"CameraDefaultTR": "",
"CameraNearTR": "",
"QNextNum": 182,
"QNextNum": 183,
"ExamModelBT": "",
"ExamTip": "请选择质量达标的胚胎",
"ExamEvvr": "选择错误",
@ -5039,7 +5039,7 @@
"TimelineLength": 570,
"CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0",
"CameraNearTR": "",
"QNextNum": 202,
"QNextNum": 203,
"ExamModelBT": "",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误,应选消毒纸巾操作",
@ -5064,7 +5064,7 @@
"TimelineLength": 640,
"CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0",
"CameraNearTR": "",
"QNextNum": 205,
"QNextNum": 206,
"ExamModelBT": "",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误,应先将右手涂以润滑剂",
@ -5139,7 +5139,7 @@
"TimelineLength": 485,
"CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0",
"CameraNearTR": "",
"QNextNum": 207,
"QNextNum": 208,
"ExamModelBT": "",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误,应使用凯苏枪操作",
@ -5189,7 +5189,7 @@
"TimelineLength": 325,
"CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0",
"CameraNearTR": "",
"QNextNum": 211,
"QNextNum": 212,
"ExamModelBT": "InInjectionPoint_sign|OutInjectionPoint_sign",
"ExamTip": "请选择送胚的位置",
"ExamEvvr": "选择错误",
@ -5289,7 +5289,7 @@
"TimelineLength": 300,
"CameraDefaultTR": "1.7027_-2.303_-0.659|7_0_0",
"CameraNearTR": "",
"QNextNum": 212,
"QNextNum": 213,
"ExamModelBT": "",
"ExamTip": "请按顺序进行相关操作",
"ExamEvvr": "选择错误,应进行垃圾清理",
@ -5470,7 +5470,7 @@
"ExamEvvr": "",
"Question": "",
"OptionsAll": "",
"OptionErro": "输精枪|凯苏枪|显微镜",
"OptionErro": "输精枪|凯苏枪|双筒显微镜",
"OptionRight": "",
"Score": 6.0
},

View File

@ -295,7 +295,10 @@ namespace KinematicCharacterController.Walkthrough.NoClipState
{
direction += Vector3.down;
}
return direction;
if (CG.UTility.PopUpMng._TriAble)
return direction;
else
return Vector3.zero;
}
int index;
//private void Update()

View File

@ -43,7 +43,7 @@ namespace KinematicCharacterController.Walkthrough.NoClipState
// Cursor.lockState =CursorLockMode.None;
//}
Cursor.visible = true;
if(CG.UTility.PopUpMng._TriAble)
HandleCharacterInput();
}
private int maxView = 80;
@ -80,7 +80,6 @@ namespace KinematicCharacterController.Walkthrough.NoClipState
// }
//Ïà»úÒÆ¶¯
if (CG.UTility.PopUpMng._TriAble)
HandleCameraInput();
}
private float _zoomSpeed = 1.6f;// 80.0f;
@ -92,8 +91,13 @@ namespace KinematicCharacterController.Walkthrough.NoClipState
// Create the look input vector for the camera
//float mouseLookAxisUp = Input.GetAxisRaw(MouseYInput);
//float mouseLookAxisRight = Input.GetAxisRaw(MouseXInput);
float mouseLookAxisUp = Input.GetAxis(MouseYInput);
float mouseLookAxisRight = Input.GetAxis(MouseXInput);
float mouseLookAxisUp = 0;
float mouseLookAxisRight = 0;
if (CG.UTility.PopUpMng._TriAble)
{
mouseLookAxisUp = Input.GetAxis(MouseYInput);
mouseLookAxisRight = Input.GetAxis(MouseXInput);
}
if (Input.GetKey(KeyCode.Mouse1))
{
Vector3 lookInputVector = new Vector3(mouseLookAxisRight, mouseLookAxisUp, 0f);
@ -144,20 +148,22 @@ namespace KinematicCharacterController.Walkthrough.NoClipState
PlayerCharacterInputs characterInputs = new PlayerCharacterInputs();
//¼ì²â°´¼üÊäÈë
characterInputs.MoveAxisForward = Input.GetAxisRaw(VerticalInput);
characterInputs.MoveAxisRight = Input.GetAxisRaw(HorizontalInput);
characterInputs.MoveAxisForward = Input.GetAxisRaw(VerticalInput);
characterInputs.MoveAxisRight = Input.GetAxisRaw(HorizontalInput);
characterInputs.JumpHeld = Input.GetKey(KeyCode.Q);
characterInputs.CrouchHeld = Input.GetKey(KeyCode.E);
characterInputs.CameraRotation = OrbitCamera.Transform.rotation;
// characterInputs.JumpDown = Input.GetKeyDown(KeyCode.Space);
characterInputs.JumpHeld = Input.GetKey(KeyCode.Q);
// characterInputs.CrouchDown = Input.GetKeyDown(KeyCode.C);
// characterInputs.CrouchUp = Input.GetKeyUp(KeyCode.C);
characterInputs.CrouchHeld = Input.GetKey(KeyCode.E);
// characterInputs.NoClipDown = Input.GetKeyUp(KeyCode.Q);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8978467915131476150
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (7)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 8548841504882818370}
m_Duration: 63
m_TimeScale: 1
m_ParentTrack: {fileID: -8978467915131476150}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-8445746270405843140
MonoBehaviour:
m_ObjectHideFlags: 1
@ -150,6 +243,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &-6426660493665288933
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-5853303674713592306
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1702,6 +1807,99 @@ MonoBehaviour:
loop: 1
preloadTime: 0.3
clipInTime: 0
--- !u!114 &-2314077002373244567
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (4)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 1572081578481290194}
m_Duration: 63
m_TimeScale: 1
m_ParentTrack: {fileID: -2314077002373244567}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-1892911303595147821
MonoBehaviour:
m_ObjectHideFlags: 1
@ -3848,6 +4046,99 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &-552297558295437471
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (6)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 1705355748359435789}
m_Duration: 63
m_TimeScale: 1
m_ParentTrack: {fileID: -552297558295437471}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-424884717451124891
MonoBehaviour:
m_ObjectHideFlags: 1
@ -3915,6 +4206,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: -2314077002373244567}
- {fileID: 1074241339734338410}
- {fileID: -552297558295437471}
- {fileID: -8978467915131476150}
- {fileID: -4207676734117098678}
- {fileID: 2824906742134999369}
- {fileID: 1552418582665186781}
@ -4430,6 +4725,99 @@ MonoBehaviour:
loop: 1
preloadTime: 0.3
clipInTime: 0
--- !u!114 &1074241339734338410
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (5)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -6426660493665288933}
m_Duration: 63
m_TimeScale: 1
m_ParentTrack: {fileID: 1074241339734338410}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &1292042313612428283
MonoBehaviour:
m_ObjectHideFlags: 1
@ -4702,6 +5090,30 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &1572081578481290194
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &1705355748359435789
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &2824906742134999369
MonoBehaviour:
m_ObjectHideFlags: 1
@ -5567,6 +5979,18 @@ MonoBehaviour:
m_Clips: []
m_Markers:
m_Objects: []
--- !u!114 &8548841504882818370
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &8805527050066383681
MonoBehaviour:
m_ObjectHideFlags: 1

View File

@ -1,5 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7696731101539846308
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (7)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 1628729890786316153}
m_Duration: 17
m_TimeScale: 1
m_ParentTrack: {fileID: -7696731101539846308}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-7681148053800868310
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1016,6 +1109,99 @@ MonoBehaviour:
m_DisplayName: Video Player
m_Markers:
m_Objects: []
--- !u!114 &-3400432006665763898
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -916891599002967172}
m_Duration: 17
m_TimeScale: 1
m_ParentTrack: {fileID: -3400432006665763898}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-2528557964447305009
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1109,6 +1295,111 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-1666289554300697091
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (6)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 7593603186441753271}
m_Duration: 17
m_TimeScale: 1
m_ParentTrack: {fileID: -1666289554300697091}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-916891599002967172
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-224466961145253577
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1176,6 +1467,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: -3400432006665763898}
- {fileID: -7696731101539846308}
- {fileID: -1666289554300697091}
- {fileID: -224466961145253577}
- {fileID: -7681148053800868310}
- {fileID: 8041610342594693211}
@ -1338,6 +1632,18 @@ MonoBehaviour:
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &1254238980418159717
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &1628729890786316153
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@ -2782,6 +3088,18 @@ MonoBehaviour:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &3543634407734938946
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &7593603186441753271
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}

View File

@ -88,6 +88,18 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &-8579029957610670543
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-8334722184695078395
MonoBehaviour:
m_ObjectHideFlags: 1
@ -181,6 +193,18 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-6918881653091605818
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &-6865196205205477659
MonoBehaviour:
m_ObjectHideFlags: 1
@ -296,6 +320,99 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &-4554339259228404733
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (3)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 7251790183749344058}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -6918881653091605818}
m_Duration: 76.1
m_TimeScale: 1
m_ParentTrack: {fileID: -4554339259228404733}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-3905087944251676838
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1622,6 +1739,33 @@ MonoBehaviour:
m_Clips: []
m_Markers:
m_Objects: []
--- !u!114 &-973651026654013499
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
m_Name: Tools
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children:
- {fileID: 3323380152842018163}
- {fileID: 4627731328352011583}
- {fileID: 720650131922587848}
- {fileID: 1052558437249604986}
m_Clips: []
m_Markers:
m_Objects: []
--- !u!114 &-920243699569713724
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1814,8 +1958,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: 3323380152842018163}
- {fileID: 4627731328352011583}
- {fileID: -973651026654013499}
- {fileID: -8936700325060488812}
- {fileID: -6249027646514711009}
- {fileID: 463012593989899595}
@ -2674,7 +2817,23 @@ AnimationClip:
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves:
- curve:
serializedVersion: 2
@ -2711,6 +2870,15 @@ AnimationClip:
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -2796,10 +2964,307 @@ AnimationClip:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves: []
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 4
script: {fileID: 0}
flags: 16
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &720650131922587848
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (1)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: -973651026654013499}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 1019507505288417231}
m_Duration: 76.1
m_TimeScale: 1
m_ParentTrack: {fileID: 720650131922587848}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &1019507505288417231
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &1052558437249604986
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (7)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: -973651026654013499}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -8579029957610670543}
m_Duration: 76.1
m_TimeScale: 1
m_ParentTrack: {fileID: 1052558437249604986}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &1125126159260154381
MonoBehaviour:
m_ObjectHideFlags: 1
@ -2929,7 +3394,7 @@ MonoBehaviour:
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Parent: {fileID: -973651026654013499}
m_Children: []
m_Clips:
- m_Version: 1
@ -3149,7 +3614,7 @@ MonoBehaviour:
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Parent: {fileID: -973651026654013499}
m_Children: []
m_Clips: []
m_Markers:
@ -4334,6 +4799,7 @@ MonoBehaviour:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children:
- {fileID: -4554339259228404733}
- {fileID: -689162037465391366}
m_Clips: []
m_Markers:

File diff suppressed because it is too large Load Diff

View File

@ -279,6 +279,18 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-7834415724770952467
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-7466016628775024412
MonoBehaviour:
m_ObjectHideFlags: 1
@ -3340,6 +3352,99 @@ MonoBehaviour:
m_Clips: []
m_Markers:
m_Objects: []
--- !u!114 &-3689157287033430686
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (1)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 8689751593876913602}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: 5459138197915320340}
m_Duration: 134.25
m_TimeScale: 1
m_ParentTrack: {fileID: -3689157287033430686}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-3565203566080766270
MonoBehaviour:
m_ObjectHideFlags: 1
@ -6930,7 +7035,7 @@ MonoBehaviour:
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Parent: {fileID: 8689751593876913602}
m_Children: []
m_Clips:
- m_Version: 1
@ -7391,7 +7496,25 @@ MonoBehaviour:
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -7583,7 +7706,25 @@ MonoBehaviour:
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve: []
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@ -8240,8 +8381,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Version: 0
m_Tracks:
- {fileID: 7108283597919870134}
- {fileID: -2362873448795621919}
- {fileID: 8689751593876913602}
- {fileID: 761026096028967939}
- {fileID: 5541617575922515940}
- {fileID: -1207960214250713833}
@ -10651,6 +10791,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &5459138197915320340
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &5541617575922515940
MonoBehaviour:
m_ObjectHideFlags: 1
@ -11218,7 +11370,7 @@ MonoBehaviour:
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Parent: {fileID: 8689751593876913602}
m_Children: []
m_Clips: []
m_Markers:
@ -12340,6 +12492,99 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &8200003417992217225
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (2)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 8689751593876913602}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -7834415724770952467}
m_Duration: 134.25
m_TimeScale: 1
m_ParentTrack: {fileID: 8200003417992217225}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &8211938476536988665
MonoBehaviour:
m_ObjectHideFlags: 1
@ -12467,6 +12712,33 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset(Clone)(Clone)
m_EditorClassIdentifier:
--- !u!114 &8689751593876913602
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
m_Name: Tools
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children:
- {fileID: 7108283597919870134}
- {fileID: -2362873448795621919}
- {fileID: -3689157287033430686}
- {fileID: 8200003417992217225}
m_Clips: []
m_Markers:
m_Objects: []
--- !u!114 &8713201064233705251
MonoBehaviour:
m_ObjectHideFlags: 1

View File

@ -591,6 +591,18 @@ MonoBehaviour:
m_Loop: 0
m_Version: 1
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
--- !u!114 &-5866174544394575101
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-5854866599769403492
MonoBehaviour:
m_ObjectHideFlags: 1
@ -1513,6 +1525,99 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
m_Name: ActivationPlayableAsset
m_EditorClassIdentifier:
--- !u!114 &-1765298077426770273
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
m_Name: Activation Track (12)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 0
m_ClipIn: 0
m_Asset: {fileID: -5866174544394575101}
m_Duration: 45.416666666666664
m_TimeScale: 1
m_ParentTrack: {fileID: -1765298077426770273}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_MixInCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_MixOutCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_BlendInCurveMode: 0
m_BlendOutCurveMode: 0
m_ExposedParameterNames: []
m_AnimationCurves: {fileID: 0}
m_Recordable: 0
m_PostExtrapolationMode: 0
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: Active
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!114 &-1599449164339989082
MonoBehaviour:
m_ObjectHideFlags: 1
@ -2288,6 +2393,7 @@ MonoBehaviour:
- {fileID: -2610436164943305520}
- {fileID: -2833549298276631176}
- {fileID: -3301003886423281593}
- {fileID: -1765298077426770273}
- {fileID: 7728399296531732602}
- {fileID: -6942726762340625221}
- {fileID: -8620792503966145454}

File diff suppressed because one or more lines are too long

View File

@ -40,11 +40,11 @@ namespace ZXK.LouDiXvMuNiu
public void InitAppData()
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN
string[] excelList = Directory.GetFiles(Application.streamingAssetsPath + ConstCtrl.EXCEL_PATH, "*.xlsx");
ExcelUtility excel = new ExcelUtility(excelList[0]);
excel.ConvertToJson(Application.streamingAssetsPath + ConstCtrl.JSON_PATH + Path.GetFileNameWithoutExtension(excelList[0]) + ".txt", new UTF8Encoding(false));
#endif
//#if UNITY_EDITOR || UNITY_STANDALONE_WIN
// string[] excelList = Directory.GetFiles(Application.streamingAssetsPath + ConstCtrl.EXCEL_PATH, "*.xlsx");
// ExcelUtility excel = new ExcelUtility(excelList[0]);
// excel.ConvertToJson(Application.streamingAssetsPath + ConstCtrl.JSON_PATH + Path.GetFileNameWithoutExtension(excelList[0]) + ".txt", new UTF8Encoding(false));
//#endif
string Niupath = Application.streamingAssetsPath + ConstCtrl.JSON_PATH + "NiuData.txt";
TxtFileHandle.ReadAllTxt(Niupath, (string vul) =>
{

View File

@ -18,7 +18,7 @@ namespace ZXK.LouDiXvMuNiu
public static NiuSceneMng _Instance = null;
//物品展示
[SerializeField]
private Transform _toolContain = null;
private Transform[] _toolContain = null;
private List<Transform> _curModuleToolArray = new List<Transform>();//当前步骤需要用到的所有工具
//动画交互
@ -52,6 +52,8 @@ namespace ZXK.LouDiXvMuNiu
private Transform _CSPLTran = null;
[SerializeField]
private Transform _RGSJTran = null;
[SerializeField]
private Transform _CPTran = null;
[ReadOnly]//是否正在播放动画
@ -71,7 +73,6 @@ namespace ZXK.LouDiXvMuNiu
private void Start()
{
GetCurModuleTools();
UseToolsActive(true);
InitPlayAnmState(null,null);
StartCoroutine("InitScene");
}
@ -159,8 +160,21 @@ namespace ZXK.LouDiXvMuNiu
{
if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
{
GameObject toolGeo = UtilitiesMng.GetGeoByName(new Transform[1] { _toolContain }, e.SelectTool, true);
toolGeo.SetActive(true);
if (e.SelectTool == "牛的精液")
{
string[] temp = new string[] { "牛的精液A", "牛的精液B", "牛的精液C" };
for (int a = 0; a < temp.Length; a++)
{
GameObject toolTempGeo = UtilitiesMng.GetGeoByName(_toolContain, temp[a], true);
toolTempGeo.SetActive(true);
}
}
else
{
GameObject toolGeo = UtilitiesMng.GetGeoByName(_toolContain, e.SelectTool, true);
toolGeo?.SetActive(true);
}
}
}
@ -198,15 +212,20 @@ namespace ZXK.LouDiXvMuNiu
}
else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_RGSJ))
{
GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true);
jiaziGeo.transform.localPosition = new Vector3(-0.485f, 0.5997721f, 2.109f);
jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero);
_RGSJTran.Find("SM_Niu_RenGongSouJing01").gameObject.SetActive(true);
GameObject ytgGeo = UtilitiesMng.GetGeoByName(new Transform[1] { _toolContain }, "Òºµª¹Þ", true);
GameObject gjj2Geo = UtilitiesMng.GetGeoByName(new Transform[1] { _toolContain }, "¹¤¾ß¼Ü2", true);
GameObject ytgGeo = UtilitiesMng.GetGeoByName(_toolContain, "液氮罐", true);
GameObject gjj2Geo = UtilitiesMng.GetGeoByName(_toolContain, "工具架2", true);
ytgGeo.gameObject.SetActive(true);
gjj2Geo.gameObject.SetActive(true);
SetTimeLineCtrl(curObj, previousObj, _RGSJTimeLineClip);
}
else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP))
{
_CPTran.Find("SM_Niu_ChongPei01").gameObject.SetActive(true);
SetTimeLineCtrl(curObj, previousObj, _CPTimeLineClip);
}
else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ))
@ -261,7 +280,7 @@ namespace ZXK.LouDiXvMuNiu
string[] tools = tempData[i].ToolsName.Split("|");
for (int j = 0; j < tools.Length; j++)
{
GameObject toolGeo = UtilitiesMng.GetGeoByName(new Transform[1] { _toolContain }, tools[j], true);
GameObject toolGeo = UtilitiesMng.GetGeoByName(_toolContain, tools[j], true);
if (toolGeo&&!toolArray.Contains(tools[j]))
{
toolArray.Add(tools[j]);
@ -429,6 +448,7 @@ namespace ZXK.LouDiXvMuNiu
{
bool addScoreTemp = true;
List<GameObject> useBts = _curStepUseBTDic[true];
if (useBts.Contains(triGeo))
{
if (triGeo.GetComponent<OutLineRender>())
@ -444,6 +464,7 @@ namespace ZXK.LouDiXvMuNiu
else
{
PopUpMng.PopChoseErrowToast(_CurSceneStep.ExamEvvr, 2.0f);
useBts.Clear();
addScoreTemp = false;
}
@ -453,7 +474,10 @@ namespace ZXK.LouDiXvMuNiu
{
for (int i = 0; i < item.Value.Count; i++)
{
item.Value[i].SetActive(false);
if (item.Value[i].tag != ConstCtrl.SceneTool_Tag)
{
item.Value[i].SetActive(false);
}
}
}
_curStepUseBTDic.Clear();

View File

@ -40,6 +40,7 @@ namespace ZXK.LouDiXvMuNiu
#region
private KinematicCharacterMotor kinematic = null;
private ExampleCharacterCamera characterCamera = null;
private Button _creatCameraTR = null;
#endregion
protected override void Awake()
@ -55,6 +56,7 @@ namespace ZXK.LouDiXvMuNiu
_nextBtn = GetWedage("NextBtn_N").GetComponent<Button>();
_defaultCameraTRTog = GetWedage("DefaultTR_N").GetComponent<Toggle>();
_nearCameraTRTog = GetWedage("NearTR_N").GetComponent<Toggle>();
_creatCameraTR = GetWedage("CreatCameraPosBtn_N").GetComponent<Button>();
List<NiuData> dataSrc = GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType];
List<string[]> dataTemp = new List<string[]>();
@ -99,6 +101,17 @@ namespace ZXK.LouDiXvMuNiu
CameraSetNearTR(curStep);
}
});
_creatCameraTR.onClick.AddListener(() =>
{
string TRStr = GetWedage("TempReadCameraPos_N").GetComponent<InputField>().text;
string[] cameraTR = TRStr.Split("|");
string[] camPosStr = cameraTR[0].Split("_");
string[] camRotStr = cameraTR[1].Split("_");
Vector3 cameraPos = new Vector3(float.Parse(camPosStr[0]), float.Parse(camPosStr[1]), float.Parse(camPosStr[2]));
Vector3 cameraRot = new Vector3(float.Parse(camRotStr[0]), float.Parse(camRotStr[1]), float.Parse(camRotStr[2]));
ChangeCameraPos(cameraPos, cameraRot);
});
_defaultCameraTRTog.isOn = _nearCameraTRTog.isOn = false;
InitStepSecondMenuDataUI(dataTemp);
@ -231,29 +244,23 @@ namespace ZXK.LouDiXvMuNiu
{
if (obj.TaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskName)
{//前后任务名字不同
NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue);
if (obj.TaskName == ConstCtrl.TaskName_ActualOperation
&& GameManager.Instance._CurModelType == ConstCtrl.ModuleName_CP)
if (obj.TaskName == ConstCtrl.TaskName_ActualOperation)
{
NiuSceneMng._Instance.UseToolsActive(false);
}
NiuSceneMng._Instance.InitPlayAnmState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue);
}
if(obj.ThreeTaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.ThreeTaskName)
{//前后三级人物名字不同
_defaultCameraTRTog.isOn = true;
//考核模式下,在物品选择之前,物品需要隐藏
if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
{
int geoShowID = 0;
foreach (NiuData item in GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType])
//默认工具全不显示
if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState"))
{//如果训练模式下,物品展示时显示物品
if (obj.ThreeTaskName == ConstCtrl.ThreeTaskName_PrepareGeo)
{
if (item.TaskType.Equals(ConstCtrl.TASKTYPE_ShowGeo))
{
geoShowID = item.id;
}
NiuSceneMng._Instance.UseToolsActive(true);
}
NiuSceneMng._Instance.UseToolsActive(obj.id > geoShowID);
}
}

View File

@ -34,17 +34,24 @@ namespace ZXK.LouDiXvMuNiu
}
private void CreateTool()
{
for (int i = 0; i < GameManager.Instance._DataNiuHandler.NiuDataArray.Count; i++)
List<NiuData> tempData = GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType];
for (int i = 0; i < tempData.Count; i++)
{
string itemTools = GameManager.Instance._DataNiuHandler.NiuDataArray[i].ToolsName;
string itemTools = tempData[i].ToolsName;
string itemErroTools= tempData[i].OptionErro;
if (string.IsNullOrEmpty(itemTools)) continue;
string[] tools = itemTools.Split("|");
for (int j = 0; j < tools.Length; j++)
string[] rightTools = itemTools.Split("|");
string[] erroTools = itemErroTools.Split("|");
string[] allTools = new string[rightTools.Length + erroTools.Length];
rightTools.CopyTo(allTools, 0);
erroTools.CopyTo(allTools, rightTools.Length);
for (int j = 0; j < allTools.Length; j++)
{
GameObject toolItemGeo = Instantiate(_toolItemPrefab, _toolsContent);
toolItemGeo.name = tools[j];
toolItemGeo.transform.Find("NoUseImg/Text").GetComponent<Text>().text = tools[j];
Sprite sprite = Resources.Load<Sprite>("ToolsLogo/" + tools[j]);
toolItemGeo.name = allTools[j];
toolItemGeo.transform.Find("NoUseImg/Text").GetComponent<Text>().text = allTools[j];
Sprite sprite = Resources.Load<Sprite>("ToolsLogo/" + allTools[j]);
//UtilitiesMng.LoadSpriteByURL(ItemInfo[i].picURL, (sprite) =>
//{
//DataBJCJHandler._BJCZSpriteArray.Add(ItemInfo[i].partName, sprite);

View File

@ -27,6 +27,7 @@ namespace CG.UTility
public const string TaskName_OperationPlan = "操作准备";
public const string TaskName_ActualOperation = "实际操作";
public const string ThreeTaskName_PeoplePlan = "人员准备";
public const string ThreeTaskName_PrepareGeo = "物品准备";
public const string TASKTYPE_WordExp = "文字说明";
public const string TASKTYPE_PicExp = "图示说明";
public const string TASKTYPE_ShowGeo = "物品展示";

View File

@ -105,6 +105,10 @@ namespace CG.UTility
/// <returns></returns>
public static GameObject GetGeoByName(Transform[] parentTran, string GeoName,bool findHindAble=false)
{
if(GeoName== "保定架")
{
GeoName = "baodingjiaJH";
}
for (int i = 0; i < parentTran.Length; i++)
{
foreach (Transform t in parentTran[i].GetComponentsInChildren<Transform>(findHindAble))