diff --git a/Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx b/Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx new file mode 100644 index 0000000..8797e83 Binary files /dev/null and b/Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx differ diff --git a/Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx.meta b/Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx.meta new file mode 100644 index 0000000..c935f89 --- /dev/null +++ b/Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: add8990208c1edb4ba8b9135297da6d3 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/UI/弹窗-退出.png b/Assets/Art/UI/弹窗-退出.png new file mode 100644 index 0000000..f8429c1 Binary files /dev/null and b/Assets/Art/UI/弹窗-退出.png differ diff --git a/Assets/Art/UI/弹窗-退出.png.meta b/Assets/Art/UI/弹窗-退出.png.meta new file mode 100644 index 0000000..698508c --- /dev/null +++ b/Assets/Art/UI/弹窗-退出.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: beafc472114b880428a732e39975428c +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: diff --git a/Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab b/Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab new file mode 100644 index 0000000..a0526f9 --- /dev/null +++ b/Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab @@ -0,0 +1,435 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &677115793739368107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 677115793739368106} + - component: {fileID: 677115793739368108} + - component: {fileID: 677115793739368109} + m_Layer: 5 + m_Name: FirstFreeViewPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &677115793739368106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793739368107} + 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: 1435139407657757270} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &677115793739368108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793739368107} + m_CullTransparentMesh: 0 +--- !u!114 &677115793739368109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793739368107} + 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: 0, g: 0, b: 0, a: 0.5019608} + 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: 0} + m_Type: 0 + 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!1 &677115793818007531 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 677115793818007530} + - component: {fileID: 677115793818007532} + - component: {fileID: 677115793818007533} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &677115793818007530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793818007531} + 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: 677115793848439996} + 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 &677115793818007532 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793818007531} + m_CullTransparentMesh: 0 +--- !u!114 &677115793818007533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793818007531} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E \u8BA4" +--- !u!1 &677115793848439997 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 677115793848439996} + - component: {fileID: 677115793848439985} + - component: {fileID: 677115793848439998} + - component: {fileID: 677115793848439999} + m_Layer: 5 + m_Name: ConfirmBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &677115793848439996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793848439997} + 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: 677115793818007530} + m_Father: {fileID: 1435139407657757270} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 32.9} + m_SizeDelta: {x: 85.6741, y: 28.558} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &677115793848439985 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793848439997} + m_CullTransparentMesh: 0 +--- !u!114 &677115793848439998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793848439997} + 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: 21300000, guid: fa63ae52e51e2064390c2a75c12f664c, type: 3} + m_Type: 0 + 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 &677115793848439999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115793848439997} + 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: 2 + 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: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1, + type: 3} + 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: 677115793848439998} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &677115794628638322 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 677115794628638325} + - component: {fileID: 677115794628638327} + - component: {fileID: 677115794628638324} + m_Layer: 5 + m_Name: ContentTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &677115794628638325 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115794628638322} + 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: 1435139407657757270} + 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: 27.9} + m_SizeDelta: {x: -20, y: -94.215} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &677115794628638327 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115794628638322} + m_CullTransparentMesh: 0 +--- !u!114 &677115794628638324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677115794628638322} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 6682f39107ec959478d15f6ada28f19a, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u5DF2\u5207\u6362\u81F3\u81EA\u7531\u79FB\u52A8\u89C6\u89D2\uFF0C\u70B9\u51FB\u53F3\u4E0B\u89D2\u6309\u94AE\u53EF\u56DE\u5230\u9884\u7F6E\u89C6\u89D2" +--- !u!1 &3962870374185648546 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1435139407657757270} + - component: {fileID: 4983709588388820001} + - component: {fileID: 8768059054124034680} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1435139407657757270 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3962870374185648546} + 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: 677115794628638325} + - {fileID: 677115793848439996} + m_Father: {fileID: 677115793739368106} + 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: 0, y: -44.938263} + m_SizeDelta: {x: 470, y: 146} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4983709588388820001 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3962870374185648546} + m_CullTransparentMesh: 1 +--- !u!114 &8768059054124034680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3962870374185648546} + 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: 21300000, guid: 003fddd8e0543224fb849ccdbb422cd6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab.meta b/Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab.meta new file mode 100644 index 0000000..53a3fba --- /dev/null +++ b/Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 65734498cc3fc1b4897c7b7f479a1f64 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UIPrefabs/ScoreDataPanel.prefab b/Assets/Resources/UIPrefabs/ScoreDataPanel.prefab index 7300f30..a0f9926 100644 --- a/Assets/Resources/UIPrefabs/ScoreDataPanel.prefab +++ b/Assets/Resources/UIPrefabs/ScoreDataPanel.prefab @@ -1140,7 +1140,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u65E0\u8BBA\u540D\u5B57\u6709\u591A\u957F\uFF0C\u70B9\u51FB\u4E0B\u8F7D\u90FD\u5728\u540E\u8FB9\u865A\u62DF\u5B9E\u8BAD\u6210\u7EE9\u5355" + m_Text: "\u865A\u62DF\u5B9E\u8BAD\u6210\u7EE9\u5355" --- !u!114 &1289845331804632417 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab b/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab index 6f21186..d3660bf 100644 --- a/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab +++ b/Assets/Resources/UIPrefabs/SelectToolsPanel.prefab @@ -692,7 +692,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 20 m_Viewport: {fileID: 3422302203127391312} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 7765589194165323504} diff --git a/Assets/Resources/UIPrefabs/VideoShowPanel.prefab b/Assets/Resources/UIPrefabs/VideoShowPanel.prefab index 5607fc9..6464834 100644 --- a/Assets/Resources/UIPrefabs/VideoShowPanel.prefab +++ b/Assets/Resources/UIPrefabs/VideoShowPanel.prefab @@ -1804,7 +1804,7 @@ MonoBehaviour: m_VideoPath: m_AutoOpen: 1 m_AutoStart: 1 - m_Loop: 1 + m_Loop: 0 m_Volume: 1 m_Balance: 0 m_Muted: 0 diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index e90a8a4..14b2567 100644 Binary files a/Assets/StreamingAssets/Excel/NiuData.xlsx and b/Assets/StreamingAssets/Excel/NiuData.xlsx differ diff --git a/Assets/StreamingAssets/ExcelJson/NiuData.txt b/Assets/StreamingAssets/ExcelJson/NiuData.txt index ee41f8b..25ade02 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -112,7 +112,7 @@ "ToolsName": "注射器|长柄钳|氯前列烯醇|消毒纸巾|阴道栓|保定架|润滑剂|垃圾袋", "ModelBT": "", "Operation": "", - "ProcessDescription": "注射器、孕酮阴道栓（CIDR）、长柄钳、氯前列烯醇、前列腺素（PG）、消毒纸巾、保定架", + "ProcessDescription": "注射器、阴道栓、长柄钳、氯前列烯醇、消毒纸巾、保定架、润滑剂、垃圾袋", "SoundPath": "", "VideoPath": "", "TimelineLength": 0, @@ -1109,8 +1109,8 @@ "CameraNearTR2": "", "QNextNum": 44, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "双筒显微镜|玻璃棒|长柄镊子", @@ -2253,8 +2253,8 @@ "CameraNearTR2": "", "QNextNum": 88, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "注射器|保定架|一次性长臂塑料手套", @@ -2761,7 +2761,7 @@ "TaskName": "操作准备", "ThreeTaskName": "物品准备", "TaskType": "物品展示", - "ToolsName": "消毒纸巾|润滑剂|恒温水浴锅|长柄镊子|输精枪|输精枪外套|保定架|细管专用剪|0.3%高锰酸钾|杯子|液氮罐|垃圾袋", + "ToolsName": "消毒纸巾|润滑剂|恒温水浴锅|长柄镊子|输精枪|输精枪外套|保定架|细管专用剪|0.3%高锰酸钾|杯子|液氮罐|垃圾袋|一次性长臂塑料手套", "ModelBT": "", "Operation": "", "ProcessDescription": "输精枪及外套管、保定架、一次性长臂塑料手套、恒温水浴锅、长柄镊子、细管专用剪、0.3%高锰酸钾、消毒纸巾、液氮罐", @@ -2773,8 +2773,8 @@ "CameraNearTR2": "", "QNextNum": 108, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "冲卵管|长柄钳|玻璃棒", @@ -3709,8 +3709,8 @@ "CameraNearTR2": "", "QNextNum": 144, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "输精枪|开窒器|长柄钳", @@ -4218,7 +4218,7 @@ "ThreeTaskName": "冲胚步骤", "TaskType": "动画", "ToolsName": "", - "ModelBT": "CPzigongjiao2", + "ModelBT": "Cpzigongjiao", "Operation": "点击后，冲卵管出现在另一侧的子宫角（气球膨胀的状态），播放注入液体、抬高子宫角、承接回收液的动画另一侧子宫角", "ProcessDescription": "完成一侧子宫冲卵后，再对另一侧子宫进行冲卵", "SoundPath": "N075", @@ -4437,8 +4437,8 @@ "CameraNearTR2": "", "QNextNum": 172, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "双筒显微镜|注射器|玻璃棒", @@ -4879,8 +4879,8 @@ "CameraNearTR2": "", "QNextNum": 189, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "玻璃棒|输精枪|开窒器", @@ -5685,8 +5685,8 @@ "CameraNearTR2": "", "QNextNum": 220, "ExamModelBT": "", - "ExamTip": "", - "ExamEvvr": "", + "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械", + "ExamEvvr": "物品选择错误，当前模块中，不需要该物品", "Question": "", "OptionsAll": "", "OptionErro": "输精枪|凯苏枪|双筒显微镜", diff --git a/Assets/Third/AVProVideo/Demos/Scripts/VCRCustom.cs b/Assets/Third/AVProVideo/Demos/Scripts/VCRCustom.cs index 29ed9e0..519896a 100644 --- a/Assets/Third/AVProVideo/Demos/Scripts/VCRCustom.cs +++ b/Assets/Third/AVProVideo/Demos/Scripts/VCRCustom.cs @@ -7,6 +7,7 @@ using DG.Tweening; using CG.UTility; using UnityEngine.EventSystems; using ZXK.LouDiXvMuNiu; +using System; /******************************************************************************* *Create By CG *Function Ƶ @@ -50,6 +51,8 @@ public class VCRCustom : MonoBehaviour private float _curMouseTime = 0.0f; private Vector2 _previousPos = Vector2.zero; + private Action _finishHandle; + //private string _videoPath = Application.streamingAssetsPath + @"/AVProVideoSamples/BigBuckBunny_720p30.mp4"; void Start() @@ -105,6 +108,10 @@ public class VCRCustom : MonoBehaviour } } } + public void SetFinishAction(Action finishAnm) + { + _finishHandle = finishAnm; + } void Update() { if (_playingPlayer && _playingPlayer.Info != null && _playingPlayer.Info.GetDurationMs() > 0f) @@ -168,6 +175,7 @@ public class VCRCustom : MonoBehaviour case MediaPlayerEvent.EventType.FirstFrameReady: break; case MediaPlayerEvent.EventType.FinishedPlaying: + _finishHandle?.Invoke(); break; } WDebug.Log("Event: " + et.ToString()); diff --git a/Assets/TimeLine/CSPLCLTimeLineCtrl.playable b/Assets/TimeLine/CSPLCLTimeLineCtrl.playable index c9a8e93..91e5537 100644 --- a/Assets/TimeLine/CSPLCLTimeLineCtrl.playable +++ b/Assets/TimeLine/CSPLCLTimeLineCtrl.playable @@ -5958,7 +5958,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 @@ -5985,7 +6003,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 @@ -15737,7 +15773,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 65.03333 + time: 65 value: {x: -0.3160965, y: 0, z: 2.5212123} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -15831,7 +15867,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 65.03333 + time: 65 value: -0.3160965 inSlope: 0 outSlope: 0 @@ -15888,7 +15924,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 65.03333 + time: 65 value: 0 inSlope: 0 outSlope: 0 @@ -15945,7 +15981,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 65.03333 + time: 65 value: 2.5212123 inSlope: 0 outSlope: 0 diff --git a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable index 796673d..6eeba65 100644 --- a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable +++ b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable @@ -415,7 +415,7 @@ MonoBehaviour: m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -8598380649257887164} - m_Duration: 77.5 + m_Duration: 58.0833333333334 m_TimeScale: 1 m_ParentTrack: {fileID: -2703544339307601112} m_EaseInDuration: 0 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 8b97b3b..68ab7e3 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -4899,7 +4899,7 @@ PrefabInstance: - target: {fileID: 1715186458779637385, guid: e2da9a3a2ae31db439ba7b3d76c3783c, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1835480339342781636, guid: e2da9a3a2ae31db439ba7b3d76c3783c, type: 3} @@ -5164,7 +5164,11 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3997817710294349534, guid: e2da9a3a2ae31db439ba7b3d76c3783c, type: 3} insertIndex: -1 - addedObject: {fileID: 727332781} + addedObject: {fileID: 5008955631677856506} + - targetCorrespondingSourceObject: {fileID: 3997817710294349534, guid: e2da9a3a2ae31db439ba7b3d76c3783c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2156020853053214728} - targetCorrespondingSourceObject: {fileID: 3997817710294349534, guid: e2da9a3a2ae31db439ba7b3d76c3783c, type: 3} insertIndex: -1 @@ -9538,8 +9542,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634965020} serializedVersion: 2 - m_LocalRotation: {x: 0.15814282, y: 0.14558855, z: -0.14558852, w: 0.96571153} - m_LocalPosition: {x: 0.020736786, y: -0.003300048, z: 0.010098539} + m_LocalRotation: {x: 0.15810187, y: 0.14560643, z: -0.1456064, w: 0.9657129} + m_LocalPosition: {x: 0.020736665, y: -0.00329969, z: 0.010098539} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9566,7 +9570,7 @@ MonoBehaviour: point2: {fileID: 69153453} point2Dir: {x: 0, y: 1, z: 0} update: 1 - mesh: {fileID: 978310600} + mesh: {fileID: 1515444381} --- !u!23 &634965023 MeshRenderer: m_ObjectHideFlags: 0 @@ -9616,7 +9620,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 634965020} - m_Mesh: {fileID: 978310600} + m_Mesh: {fileID: 1515444381} --- !u!1 &639665827 GameObject: m_ObjectHideFlags: 0 @@ -11684,112 +11688,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 721118717} m_Mesh: {fileID: 294076861850487778, guid: 0595d13ddbe2e2044bf759a1b17614ac, type: 3} ---- !u!1 &727332780 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 727332781} - - component: {fileID: 727332784} - - component: {fileID: 727332783} - - component: {fileID: 727332782} - m_Layer: 0 - m_Name: Cpzigongjiao - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &727332781 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727332780} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.5685, y: 12.513108, z: -57.733746} - m_LocalScale: {x: 1.0813636, y: 1.0813636, z: 1.0813636} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 309006744} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &727332782 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727332780} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -5114184571931073547, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} ---- !u!23 &727332783 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727332780} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 1816bd974f897444eb79f3512e3d6ce0, type: 2} - 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: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &727332784 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 727332780} - m_Mesh: {fileID: -5114184571931073547, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} --- !u!1 &731547136 GameObject: m_ObjectHideFlags: 0 @@ -11825,6 +11723,171 @@ Transform: - {fileID: 1481737972} m_Father: {fileID: 449924220} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &738974946 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pipe + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 498 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 90 + localAABB: + m_Center: {x: 0.000016444828, y: -0.000014675432, z: 0.0000068829395} + m_Extent: {x: 0.0020030735, y: 0.0010540151, z: 0.012702951} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000600060001000700010002000700070002000800020003000800080003000900030004000900090004000a00040005000a000a0005000b00050006000b000b0006000c00060007000c000c0007000d00070008000d000d0008000e00080009000e000e0009000f0009000a000f000f000a0010000a000b00100010000b0011000b000c00110011000c0012000c000d00120012000d0013000d000e00130013000e0014000e000f00140014000f0015000f0010001500150010001600100011001600160011001700110012001700170012001800120013001800180013001900130014001900190014001a00140015001a001a0015001b00150016001b001b0016001c00160017001c001c0017001d00170018001d001d0018001e00180019001e001e0019001f0019001a001f001f001a0020001a001b00200020001b0021001b001c00210021001c0022001c001d00220022001d0023001d001e00230023001e0024001e001f00240024001f0025001f0020002500250020002600200021002600260021002700210022002700270022002800220023002800280023002900230024002900290024002a00240025002a002a0025002b00250026002b002b0026002c00260027002c002c0027002d00270028002d002d0028002e00280029002e002e0029002f0029002a002f002f002a0030002a002b00300030002b0031002b002c00310031002c0032002c002d00320032002d0033002d002e00330033002e0034002e002f00340034002f0035002f0030003500350030003600300031003600360031003700310032003700370032003800320033003800380033003900330034003900390034003a00340035003a003a0035003b00350036003b003b0036003c00360037003c003c0037003d00370038003d003d0038003e00380039003e003e0039003f0039003a003f003f003a0040003a003b00400040003b0041003b003c00410041003c0042003c003d00420042003d0043003d003e00430043003e0044003e003f00440044003f0045003f0040004500450040004600400041004600460041004700410042004700470042004800420043004800480043004900430044004900490044004a00440045004a004a0045004b00450046004b004b0046004c00460047004c004c0047004d00470048004d004d0048004e00480049004e004e0049004f0049004a004f004f004a0050004a004b00500050004b0051004b004c00510051004c0052004c004d00520052004d0053004d004e00530053004e0054004e004f00540054004f0055004f0050005500550050005600500051005600560051005700510052005700570052005800520053005800580053005900 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 90 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 2160 + _typelessdata: 29abbdbae67057ba2c0350bcfacc593fb0ede63ebd158abe3f18d3baea8505ba20e64fbc7a371a3f0cda423f5a1f76becacdfeba319713ba1a3c4ebca11809bfe7f3573f54fc233d193202bbd63c6ebac7514dbcaa236fbff1ac75be3c4b873e0622dcba4e138cba186b4ebcadd524bd54e27dbf4782f93d29abbdbae67057ba2c0350bc3cc4363f654b31bf3984d3bd81a156baa9090cba3fa827bcc0c4583f72bcf03ebdd67ebe72f181ba38f76db9298c27bc4185cb3e0a96663f465f33be780faeba256999b9b13326bc604d39bfccb92e3f8412cf3d7db4b2ba0af727baa47b25bcf52458bf6fe0f5be606f733ea37389ba221e4fba9d6126bc158f513ef1507abf549b383d81a156baa9090cba3fa827bc03a93b3f7e822cbf5652bdbd9ef5acb92f80a1b9f2d4fdbb354b583f2508003fd15a42be240f06bad05abdb6f0a2fdbb0fd7c23e717b6a3f0f7102be9ac85ebac83baeb86b9afbbb354b3fbf07d1283fd481a83d5b0266bab22ce3b9768afabb887857bfb27c02bfbe7d363e9fc511ba1cfd15ba3cebfbbb40fc6a3eeb1179bfaf02e03c9ef5acb92f80a1b9f2d4fdbbec82413f0a9026bf79da94bd6816a537a76216b91e96abbb3db9563f1e5f073fdaec04be800833b981bb20398e6fabbb5559b83e56ee6d3f18a4a5bde69805bab1f687389311aabbf0e144bfc7e7223fbb53753d65930abadd3d96b93760a9bbd0c155bfd39709bf569af13d1b6053b9bcced9b9fd4faabb3ec9823e617c77bfee5c4f3c6816a537a76216b91e96abbbe300473f598a20bfb0a44abd7e85703955a22bb8c51f31bbb51a543fab390e3fae0b8fbdfcb5fe37aa2a8339bbf530bb238cac3e1ed7703f58c516bd8635a1b9488b1e39e1942fbbb4104abf7cef1c3f7f4a0c3d4f55a6b994e952b970e82ebb9cff52bf843410bfcd986d3d275e7237e1a9a7b93cdb2fbb207d903e2c9875bfa38eb93a7e85703955a22bb8c51f31bb55024c3f0f891abfa091bdbcb2209d39d0962ab2722719b96e2a513f2967133fb0d0f3bcda1bc238089b9539143c19b9c739b53d31f87e3f532c6abc73c07eb95bf33839d51119b9eb836bbfac64c83ee0dcac3c62da7eb947a938b95de118b973b927bf564441bf53b0e73c8e8bc1381d9795b927d918b95d07043f7b535bbf1f9d2dbbb2209d39d0962ab2722719b9890c4f3fb58416bfe6a353bc0a259d394caa9931e30819b96d234f3f826e163f726aa8381cf0c1387f9f95397b1519b9e730063fce025a3fd67df0b773c07eb95bf33839d51119b993d625bfb705433fca6117393fcc7eb9eef038b9d4fd18b96ac36cbfb6b8c2be8d46fab968f4c1381d9e95b9cc0719b9adc89c3dab3f7fbfeaa90cba0a259d394caa9931e30819b90b244f3faa6d16bf5d107eb809259d3964009a3194f404346d234f3f846e163fc3b19a311bf0c138809f9539422da53308429e3eb976733f046591b373c07eb95cf33839bc5dc233901c4fbff677163ff9d35fb33fcc7eb9edf038b9eb323134781e4fbf557516bf7ed2c1b267f4c1381d9e95b9925209340b3f9e3e367773bf2bcced3309259d3964009a3194f404340a244f3fa96d16bfbe63d33309259d397c569a315e4b19396b234f3f836e163f36eff8381af0c138809f9539c63e1939fee39b3dde417f3f18c2013974c07eb95cf338396c421939ddbb6cbf6dddc23e6542233940cc7eb9ecf038b96d56193976e625bf30f842bf5ad3043a66f4c1381c9e95b9754c19398021063f3a0c5abfb425953a09259d397c569a315e4b193902244f3f996d16bfba1db93ab1209d39b8402ab2d02c193957184f3f5f53163ffbdde1bcd81bc238099b95392d181939b56b083f5888583ff5ddc7bc74c07eb95cf338396c4219390af523bff497443f775f0f3c63da7eb946a938b9e5721939f2906dbf4b1cbebe0798fd3c8c8bc1381c9795b91a7b1939b8d7843d92717fbf87f63d3cb1209d39b8402ab2d02c193907db4c3f387b19bfe8c06cbccf72c1391ac8c13754152f3bf7ab513ffa59123f313247bde036323976bba4395e3f2f3b316daa3eae19713f60e540bdeb0a30b9e0ac613938a0303b4ee64abfa8001c3f7908b23c7e4a3ab9fcc70fb9a84c313bf1d552bf7a5f10bfce42783d03862139151986b9dd59303b82f88f3e19a375bfec17823ccf72c1391ac8c13754152f3bfddf483f05791ebf8a6c07bd69e2163a82f3e0389788a93b95a8543f73cc0b3faacdddbd2cefc939f5cbd33927afa93b398ab63e480a6e3f275dbabd000d4238e06ba539210dab3b14cc45bfbb11223f7535413d1fcae437497d16b87ebeab3be5b455bf528b09bff231f63d5fc3b93910c12cb9b8ceaa3b4436823eb77b77bf2e8fe03c69e2163a82f3e0389788a93b28a6433f396f24bfa8a36cbdc007713a3496843940cbfa3b1eb2563f469b043f08622cbe6b73413a7c90113a43fdfa3b2f16c13ee67d6a3f4d3a0cbeea73d1397187fa39c705fd3bad4140bf1718283f569d8e3d6700c33961d30539bc15fe3bd68657bf9b3b02bf2055383ef0bc353aa77a3cb7f7b4fc3b08d5693ea80079bf369b2c3dc007713a3496843940cbfa3b7df83d3f03652abf6d8ca2bd039ab73a03bdf039fea7253cc899573fd836fa3ec84169be52f9a03a5cea483a14c4253cd4f3c93ebd75663fc5ce3cbe98b6693a98b3373a8c1c273c2c503abfa4192e3f031db53d8d6c603a41e2b83998d4273ccd4b58bf57fdf4be00da743e2177993a21285539a0ee263ccc25503e622f7abf2595753d039ab73a03bdf039fea7253c7ffa373fd14130bf5f6ac7bde559043bec893e3a858b4d3c8030583f0f80ed3efd0f89beb346f33a743a883a90a84d3c2d903f3ef62e783ff95a22be2891c73ad031813a96524f3cd5d258bfa004023f67f0203ec0fac13afcbd273ae93c503c314e36bf887a27bfb168823eec3cea3a6ca8fb3998234f3c93c0cf3e62fa69bfa6c8fbb9e559043bec893e3a858b4d3c4c38343fa9f133bf3325d0bd + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.000016444828, y: -0.000014675432, z: 0.0000068829395} + m_Extent: {x: 0.0020030735, y: 0.0010540151, z: 0.012702951} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &744342329 GameObject: m_ObjectHideFlags: 0 @@ -14325,7 +14388,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -15909,171 +15972,6 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 7891914750378746152} m_SourcePrefab: {fileID: 100100000, guid: 53a2512e28262e146b0c0824d3fd221c, type: 3} ---- !u!43 &978310600 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Pipe - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 498 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 90 - localAABB: - m_Center: {x: 0.001561543, y: -0.00019223214, z: -0.0015342054} - m_Extent: {x: 0.0031377785, y: 0.0020984523, z: 0.009615889} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000600060001000700010002000700070002000800020003000800080003000900030004000900090004000a00040005000a000a0005000b00050006000b000b0006000c00060007000c000c0007000d00070008000d000d0008000e00080009000e000e0009000f0009000a000f000f000a0010000a000b00100010000b0011000b000c00110011000c0012000c000d00120012000d0013000d000e00130013000e0014000e000f00140014000f0015000f0010001500150010001600100011001600160011001700110012001700170012001800120013001800180013001900130014001900190014001a00140015001a001a0015001b00150016001b001b0016001c00160017001c001c0017001d00170018001d001d0018001e00180019001e001e0019001f0019001a001f001f001a0020001a001b00200020001b0021001b001c00210021001c0022001c001d00220022001d0023001d001e00230023001e0024001e001f00240024001f0025001f0020002500250020002600200021002600260021002700210022002700270022002800220023002800280023002900230024002900290024002a00240025002a002a0025002b00250026002b002b0026002c00260027002c002c0027002d00270028002d002d0028002e00280029002e002e0029002f0029002a002f002f002a0030002a002b00300030002b0031002b002c00310031002c0032002c002d00320032002d0033002d002e00330033002e0034002e002f00340034002f0035002f0030003500350030003600300031003600360031003700310032003700370032003800320033003800380033003900330034003900390034003a00340035003a003a0035003b00350036003b003b0036003c00360037003c003c0037003d00370038003d003d0038003e00380039003e003e0039003f0039003a003f003f003a0040003a003b00400040003b0041003b003c00410041003c0042003c003d00420042003d0043003d003e00430043003e0044003e003f00440044003f0045003f0040004500450040004600400041004600460041004700410042004700470042004800420043004800480043004900430044004900490044004a00440045004a004a0045004b00450046004b004b0046004c00460047004c004c0047004d00470048004d004d0048004e00480049004e004e0049004f0049004a004f004f004a0050004a004b00500050004b0051004b004c00510051004c0052004c004d00520052004d0053004d004e00530053004e0054004e004f00540054004f0055004f0050005500550050005600500051005600560051005700510052005700570052005800520053005800580053005900 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 90 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 2160 - _typelessdata: 447486ba70ca0cbbd5b334bcc696703f4e9d103e6d529fbed3fd91ba00b8efbae3ae36bcbc46423f83d2013fa62dd1be3293beba1182e8ba637435bce6a6adbe3eda653fa2bc8fbeb199ceba3bf506bb73b632bc1bbe78bf6aff483d8ed26c3ef0eaabba4f1f16bb074032bc7f5c85bef78f5ebfa1fed63e447486ba70ca0cbbd5b334bc54ab0d3fd7d04fbf81ee3e3e52e60fba7df6b6badb8217bc16906e3f45e14e3ed6419abe2aea2cba78d98cbadc0e19bc1aae103ff4053a3f82fdc7be83c583ba453a8abaa5f717bc634c14bff1674d3f751313bec04591ba87b4b2bad4bf15bc53d16cbfe6b06bbe2bae9a3ef69a58ba2b5bceba3a7715bc93d54b3c3db771bfde83a83e52e60fba7df6b6badb8217bc298e1a3fa7f148bf108f0e3e50363ab91be152ba36f2f2bb596c6b3fae6b9b3ede477fbec6a4a3b99aaffeb9b42ff5bbbdc5033f79f34d3f2fbd97be80142dbaad3003bab866f3bbeb5223bfccff433ff3dfa8bd333542baed1d59baa70ff0bb7a4269bffc5aa9be0f937b3e4b0ae8b9073085ba9ac7efbb53c2a33d0a1a78bf4dbf6e3e50363ab91be152ba36f2f2bb32a6293f70913ebfb09ba73d1015b8385832c4b9e22db5bb33e1653f5c1acd3ef5863abebf6295b811e282b8469cb6bb03d9e83e6b675e3f8fb748be565bdbb9666ce8b81554b5bb1a6c32bff25b373f25ec0fbdaf7af8b96529edb9821cb3bb924663bf070cdabeeeb0323ec9d928b98d4621ba1706b3bb37fa1c3e46587abf0d83113e1015b8385832c4b9e22db5bbe48c383f232331bfb1a41f3d797f81396055ddb8706c6bbbd7bc5d3f9f5efa3ed33bd3bd092a8538a6714c390ec66cbb60ddc53e20dd6a3f9de3c1bdb86e92b96a2ef138156b6bbb95ea40bfc047283fe0da82bb3f54a1b98a6576b9b93a69bb2ec35abf74d902bf96e1bc3def459337d3a5c2b9993b69bbe5e26b3ea3a178bfd446783d797f81396055ddb8706c6bbbae88463f099621bffbb44c3cca559d39fd9ad7346744d2ba30f2543feea20d3f1acd35bd02bbc23846c995394046d2ba56b4de3dac447e3fa7d026bda5627eb971603939d53fd2ba8e4569bf9ed8d23eff97203c53707eb9616e38b97c3fd2bad08f2bbfb1903dbf15224f3d2798c238735895b9b942d2baa0d0ff3ee2a95dbfa1b5cc3cca559d39fd9ad7346744d2ba9f144f3fa07d16bf644b1f3cca559d39fd9ad7346744d2ba571c4f3f4378163f7b8088371f91c238b1d19539fd3ed2ba1a32063f0f025a3fcceb6ab74a717eb9345b39394e40d2ba88dd25bfc9ff423f50cc5cb753707eb9616e38b97c3fd2ba97b36cbf9805c3be0d28c0332798c238735895b9b942d2ba978a9c3d45407fbfcd965e32ca559d39fd9ad7346744d2ba12174f3f837f16bfcfc486b3cf559d393ba0d734ebdd8533591c4f3f4378163f86a06bb73391c238b3d195399a3d703446369e3ea378733fa25d62b740717eb9375b39399b254634491a4fbf177b163ff9918d374a707eb95e6e38b9a665603438194fbf8e7c16bf6f69e6373b98c238725895b9968bf133862d9e3e0e7a73bfac545f37cf559d393ba0d734ebdd853312174f3f857f16bf7df1c0b6895c9d39da0ff034ef3fd23ac61d4f3f4876163f695552b800d6c23864cf9539173ed23a77ba9c3dd03f7f3fbd7602b826557eb9ab6c39398144d23aaab06cbfd313c33e40002e37d5627eb9266238b9db44d23aaadd25bfaeff42bf539a2f3824b3c238565295b99e41d23afb29063f0e075abf78c70237895c9d39da0ff034ef3fd23a12174f3f847f16bfcc2810b7895c9d39da0ff034ef3fd23a5d8d4e3f1813163f08a095bd1dacc238cfd795395a45d23a9cfd183fe1614c3fc14e97bd26557eb9ab6c39398144d23a536513bf7609513fc0da2a3dd5627eb9266238b9db44d23aa15772bf51e699bea5fbed3d24b3c238565295b99e41d23a2a4254bc30a77fbf05764e3d895c9d39da0ff034ef3fd23a4837393f785130bff4483fbd1de1f73939821fb727cf603ba223623f124bdf3e90d22fbedccfb0394a2da3398b2d5d3b0aa3fe3e9069583f07ab47be3fc033b715d6993929be603bf74225bfe940433f0d86203d754ebdb8f1ff20b8be93663b982e67bf33fabbbeec47643ee6ab5a39e0946cb9ae9f663b70caa53db2a47dbfa537de3d1de1f73939821fb727cf603b2e5d073f69c458bf3fc46fbd5657813ab908da382eeba23b92e6663fcf2fbb3d4c16d8bef194733ac804df39a78e9e3b2560293f63dd143fa361f2be7aa21d3ad9db083aba68a13b50f8bfbed71e6d3ffb631dbda843ef3931878839e886a73baa5965bfa950823c4d50e33e7719363a38c800367975a83bf7d334befd986dbf53cea73e5657813ab908da382eeba23b32f96e3e665478bf8f5b8a3d79d1f13a7ae5bd39e956cc3bf047413fbb0aabbe287210bfdeb0f23a3ab7273a0636c53b7fc22a3f8d011b3ee8bf3abf2d1dcf3a65a05e3a84e8c73b7baffabd2f67723f5e3f98be0940b83af3d3373a5ab4d03b45533bbfa07ce13e712b053f1eb4cd3a2ad9d1398b70d33b8634aebe091a2fbf4231253f79d1f13a7ae5bd39e956cc3bccfa283ca7e86ebf90ddb73e9cb0483b65384d3a916dec3bbd8d0c3f55202bbf437000bf4b614b3b03d9803aa701e33befff083f6cc585be50a74dbf54b83e3be322a73a7863e43b0e8494bb8b0a4b3fc9e91bbff835343b2291a43a5fa7ee3b46e708bfdd703c3f9472d43e0e5f3a3b3d65793a3fa0f33bc30badbe1b45a6be4d23623f9cb0483b65384d3a916dec3b15ac61bdfd1b3fbf68bf293f4586983bdd33b33a1859013cf9e3db3e0b0954bfae45b8bec4fc993b1b06c23a8ad8f73be1edcc3e53b760be1ac663bff73b963ba4afed3a4643f73b9366adbd23964f3f893c14bf5573923b23daf93adfe0003c9b4befbe1827373f07f3043ff0dd933b03b4d53a0a69043c3cc566be08c3b9be9d79673f4586983bdd33b33a1859013c111edebd6f231dbf782e483f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0.001561543, y: -0.00019223214, z: -0.0015342054} - m_Extent: {x: 0.0031377785, y: 0.0020984523, z: 0.009615889} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &979919939 GameObject: m_ObjectHideFlags: 0 @@ -21278,12 +21176,12 @@ PrefabInstance: - target: {fileID: 1864053738704218958, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2457238190680765860, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3004285562551405471, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} @@ -21433,7 +21331,7 @@ PrefabInstance: - target: {fileID: 7413279291709982886, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -21451,10 +21349,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1344588681} - - targetCorrespondingSourceObject: {fileID: 5952291966950323134, guid: 75d184e5e77f85248908f8b7da22fc30, + - targetCorrespondingSourceObject: {fileID: -8103856825450505212, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} insertIndex: -1 - addedObject: {fileID: 1344588680} + addedObject: {fileID: 1344588682} m_SourcePrefab: {fileID: 100100000, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} --- !u!1 &1344588674 stripped GameObject: @@ -21502,39 +21400,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _isShort: 0 ---- !u!1 &1344588678 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5952291966950323134, guid: 75d184e5e77f85248908f8b7da22fc30, - type: 3} - m_PrefabInstance: {fileID: 1344588673} - m_PrefabAsset: {fileID: 0} --- !u!1 &1344588679 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8103856825450505212, guid: 75d184e5e77f85248908f8b7da22fc30, type: 3} m_PrefabInstance: {fileID: 1344588673} m_PrefabAsset: {fileID: 0} ---- !u!65 &1344588680 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1344588678} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.8758045, y: 0.30210927, z: 1.076504} - m_Center: {x: 0.28519654, y: 0.09029544, z: -0.11454058} --- !u!65 &1344588681 BoxCollider: m_ObjectHideFlags: 0 @@ -21556,6 +21427,27 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3.705035, y: 0.4001193, z: 1.3028369} m_Center: {x: 1.8258448, y: -0.10160032, z: 0.05667388} +--- !u!65 &1344588682 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1344588679} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.5016387, y: 0.30210924, z: 0.9069847} + m_Center: {x: 1.528918, y: 0.09029543, z: 1.6290303} --- !u!1 &1357119568 GameObject: m_ObjectHideFlags: 0 @@ -23053,6 +22945,171 @@ Transform: - {fileID: 946627456} m_Father: {fileID: 907206932} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1515444381 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pipe + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 498 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 90 + localAABB: + m_Center: {x: 0.0015616987, y: -0.0001923698, z: -0.0015343409} + m_Extent: {x: 0.0031376148, y: 0.0020980046, z: 0.009616053} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000600060001000700010002000700070002000800020003000800080003000900030004000900090004000a00040005000a000a0005000b00050006000b000b0006000c00060007000c000c0007000d00070008000d000d0008000e00080009000e000e0009000f0009000a000f000f000a0010000a000b00100010000b0011000b000c00110011000c0012000c000d00120012000d0013000d000e00130013000e0014000e000f00140014000f0015000f0010001500150010001600100011001600160011001700110012001700170012001800120013001800180013001900130014001900190014001a00140015001a001a0015001b00150016001b001b0016001c00160017001c001c0017001d00170018001d001d0018001e00180019001e001e0019001f0019001a001f001f001a0020001a001b00200020001b0021001b001c00210021001c0022001c001d00220022001d0023001d001e00230023001e0024001e001f00240024001f0025001f0020002500250020002600200021002600260021002700210022002700270022002800220023002800280023002900230024002900290024002a00240025002a002a0025002b00250026002b002b0026002c00260027002c002c0027002d00270028002d002d0028002e00280029002e002e0029002f0029002a002f002f002a0030002a002b00300030002b0031002b002c00310031002c0032002c002d00320032002d0033002d002e00330033002e0034002e002f00340034002f0035002f0030003500350030003600300031003600360031003700310032003700370032003800320033003800380033003900330034003900390034003a00340035003a003a0035003b00350036003b003b0036003c00360037003c003c0037003d00370038003d003d0038003e00380039003e003e0039003f0039003a003f003f003a0040003a003b00400040003b0041003b003c00410041003c0042003c003d00420042003d0043003d003e00430043003e0044003e003f00440044003f0045003f0040004500450040004600400041004600460041004700410042004700470042004800420043004800480043004900430044004900490044004a00440045004a004a0045004b00450046004b004b0046004c00460047004c004c0047004d00470048004d004d0048004e00480049004e004e0049004f0049004a004f004f004a0050004a004b00500050004b0051004b004c00510051004c0052004c004d00520052004d0053004d004e00530053004e0054004e004f00540054004f0055004f0050005500550050005600500051005600560051005700510052005700570052005800520053005800580053005900 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 90 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 2160 + _typelessdata: 536986bac9c40cbb3eb534bce698703fc28e103edd489fbe8bf191bae0abefba24b036bc9449423f7fd2013f1723d1bee188beba6377e8bab37535bcdda9adbe3cdc653f4cac8fbef98eceba38f006bbdfb732bcfebd78bf8700493d78d46c3ed5dfabba1b1a16bb814132bccc5c85be6c935ebf27f0d63e536986bac9c40cbb3eb534bc0aad0d3f45d14fbfadd23e3e27d30fbabdf2b6bacf8317bc5e946e3f3dbb4e3e17349abeafd02cba59d48cba980f19bcb5b1103fd5053a3f80f3c7bed8b883baed358aba65f817bcef4d14bffe664d3fb60f13be743a91ba62b1b2bac0c015bc63d46cbfaba56bbeae9f9a3e508758ba3c58ceba427815bc8bb04c3cb0b871bf4b7ba83e27d30fbabdf2b6bacf8317bc22931a3fe2ed48bfb18d0e3e59263ab930d652ba9af4f2bb7c726b3feb509b3e582e7fbe3690a3b9ba94feb9aa31f5bb3fc8033ffef14d3f82bc97bee40d2dba0c2603badb68f3bbe74f23bfe901443f1dfea8bd3a3142ba6e1559ba2312f0bb914169bf4260a9be66927b3e6af2e7b9fa2985baefc9efbbfed8a33dae1978bf6bc16e3e59263ab930d652ba9af4f2bb1ead293fa08b3ebff581a73d2070b838e726c4b9992fb5bb3ae8653f7bfccc3ebc7f3abe64d594b8e8a182b8919db6bb5fe4e83e6d655e3f43a648be833bdbb977fde7b8ce55b5bbb86b32bf995c373f77910fbd335cf8b9e81fedb93c1eb3bb0a4863bf6308dabecda4323e33a928b90b4221ba0008b3bb4b021d3e18597abfa963113e2070b838e726c4b9992fb5bbb68c383fa12331bf764f1f3d269b813969a5ddb8896e6bbb4ebb5d3f2966fa3eeb13d3bd487385384a424c390ac86cbbaad3c53e02e06a3f6da2c1bd386392b9d2baf038816d6bbbcfec40bf3945283f49db80bb6446a1b972a076b99f3d69bb7ac15abff3dc02bf61c4bc3dc732943706c1c2b9963e69bb93f06b3e33a178bfc7e6773d269b813969a5ddb8896e6bbbd784463fd09a21bfc9e74b3c4e6c9d39df04d1334c48d2ba79ed543f3baa0d3f84a135bd250dc338009f95397f49d2ba3183de3d8d457e3f3d8026bd11387eb93a0739398f43d2bafc4869bf20c9d23e563a223c35327eb95bc238b9ae43d2ba24902bbf60903dbf22254f3ddbdcc238598595b9f647d2bae3d4ff3ec4a85dbfbc3bcc3c4e6c9d39df04d1334c48d2ba04134f3fdc7f16bfaad61e3c4e6c9d39df04d1334c48d2ba381d4f3f0e77163fb5d112b4250dc338009f95397f49d2ba4932063ff3015a3f50ab3db411387eb93a0739398f43d2ba5dd725bf0b05433f7fc0f6b335327eb95bc238b9ae43d2ba95b56cbff2fbc2befa9fe633dbdcc238598595b9f647d2ba6b8a9c3d47407fbfca2e3e344e6c9d39df04d1334c48d2ba7f154f3fae8116bf6cfa9f33506c9d3900a6d133cc7baeb3391d4f3f0f77163f2fd392372e0dc3380a9f95396c4afbb3db3c9e3e9177733f5c55d5370d387eb94e07393986bb8033341a4fbf347b163fd59efd3630327eb947c238b9ea2172337b1d4fbfb27616bf6754b4b7e4dcc2384f8595b9fbfc98b3b8339e3e0c7973bf709201b8506c9d3900a6d133cc7baeb3e0174f3f697e16bfe906eab727689d39e03682b1a43ad23ac81b4f3f0879163ff8ca7f38a4d2c238d8999539b440d23ab8cf9c3d9c3f7f3f884b873860407eb915ec3839613fd23afdb76cbf49f0c23ee65be337833a7eb980dd38b9433fd23acbdd25bf91ff42bf2d5e34b8d006c338af8d95b9eb3bd23ae02c063f49055abf455237b827689d39e03682b1a43ad23aa31c4f3fdd7716bf612ca13727689d39e03682b1a43ad23af58f4e3fd50f163fc68c95bd88fcc2386e9195397139d23a48ff183f2b614c3f282097bd60407eb915ec3839613fd23a756113bf1d0c513fc9f32a3d833a7eb980dd38b9433fd23a7e5872bfc1e499be52d3ed3d3eccc238eb9295b9fa3ad23a426953bc84a77fbfaa1a4e3d27689d39e03682b1a43ad23a433b393f104d30bf327f3fbd6ae1f73989af29b74ecc603bf726623fc33edf3e80cc2fbe61d5b03924dea239512b5d3bd5a0fe3ec06a583fb0a147bea60f33b7f0839939d0bb603b9d4725bfea3c433f8099203df52fbdb81b9d23b8ee90663ba42d67bf51ffbbbe7446643e64cc5a39cc326db9f19c663b33d9a53da9a47dbf802fde3d6ae1f73989af29b74ecc603bcc62073fc7c058bf87df6fbde95a813a17e9d838e8e9a23b8ee5663f5d68bb3d8e17d8be7597733a46bbde39788d9e3b575f293fb7de143fa360f2bee1ab1d3a1db8083acc67a13bf400c0be3a1d6d3f952f1dbddd57ef39b83c8839c885a73be25965bfc84f823c734fe33e1d1d363aec34b335f973a83bafd334be70996dbfd8cba73ee95a813a17e9d838e8e9a23be40a6f3e9a5378bfa33c8a3d10d2f13a6e93bd39cf55cc3b7a49413f5afdaabe0b7410bf19b1f23a638f273a1c35c53baec32a3f02ff1a3ef5be3abfd41ecf3a7c785e3ad2e7c73b07bffabdd067723fc63998becb41b83a00aa373a89b3d03bb8543bbf1277e13ec02b053f5ab6cd3a8485d1398c6fd33b3032aebe421d2fbf742e253f10d2f13a6e93bd39cf55cc3bf189293cf0e96ebfb1d6b73e03b3483b4e124d3a456dec3b75900c3f051b2bbf5d7400bfb0624b3b26c6803a6101e33b5f01093fc9b685bebca84dbf75b93e3b940fa73a5d63e43b3fae95bb250e4b3f14e51bbf0737343bb67ca43a3ba7ee3b40ea08bf7f6c3c3f627ad43e56603a3be93b793ae99ff33b000aadbe7753a6be0021623f03b3483b4e124d3a456dec3bdb8261bd8d203fbf7eba293f3586983b7620b33a2259013caeeadb3e910554bfad4db8beb3fc993baaf3c13ab3d8f73b9af1cc3eff9e60bec3c663bfc33b963b0d9ded3aa443f73be076adbde9984f3f5b3814bf0b73923b7ec6f93a14e1003cd951efbebc22373f36f6043fbcdd933bde9fd53a2869043c0fc566be71ceb9be5577673f3586983b7620b33a2259013cd417debd01281dbffe2a483f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.0015616987, y: -0.0001923698, z: -0.0015343409} + m_Extent: {x: 0.0031376148, y: 0.0020980046, z: 0.009616053} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1515605965 PrefabInstance: m_ObjectHideFlags: 0 @@ -28943,171 +29000,6 @@ SkinnedMeshRenderer: m_Center: {x: -0.21328266, y: -0.016517308, z: 0.0030167494} m_Extent: {x: 0.21455412, y: 0.026834693, z: 0.030527467} m_DirtyAABB: 0 ---- !u!43 &2017986186 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Pipe - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 498 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 90 - localAABB: - m_Center: {x: 0.000016392092, y: -0.0000147196115, z: 0.000006927643} - m_Extent: {x: 0.0020015286, y: 0.0010535051, z: 0.01270318} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000600060001000700010002000700070002000800020003000800080003000900030004000900090004000a00040005000a000a0005000b00050006000b000b0006000c00060007000c000c0007000d00070008000d000d0008000e00080009000e000e0009000f0009000a000f000f000a0010000a000b00100010000b0011000b000c00110011000c0012000c000d00120012000d0013000d000e00130013000e0014000e000f00140014000f0015000f0010001500150010001600100011001600160011001700110012001700170012001800120013001800180013001900130014001900190014001a00140015001a001a0015001b00150016001b001b0016001c00160017001c001c0017001d00170018001d001d0018001e00180019001e001e0019001f0019001a001f001f001a0020001a001b00200020001b0021001b001c00210021001c0022001c001d00220022001d0023001d001e00230023001e0024001e001f00240024001f0025001f0020002500250020002600200021002600260021002700210022002700270022002800220023002800280023002900230024002900290024002a00240025002a002a0025002b00250026002b002b0026002c00260027002c002c0027002d00270028002d002d0028002e00280029002e002e0029002f0029002a002f002f002a0030002a002b00300030002b0031002b002c00310031002c0032002c002d00320032002d0033002d002e00330033002e0034002e002f00340034002f0035002f0030003500350030003600300031003600360031003700310032003700370032003800320033003800380033003900330034003900390034003a00340035003a003a0035003b00350036003b003b0036003c00360037003c003c0037003d00370038003d003d0038003e00380039003e003e0039003f0039003a003f003f003a0040003a003b00400040003b0041003b003c00410041003c0042003c003d00420042003d0043003d003e00430043003e0044003e003f00440044003f0045003f0040004500450040004600400041004600460041004700410042004700470042004800420043004800480043004900430044004900490044004a00440045004a004a0045004b00450046004b004b0046004c00460047004c004c0047004d00470048004d004d0048004e00480049004e004e0049004f0049004a004f004f004a0050004a004b00500050004b0051004b004c00510051004c0052004c004d00520052004d0053004d004e00530053004e0054004e004f00540054004f0055004f0050005500550050005600500051005600560051005700510052005700570052005800520053005800580053005900 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 90 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 2160 - _typelessdata: a378bdba835057baf20350bcaace593f33f6e63ee2fc89be4be6d2ba1d6605baeae64fbc42371a3f55dd423fcaf775be1f9cfebae37813ba0e3d4ebc951c09bfa2f1573f9baa233d111902bbde1e6ebad3524dbc12266fbfc0c075be4131873e70efdbbaad038cba076c4ebc3eb524bdc2e27dbfa46bf93da378bdba835057baf20350bc8fc8363f184831bfea45d3bd206056ba32ed0bbaa8a827bcc6c5583f94c2f03ea6b17ebe3bd081baf9836db91c8c27bcd980cb3ee997663fe34c33befdeeadba5f3399b90d3426bc595139bf1bb62e3f0df6ce3d0793b2baf0db27bada7b25bc042558bf1be7f5be8453733ecb5289bab9024fba2f6226bc279e513e2f507abff791383d206056ba32ed0bbaa8a827bc93ab3b3fe97f2cbf0046bdbd017dacb95a5aa1b933d6fdbb614a583fa70b003f924442be03d505ba6a76b4b6b6a4fdbba6d3c23e077d6a3fb45702be958d5ebaafb4adb8109cfbbbe74c3fbf57cf283f0c73a83d73c765ba4c0ce3b9c18cfabbc67857bfeb7e02bfe95f363eeb8911baa8eb15ba48edfbbb5a066b3e681179bfa7a5df3c017dacb95a5aa1b933d6fdbb3a85413fc08d26bf2bbf94bd158aa937712a16b9c595abbb7db7563ff863073f21cb04bea38232b916ef2039bc6fabbb8c51b83e49f06d3f637ba5bd867805ba794f88389612aabb6de444bf22e5223f6115753df5710abaf22796b96361a9bb7bbf55bf029d09bf0261f13d60d352b964b5d9b96f50aabbccd0823e657b77bf65324f3c158aa937712a16b9c595abbbe702473f0f8820bf2c774abd15dd7039bf5f2bb8012131bbdc18543f573d0e3f34d28ebde4a800389731833918f730bbc584ac3eacd8703f6f6416bd960da1b93c921e39e8972fbb33134abf75ec1c3ffe150c3dbf26a6b90adf52b9dee92ebba7fd52bf383810bf5d176d3d200c78372da3a7b919dd2fbb3782903e6c9775bf205bb63a15dd7039bf5f2bb8012131bbff034c3f0c871abf31f9bcbc431b9d39b6751fb3e01119b9eb27513f3c6b133f9c99f2bc86f5c138fb949539283819b98c0db53dbbf87e3f1a3969bc1ed27eb998e23839501919b9d2856bbf8d5cc83e7cdfab3c2ce77eb90dba38b985ed18b916b927bff84441bf4b9de63c586cc138249e95b915ec18b9480a043fbd515bbf75f629bb431b9d39b6751fb3e01119b9e80c4f3f698416bfcd5951bc431b9d39b6751fb3e01119b952234f3fa66e163ff54ba639c6c9c138729995398f1119b92b2a063ff2065a3f29ee0cb8c7cd7eb986e43839090a19b967dc25bfc100433f7c86403907d97eb9b30139b9fd0919b95ec16cbf9bc2c2bedfef00bac7a0c138a4a195b9670319b9b1a39c3d07407fbfa8cd7fb9431b9d39b6751fb3e01119b9bb1b4f3f1c7916bf98c28133431b9d39eb711fb309251e3453234f3fa86e163fecd79033c4c9c13872999539546a1f34c2409e3eef76733f0a3e3833c8cd7eb987e43839bd813d348c1e4fbf3a75163f6414f4b308d97eb9b30139b964b13d341f234fbfee6e16bf13ebbdb3c4a0c138a4a195b9a209583413459e3e3c7673bfe4cd9d33431b9d39eb711fb309251e34bb1b4f3f1d7916bfba6a2934421b9d39206e1fb3f360193953234f3fa86e163f1a193e34c1c9c13872999539446119395f549c3dcc407f3fc862f037c9cd7eb987e43839ca6819394abe6cbfa6d1c23ebc22f43809d97eb9b30139b9d668193996e525bfeef842bf173bf239c2a0c138a3a195b96c6f1939f724063f1e0a5abf63656a3a421b9d39206e1fb3f3601939b81b4f3f187916bf102f293a421b9d39206e1fb3f3601939d6144f3f9558163f72d7e0bc81f5c138fb949539ab3a19396368083fa98a583f48eec6bc20d27eb998e23839825919391bf723bf4096443f21b40e3c2ee77eb90dba38b94d851939958f6dbf8f24bebef185fc3c536cc138249e95b9bd86193992f6843d5e717fbf01f73c3c421b9d39206e1fb3f360193950dc4c3f987919bf73ba6bbc2941c139755bc037e0152f3beba9513fb85d123fe89b46bd77cf313946a3a439c93f2f3b5768aa3edb1a713fd27e40bdef7530b99b756139fa9e303b4ee84abf44fe1b3f9b42b13c3fa83ab9acfb0fb9034d313bd7d452bf306210bf4e9d773d002621397e3186b9c859303b53fd8f3e65a275bf9210823c2941c139755bc037e0152f3b55e2483f6e761ebf4afc06bdc3ab163a8a7fe038818ba93bf2a6543fd9d00b3f2b80ddbd927dc939a6acd33989b1a93b547fb63ee00c6e3f5833babdc16e3e38f948a539af0eab3b75cf45bf010e223fe1e2403d8fafdd37b69617b8e2bfab3b78b355bf618f09bf42f0f53d3455b93993002db9d7d0aa3bbc3f823e787a77bf9f8ee03cc3ab163a8a7fe038818ba93b3da8433f166d24bf33696cbd8cc2703ac0658439ddccfa3ba8b0563fc89f043f74472cbe0a2c413a2077113a5bfefa3b8412c13e807f6a3fb2230cbeefe6d039ee52fa390107fd3b7d4340bf3f16283f6c8c8e3d3373c2399c6705395016fe3bb08657bf403e02bfe639383e2277353ac4e642b7c8b5fc3b55dc693e530079bfcd792c3d8cc2703ac0658439ddccfa3beefa3d3f93622abf7978a2bded6db73aa27ff03911a9253c069a573f0e3dfa3e7c2369bec2cda03a04cc483a9dc5253caef0c93e9a77663fe1b73cbe005e693a5393373aac1d273cad533abf42162e3f5e06b53dec15603a25a2b839dfd5273cda4b58bfd104f5be61bb743e324b993a25a954398aef263c8632503ed42e7abfab78753ded6db73aa27ff03911a9253c88fd373f113f30bf6d52c7bd183f043b52653e3af08c4d3c0b31583fee86ed3eaa0089be8910f33adc27883af8a94d3c7f863f3e2d30783f914822beb55ac73a791e813ad4534f3ca2d558bf6101023f11de203eb1c4c13af796273a0f3e503cb44d36bff07d27bffa59823e6307ea3af65cfb39db244f3cc8c6cf3e01f969bf36ddfbb9183f043b52653e3af08c4d3c683b343ff2ee33bf730ed0bd - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0.000016392092, y: -0.0000147196115, z: 0.000006927643} - m_Extent: {x: 0.0020015286, y: 0.0010535051, z: 0.01270318} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &2019538366 GameObject: m_ObjectHideFlags: 0 @@ -29879,8 +29771,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2056195433} serializedVersion: 2 - m_LocalRotation: {x: -0.4885576, y: 0.42682442, z: -0.42682436, w: 0.63004243} - m_LocalPosition: {x: 0.039915174, y: -0.0039599924, z: 0.01712998} + m_LocalRotation: {x: -0.48855463, y: 0.42679164, z: -0.42679158, w: 0.63008904} + m_LocalPosition: {x: 0.039915532, y: -0.0039596343, z: 0.01712998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -29907,7 +29799,7 @@ MonoBehaviour: point2: {fileID: 468140076} point2Dir: {x: 0, y: 1, z: 0} update: 1 - mesh: {fileID: 2017986186} + mesh: {fileID: 738974946} --- !u!23 &2056195436 MeshRenderer: m_ObjectHideFlags: 0 @@ -29957,7 +29849,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2056195433} - m_Mesh: {fileID: 2017986186} + m_Mesh: {fileID: 738974946} --- !u!1 &2059994342 GameObject: m_ObjectHideFlags: 0 @@ -33716,6 +33608,25 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &984416711808363158 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2156020853053214728} + - component: {fileID: 1645213126982014095} + - component: {fileID: 9012688907123868682} + - component: {fileID: 9012688907123868683} + m_Layer: 0 + m_Name: Cpzigongjiao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!4 &985674199115698890 Transform: m_ObjectHideFlags: 0 @@ -36069,6 +35980,14 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4048640430229237064} m_Mesh: {fileID: 1046948297622369438, guid: e9fc5432f94e3e44a94d447461c5897d, type: 3} +--- !u!33 &1645213126982014095 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 984416711808363158} + m_Mesh: {fileID: 6329158148709259305, guid: add8990208c1edb4ba8b9135297da6d3, type: 3} --- !u!4 &1655131755049862232 Transform: m_ObjectHideFlags: 0 @@ -37636,6 +37555,21 @@ Transform: m_Children: [] m_Father: {fileID: 6153195114634116948} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2156020853053214728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 984416711808363158} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.744, y: 7.894, z: 2.201} + m_LocalScale: {x: 1.0813333, y: 1.0813334, z: 1.0813333} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 309006744} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2158279036676002163 MeshFilter: m_ObjectHideFlags: 0 @@ -46104,6 +46038,48 @@ Transform: - {fileID: 8005538391684572636} m_Father: {fileID: 8678779610295484086} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &4625045475955965430 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6830402253812744789} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1816bd974f897444eb79f3512e3d6ce0, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &4631099021018172143 GameObject: m_ObjectHideFlags: 0 @@ -47539,6 +47515,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &5008955631677856506 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6830402253812744789} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.7440002, y: 7.8940005, z: 2.2010007} + m_LocalScale: {x: 1.0813333, y: 1.0813334, z: 1.0813333} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 309006744} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5009708745107591696 GameObject: m_ObjectHideFlags: 0 @@ -53897,6 +53888,25 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &6830402253812744789 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5008955631677856506} + - component: {fileID: 9035405674536939093} + - component: {fileID: 4625045475955965430} + - component: {fileID: 9035405674536939094} + m_Layer: 0 + m_Name: Cpzigongjiao2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!33 &6836543275561706905 MeshFilter: m_ObjectHideFlags: 0 @@ -60691,6 +60701,70 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1062525222903112929} m_Mesh: {fileID: -1739315781395833724, guid: e9fc5432f94e3e44a94d447461c5897d, type: 3} +--- !u!23 &9012688907123868682 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 984416711808363158} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 1816bd974f897444eb79f3512e3d6ce0, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &9012688907123868683 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 984416711808363158} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 6329158148709259305, guid: add8990208c1edb4ba8b9135297da6d3, type: 3} --- !u!4 &9018057802451542996 Transform: m_ObjectHideFlags: 0 @@ -60739,6 +60813,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!33 &9035405674536939093 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6830402253812744789} + m_Mesh: {fileID: -5597002278806442958, guid: add8990208c1edb4ba8b9135297da6d3, type: 3} +--- !u!64 &9035405674536939094 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6830402253812744789} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5597002278806442958, guid: add8990208c1edb4ba8b9135297da6d3, type: 3} --- !u!33 &9037313291527490355 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/_Scripts/Application/GameManager.cs b/Assets/_Scripts/Application/GameManager.cs index 05b7db4..6ae9a07 100644 --- a/Assets/_Scripts/Application/GameManager.cs +++ b/Assets/_Scripts/Application/GameManager.cs @@ -32,6 +32,8 @@ namespace ZXK.LouDiXvMuNiu [System.NonSerialized] public float _CurMouseFlexible = 50.0f; + public bool _IsFirstFreeCamera = true; + protected override void AwakeSelf() { base.AwakeSelf(); diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index d53d3de..42d3fe0 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -140,7 +140,7 @@ namespace ZXK.LouDiXvMuNiu //} if (_CurSceneStep.TaskType.Equals(ConstCtrl.TASKTYPE_Anim)) {//timeline - if (Input.GetMouseButtonUp(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity)&& !_IsPlayAnm) + if (Input.GetMouseButtonDown(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity)&& !_IsPlayAnm) { if (!string.IsNullOrEmpty(curdata.CameraNearTR2)&& _isNearCameraTR) { @@ -158,7 +158,7 @@ namespace ZXK.LouDiXvMuNiu } else if (_CurSceneStep.TaskType.Equals(ConstCtrl.TASKTYPE_Video)) { - if (Input.GetMouseButtonUp(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity)) + if (Input.GetMouseButtonDown(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity)) { ClickToolCallInTrainState(rayHit.transform.gameObject, () => { @@ -379,7 +379,6 @@ namespace ZXK.LouDiXvMuNiu { SetTimeLineCtrl(curObj, previousObj, _CPTimeLineClip, 5 / 60.0f); } - _CPTran.Find("SM_Niu_ChongPei01").gameObject.SetActive(true); } else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ)) { @@ -387,7 +386,6 @@ namespace ZXK.LouDiXvMuNiu } else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ)) { - _RGSJTran.Find("SM_Niu_RenGongSouJing01").gameObject.SetActive(true); SetTimeLineCtrl(curObj, previousObj, _PTYZTimeLineClip, 0); } else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD)) @@ -408,7 +406,6 @@ namespace ZXK.LouDiXvMuNiu } } } - _YYZDTran.Find("SM_YinDaoJianCha01").gameObject.SetActive(true); SetTimeLineCtrl(curObj, previousObj, _YYZDTimeLineClip, 0); } } @@ -735,11 +732,13 @@ namespace ZXK.LouDiXvMuNiu { if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) { - GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(); + JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(), false); + //GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(); } else if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState")) { - GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum); + JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum), false); + //GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum); } _IsPlayAnm = false; }); @@ -878,6 +877,10 @@ namespace ZXK.LouDiXvMuNiu } } } + public void JumpToTime(float time) + { + _curTimeLineCtrl.ContinuePlayBackwardByPausePoint(time, null); + } /// /// ת /// diff --git a/Assets/_Scripts/Application/UI/AppSettingPanel.cs b/Assets/_Scripts/Application/UI/AppSettingPanel.cs index f1b0748..33e9dfc 100644 --- a/Assets/_Scripts/Application/UI/AppSettingPanel.cs +++ b/Assets/_Scripts/Application/UI/AppSettingPanel.cs @@ -88,14 +88,17 @@ namespace ZXK.LouDiXvMuNiu }); _scoreBtn.onClick.AddListener(() => { + PopUpMng._TriAble = false; UI_Manage.Instance.ShowPanel("ScoreDataPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ScoreDataPanel"), UIGroup.Tip); }); _desBtn.onClick.AddListener(() => { + PopUpMng._TriAble = false; UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip); }); _setBtn.onClick.AddListener(() => { + PopUpMng._TriAble = false; UI_Manage.Instance.ShowPanel("VolumeTranSettingPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.VolumeTranSettingPanel"), UIGroup.Tip); }); _closeBtn.onClick.AddListener(() => diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index 0623807..88c7549 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -337,6 +337,10 @@ namespace ZXK.LouDiXvMuNiu } else { + if(obj.id== 236) + { + NiuSceneMng._Instance.JumpToTime(2950.0f/60.0f); + } NiuSceneMng._Instance.AnswerSystemInStep(obj); } } @@ -604,6 +608,11 @@ namespace ZXK.LouDiXvMuNiu { NiuSceneMng._Instance._isNearCameraTR = false; _defaultCameraTRTog.isOn = _nearCameraTRTog.isOn = false; + if (GameManager.Instance._IsFirstFreeCamera) + { + GameManager.Instance._IsFirstFreeCamera = false; + PopUpMng.PopFirstFreeViewAlert(null); + } } } diff --git a/Assets/_Scripts/Application/UI/ThreeVideoChoicePrefab.cs b/Assets/_Scripts/Application/UI/ThreeVideoChoicePrefab.cs index 01229e2..718b1bd 100644 --- a/Assets/_Scripts/Application/UI/ThreeVideoChoicePrefab.cs +++ b/Assets/_Scripts/Application/UI/ThreeVideoChoicePrefab.cs @@ -58,6 +58,13 @@ namespace ZXK.LouDiXvMuNiu _closeBtn.onClick.AddListener(() => { + if (!_videoItemContainer.GetChild(rightNumber).GetComponent().isOn) + { + _videoItemContainer.GetChild(0).GetComponent().isOn = false; + _videoItemContainer.GetChild(1).GetComponent().isOn = false; + _videoItemContainer.GetChild(2).GetComponent().isOn = false; + } + Image rightImg = _videoItemContainer.GetChild(rightNumber).Find("Selected").GetComponent(); rightImg.DOFade(1.0f,1.0f).SetLoops(6, LoopType.Yoyo).OnComplete(() => { diff --git a/Assets/_Scripts/Application/UI/VideoShowPanel.cs b/Assets/_Scripts/Application/UI/VideoShowPanel.cs index d4d9b7f..45d5940 100644 --- a/Assets/_Scripts/Application/UI/VideoShowPanel.cs +++ b/Assets/_Scripts/Application/UI/VideoShowPanel.cs @@ -20,9 +20,7 @@ namespace ZXK.LouDiXvMuNiu _videoCtrl = GetWedage("VCRPanel_N").GetComponent(); AddEventListener("ExitVideoBtn_N", UIEventType.OnButtonClick, () => { - _exitEvent?.Invoke(); - UI_Manage.Instance.ClosePanel("VideoShowPanel"); - UI_Manage.Instance.ClosePanel("VideoShowNoCtrlPanel"); + FinishAction(); }); } @@ -32,6 +30,14 @@ namespace ZXK.LouDiXvMuNiu string _videoPath = Application.streamingAssetsPath + ConstCtrl.VIDEO_CSDY_PATH+clipName+".mp4"; _videoCtrl.GetComponent().OnOpenVideoFile(_videoPath); + _videoCtrl.GetComponent().SetFinishAction(FinishAction); + } + + private void FinishAction() + { + _exitEvent?.Invoke(); + UI_Manage.Instance.ClosePanel("VideoShowPanel"); + UI_Manage.Instance.ClosePanel("VideoShowNoCtrlPanel"); } } } \ No newline at end of file diff --git a/Assets/_Scripts/Framework/AudioMng/AudioMng.cs b/Assets/_Scripts/Framework/AudioMng/AudioMng.cs index 42676c1..7949761 100644 --- a/Assets/_Scripts/Framework/AudioMng/AudioMng.cs +++ b/Assets/_Scripts/Framework/AudioMng/AudioMng.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using ZXK.LouDiXvMuNiu; /******************************************************************************* *Create By CG *Function @@ -30,6 +31,11 @@ namespace CG.Framework public float _CurVolume = 1; + private void Update() + { + AdjustVolume(GameManager.Instance._CurAppVoice); + } + public void AdjustVolume(float volue) { //WDebug.Log($"޸{volue}"); diff --git a/Assets/_Scripts/Framework/Utilities/PopUpMng.cs b/Assets/_Scripts/Framework/Utilities/PopUpMng.cs index b89bdd5..eab3b08 100644 --- a/Assets/_Scripts/Framework/Utilities/PopUpMng.cs +++ b/Assets/_Scripts/Framework/Utilities/PopUpMng.cs @@ -169,6 +169,25 @@ namespace CG.UTility alertGeo.transform.SetAsLastSibling(); } /// + /// [第一次切换到自由视角提示] + /// + /// 弹窗主题 + /// 弹窗正文 + /// 确认按钮文本 + /// 点击确认按钮后触发事件 + public static void PopFirstFreeViewAlert(System.Action configBtnEvent) + { + _TriAble = false; + GameObject alertGeo = UI_Manage.Instance.ShowPanel("FirstFreeViewPrefab", null, UIGroup.Tip); + alertGeo.transform.Find("BG/ConfirmBtn").GetComponent