diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Prefabs/PCGo.prefab b/DisassemblingComputer/Assets/Courses/DisaComputer/Prefabs/PCGo.prefab index d0f393a..66fb0b6 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Prefabs/PCGo.prefab +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Prefabs/PCGo.prefab @@ -292,6 +292,97 @@ Transform: m_Father: {fileID: 9163144242709933721} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &854766049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 854766050} + - component: {fileID: 854766053} + - component: {fileID: 854766052} + - component: {fileID: 854766051} + m_Layer: 11 + m_Name: lock01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &854766050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854766049} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0192, y: -0.1115, z: 0} + m_LocalScale: {x: 0.07241, y: 0.07241, z: 0.17732485} + m_Children: [] + m_Father: {fileID: 7473182903658838309} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &854766053 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854766049} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &854766052 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854766049} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!65 &854766051 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 854766049} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &863066691 GameObject: m_ObjectHideFlags: 0 @@ -301,6 +392,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 863066692} + - component: {fileID: 1804765955} m_Layer: 10 m_Name: LuoSi m_TagString: Untagged @@ -321,9 +413,26 @@ Transform: m_Children: - {fileID: 9163144242598142210} - {fileID: 9163144243017644892} + - {fileID: 1449358020} m_Father: {fileID: 4576898897665800761} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1804765955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863066691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed4784425efa3240a01dbc3badc16bf, type: 3} + m_Name: + m_EditorClassIdentifier: + lousiTrans: + - {fileID: 9163144243017644892} + - {fileID: 9163144242598142210} + driver: {fileID: 1449358020} --- !u!1 &1093772840 GameObject: m_ObjectHideFlags: 0 @@ -720,6 +829,97 @@ MonoBehaviour: optionalRotationMode: 0 optionalScrambleMode: 0 optionalString: +--- !u!1 &1184563075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1184563076} + - component: {fileID: 1184563079} + - component: {fileID: 1184563078} + - component: {fileID: 1184563077} + m_Layer: 11 + m_Name: lock02 + m_TagString: lock02 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1184563076 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184563075} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.042, y: -0.24, z: -0} + m_LocalScale: {x: 0.07241, y: 0.08750749, z: 0.103481136} + m_Children: [] + m_Father: {fileID: 2966315415232970358} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1184563079 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184563075} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1184563078 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184563075} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!65 &1184563077 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1184563075} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1389054387 GameObject: m_ObjectHideFlags: 0 @@ -754,6 +954,37 @@ Transform: m_Father: {fileID: 2966315415232970358} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1449358019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1449358020} + m_Layer: 10 + m_Name: Driver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1449358020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449358019} + m_LocalRotation: {x: 0.011344416, y: 0, z: 0, w: 0.9999357} + m_LocalPosition: {x: 0.3382, y: 0.0027, z: 0.1283} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 9163144241746279669} + m_Father: {fileID: 863066692} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 1.3, y: 0, z: 0} --- !u!1 &1521697626 GameObject: m_ObjectHideFlags: 0 @@ -961,6 +1192,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1570263196} + - component: {fileID: 1352744530} m_Layer: 10 m_Name: Lousi m_TagString: Untagged @@ -981,9 +1213,26 @@ Transform: m_Children: - {fileID: 9163144242574195604} - {fileID: 9163144242818851253} + - {fileID: 8634450752337401486} m_Father: {fileID: 9202789973977951070} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1352744530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570263195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fed4784425efa3240a01dbc3badc16bf, type: 3} + m_Name: + m_EditorClassIdentifier: + lousiTrans: + - {fileID: 9163144242818851253} + - {fileID: 9163144242574195604} + driver: {fileID: 8634450752337401486} --- !u!1 &1627548776 GameObject: m_ObjectHideFlags: 0 @@ -1380,6 +1629,97 @@ MonoBehaviour: optionalRotationMode: 0 optionalScrambleMode: 0 optionalString: +--- !u!1 &1773623197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1773623198} + - component: {fileID: 1773623201} + - component: {fileID: 1773623200} + - component: {fileID: 1773623199} + m_Layer: 11 + m_Name: lock01 + m_TagString: lock01 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1773623198 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773623197} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.344} + m_LocalScale: {x: 0.07241, y: 0.07241, z: 0.07241} + m_Children: [] + m_Father: {fileID: 4821819436910324131} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1773623201 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773623197} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1773623200 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773623197} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!65 &1773623199 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773623197} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1868775985 GameObject: m_ObjectHideFlags: 0 @@ -1992,6 +2332,97 @@ MonoBehaviour: optionalRotationMode: 0 optionalScrambleMode: 0 optionalString: +--- !u!1 &2136295350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2136295351} + - component: {fileID: 2136295354} + - component: {fileID: 2136295353} + - component: {fileID: 2136295352} + m_Layer: 11 + m_Name: lock01 + m_TagString: lock01 + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2136295351 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136295350} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.078, y: 0.23, z: 0.017} + m_LocalScale: {x: 0.07241, y: 0.08750749, z: 0.1034811} + m_Children: [] + m_Father: {fileID: 2966315415232970358} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2136295354 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136295350} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2136295353 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136295350} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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 +--- !u!65 &2136295352 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2136295350} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &963001787576553976 GameObject: m_ObjectHideFlags: 0 @@ -2024,6 +2455,7 @@ Transform: - {fileID: 9163144242709933721} - {fileID: 5290862229662606482} - {fileID: 145032005} + - {fileID: 1773623198} m_Father: {fileID: 9163144242518054417} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2055,6 +2487,10 @@ MonoBehaviour: buckleGo: {fileID: 9163144241489577369} openEuler: {x: 0, y: -65, z: 0} closeEuler: {x: 0, y: 0, z: 0} + lock01Go: {fileID: 1773623197} + checkLayer: + serializedVersion: 2 + m_Bits: 2048 --- !u!114 &1437774535 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2108,6 +2544,8 @@ Transform: - {fileID: 9163144242168912369} - {fileID: 1868775986} - {fileID: 1389054388} + - {fileID: 2136295351} + - {fileID: 1184563076} m_Father: {fileID: 9163144242518054417} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2164,6 +2602,11 @@ MonoBehaviour: buckle02Go: {fileID: 9163144241489577371} openBuck02Euler: {x: 0, y: 0, z: -35} closeBuck02Euler: {x: 0, y: 0, z: 0} + lock01Go: {fileID: 2136295350} + lock02Go: {fileID: 1184563075} + checkLayer: + serializedVersion: 2 + m_Bits: 2048 --- !u!1 &1633133847082350818 GameObject: m_ObjectHideFlags: 0 @@ -2523,8 +2966,39 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5539784717164460414} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 5539784717164460414} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &5887229197879524690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8634450752337401486} + m_Layer: 10 + m_Name: Driver + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8634450752337401486 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5887229197879524690} + m_LocalRotation: {x: 0.011344415, y: 0.000000029802319, z: -0, w: 0.9999356} + m_LocalPosition: {x: 0.354, y: -0.024, z: 0.136} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7916234150033384170} + m_Father: {fileID: 1570263196} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 1.3, y: 0, z: 0} --- !u!1 &6642087463836497710 GameObject: m_ObjectHideFlags: 0 @@ -2904,6 +3378,7 @@ Transform: - {fileID: 9163144241058072122} - {fileID: 7326250865949567377} - {fileID: 6319824} + - {fileID: 854766050} m_Father: {fileID: 9163144242518054417} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2935,6 +3410,10 @@ MonoBehaviour: buckleGo: {fileID: 9163144241489577363} openEuler: {x: 0, y: -30, z: 0} closeEuler: {x: 0, y: 0, z: 0} + lock01Go: {fileID: 854766049} + checkLayer: + serializedVersion: 2 + m_Bits: 2048 --- !u!114 &2011415659 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3267,14 +3746,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 01f0dc3b32bf3bf4880c583f44b47781, type: 3} m_Name: m_EditorClassIdentifier: - zhubanControl: {fileID: 1277270403} - yingPanControl: {fileID: 1785942545} - dianYuanControl: {fileID: 1726903471} - guangQuControl: {fileID: 1805522222} - xianKaControl: {fileID: 1437774535} - cpuControl: {fileID: 2011415659} - neiCunTiaoControl: {fileID: 761662959} - jiXiangControl: {fileID: 2120156404} + spareAnimationInfos: + - type: 1 + control: {fileID: 2120156404} + - type: 2 + control: {fileID: 761662959} + - type: 3 + control: {fileID: 1785942545} + - type: 4 + control: {fileID: 1437774535} + - type: 5 + control: {fileID: 2011415659} + - type: 6 + control: {fileID: 1726903471} + - type: 7 + control: {fileID: 1805522222} + - type: 8 + control: {fileID: 1277270403} +--- !u!1001 &7916234150032996458 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8634450752337401486} + m_Modifications: + - target: {fileID: 100000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_Name + value: CJ_PCShow_gongjuM_01 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1315 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalScale.x + value: 0.5000002 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalScale.z + value: 0.5000002 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} +--- !u!4 &7916234150033384170 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, + type: 3} + m_PrefabInstance: {fileID: 7916234150032996458} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144241057684666 PrefabInstance: m_ObjectHideFlags: 0 @@ -3344,18 +3911,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 966d56808663c354e9079adca442b9f6, type: 3} ---- !u!4 &9163144241058072122 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 966d56808663c354e9079adca442b9f6, - type: 3} - m_PrefabInstance: {fileID: 9163144241057684666} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144241057716762 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 966d56808663c354e9079adca442b9f6, type: 3} m_PrefabInstance: {fileID: 9163144241057684666} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144241058072122 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 966d56808663c354e9079adca442b9f6, + type: 3} + m_PrefabInstance: {fileID: 9163144241057684666} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144241489543991 PrefabInstance: m_ObjectHideFlags: 0 @@ -3481,12 +4048,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42d21baf237bc374ab9d78985d449702, type: 3} ---- !u!4 &9163144241489156543 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400008, guid: 42d21baf237bc374ab9d78985d449702, - type: 3} - m_PrefabInstance: {fileID: 9163144241489543991} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144241489577369 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100014, guid: 42d21baf237bc374ab9d78985d449702, @@ -3499,27 +4060,33 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9163144241489543991} m_PrefabAsset: {fileID: 0} ---- !u!1 &9163144241489577375 stripped +--- !u!1 &9163144241489577367 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100008, guid: 42d21baf237bc374ab9d78985d449702, + m_CorrespondingSourceObject: {fileID: 100000, guid: 42d21baf237bc374ab9d78985d449702, type: 3} m_PrefabInstance: {fileID: 9163144241489543991} m_PrefabAsset: {fileID: 0} ---- !u!1 &9163144241489577363 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100004, guid: 42d21baf237bc374ab9d78985d449702, +--- !u!4 &9163144241489156535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 42d21baf237bc374ab9d78985d449702, type: 3} m_PrefabInstance: {fileID: 9163144241489543991} m_PrefabAsset: {fileID: 0} ---- !u!4 &9163144241489156535 stripped +--- !u!4 &9163144241489156543 stripped Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 42d21baf237bc374ab9d78985d449702, + m_CorrespondingSourceObject: {fileID: 400008, guid: 42d21baf237bc374ab9d78985d449702, type: 3} m_PrefabInstance: {fileID: 9163144241489543991} m_PrefabAsset: {fileID: 0} ---- !u!1 &9163144241489577367 stripped +--- !u!1 &9163144241489577363 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 42d21baf237bc374ab9d78985d449702, + m_CorrespondingSourceObject: {fileID: 100004, guid: 42d21baf237bc374ab9d78985d449702, + type: 3} + m_PrefabInstance: {fileID: 9163144241489543991} + m_PrefabAsset: {fileID: 0} +--- !u!1 &9163144241489577375 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100008, guid: 42d21baf237bc374ab9d78985d449702, type: 3} m_PrefabInstance: {fileID: 9163144241489543991} m_PrefabAsset: {fileID: 0} @@ -3592,6 +4159,85 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9163144241648713978} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9163144241746404981 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1449358020} + m_Modifications: + - target: {fileID: 100000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_Name + value: CJ_PCShow_gongjuM_01 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1315 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalScale.x + value: 0.5000002 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} + propertyPath: m_LocalScale.z + value: 0.5000002 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, type: 3} +--- !u!4 &9163144241746279669 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 9e1e232fdc02f564ba0484bcee35c2c5, + type: 3} + m_PrefabInstance: {fileID: 9163144241746404981} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144241980209273 PrefabInstance: m_ObjectHideFlags: 0 @@ -3649,18 +4295,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} ---- !u!4 &9163144241980072697 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, - type: 3} - m_PrefabInstance: {fileID: 9163144241980209273} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144241980178137 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} m_PrefabInstance: {fileID: 9163144241980209273} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144241980072697 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, + type: 3} + m_PrefabInstance: {fileID: 9163144241980209273} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144242168775537 PrefabInstance: m_ObjectHideFlags: 0 @@ -3738,18 +4384,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c7ff85be1e5cbb34abc208794c4425dc, type: 3} ---- !u!1 &9163144242168808913 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: c7ff85be1e5cbb34abc208794c4425dc, - type: 3} - m_PrefabInstance: {fileID: 9163144242168775537} - m_PrefabAsset: {fileID: 0} --- !u!4 &9163144242168912369 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: c7ff85be1e5cbb34abc208794c4425dc, type: 3} m_PrefabInstance: {fileID: 9163144242168775537} m_PrefabAsset: {fileID: 0} +--- !u!1 &9163144242168808913 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: c7ff85be1e5cbb34abc208794c4425dc, + type: 3} + m_PrefabInstance: {fileID: 9163144242168775537} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144242211009299 PrefabInstance: m_ObjectHideFlags: 0 @@ -3908,18 +4554,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65d2b573559d82c40be86c718d00d1ec, type: 3} ---- !u!4 &9163144242244864234 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 65d2b573559d82c40be86c718d00d1ec, - type: 3} - m_PrefabInstance: {fileID: 9163144242244997738} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144242244900042 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 65d2b573559d82c40be86c718d00d1ec, type: 3} m_PrefabInstance: {fileID: 9163144242244997738} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144242244864234 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 65d2b573559d82c40be86c718d00d1ec, + type: 3} + m_PrefabInstance: {fileID: 9163144242244997738} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144242574057748 PrefabInstance: m_ObjectHideFlags: 0 @@ -4046,18 +4692,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} ---- !u!4 &9163144242598142210 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, - type: 3} - m_PrefabInstance: {fileID: 9163144242598280066} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144242598378786 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} m_PrefabInstance: {fileID: 9163144242598280066} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144242598142210 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, + type: 3} + m_PrefabInstance: {fileID: 9163144242598280066} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144242612308789 PrefabInstance: m_ObjectHideFlags: 0 @@ -4115,18 +4761,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} ---- !u!4 &9163144242612441525 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, - type: 3} - m_PrefabInstance: {fileID: 9163144242612308789} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144242612342165 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} m_PrefabInstance: {fileID: 9163144242612308789} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144242612441525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, + type: 3} + m_PrefabInstance: {fileID: 9163144242612308789} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144242709804057 PrefabInstance: m_ObjectHideFlags: 0 @@ -4325,12 +4971,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 532ca58e9a3ed2742a13dee907ed9b4e, type: 3} ---- !u!1 &9163144242714409203 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100016, guid: 532ca58e9a3ed2742a13dee907ed9b4e, - type: 3} - m_PrefabInstance: {fileID: 9163144242714508867} - m_PrefabAsset: {fileID: 0} --- !u!4 &9163144242714895555 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 532ca58e9a3ed2742a13dee907ed9b4e, @@ -4343,6 +4983,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9163144242714508867} m_PrefabAsset: {fileID: 0} +--- !u!1 &9163144242714409203 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100016, guid: 532ca58e9a3ed2742a13dee907ed9b4e, + type: 3} + m_PrefabInstance: {fileID: 9163144242714508867} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144242787072133 PrefabInstance: m_ObjectHideFlags: 0 @@ -4542,18 +5188,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06b7880ff6894e646aa656e267f8980a, type: 3} ---- !u!4 &9163144242911380372 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 06b7880ff6894e646aa656e267f8980a, - type: 3} - m_PrefabInstance: {fileID: 9163144242910992660} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144242911092660 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 06b7880ff6894e646aa656e267f8980a, type: 3} m_PrefabInstance: {fileID: 9163144242910992660} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144242911380372 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 06b7880ff6894e646aa656e267f8980a, + type: 3} + m_PrefabInstance: {fileID: 9163144242910992660} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9163144243017769436 PrefabInstance: m_ObjectHideFlags: 0 @@ -4611,15 +5257,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} ---- !u!4 &9163144243017644892 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, - type: 3} - m_PrefabInstance: {fileID: 9163144243017769436} - m_PrefabAsset: {fileID: 0} --- !u!1 &9163144243017738108 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: b4dd039a8e054504daceeeed463e88fe, type: 3} m_PrefabInstance: {fileID: 9163144243017769436} m_PrefabAsset: {fileID: 0} +--- !u!4 &9163144243017644892 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: b4dd039a8e054504daceeeed463e88fe, + type: 3} + m_PrefabInstance: {fileID: 9163144243017769436} + m_PrefabAsset: {fileID: 0} diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Res/UI/Eff/bg.png.meta b/DisassemblingComputer/Assets/Courses/DisaComputer/Res/UI/Eff/bg.png.meta index 9ebebe4..652d30a 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Res/UI/Eff/bg.png.meta +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Res/UI/Eff/bg.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 @@ -63,7 +63,7 @@ TextureImporter: maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 1 allowsAlphaSplitting: 0 @@ -74,7 +74,7 @@ TextureImporter: maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 1 allowsAlphaSplitting: 0 @@ -85,7 +85,7 @@ TextureImporter: maxTextureSize: 1024 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 1 allowsAlphaSplitting: 0 diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scenes/DisaComputer.unity b/DisassemblingComputer/Assets/Courses/DisaComputer/Scenes/DisaComputer.unity index 91ddf12..836e884 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scenes/DisaComputer.unity +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scenes/DisaComputer.unity @@ -2170,6 +2170,7 @@ MonoBehaviour: m_EditorClassIdentifier: loadCircle_tex: {fileID: 2800000, guid: f904827dc13387a49989875f02dc6306, type: 3} loadCircleColor: {r: 0.21176471, g: 1, b: 1, a: 1} + isFocuseState: 0 checkLayer: serializedVersion: 2 m_Bits: 2048 @@ -2415,6 +2416,11 @@ PrefabInstance: propertyPath: m_Intensity value: 0.75 objectReference: {fileID: 0} + - target: {fileID: 6606880447022763252, guid: 52ca5a5baa433cd40910e0d0387d9747, + type: 3} + propertyPath: m_Shadows.m_Type + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6606880447022763258, guid: 52ca5a5baa433cd40910e0d0387d9747, type: 3} propertyPath: m_Name @@ -4027,7 +4033,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1439217237} m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 1.01, y: 0.992, z: 3.39} + m_LocalPosition: {x: 1.01, y: 0.992, z: 3.73} m_LocalScale: {x: 0.7943988, y: 0.80587626, z: 0.5769369} m_Children: [] m_Father: {fileID: 1389421586} @@ -7194,6 +7200,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 642120115} m_Modifications: + - target: {fileID: 854766052, guid: 45c39313f9bcd2c448d40b377eea5e7a, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9163144242518054417, guid: 45c39313f9bcd2c448d40b377eea5e7a, type: 3} propertyPath: m_LocalPosition.x diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/BoltDriver.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/BoltDriver.cs new file mode 100644 index 0000000..724a970 --- /dev/null +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/BoltDriver.cs @@ -0,0 +1,59 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using DG.Tweening; +using System; + +namespace DisComputer +{ + /* + * @func 螺丝刀动画控制 + * + * */ + public class BoltDriver : MonoBehaviour + { + //螺丝位置点 + public List lousiTrans; + + public Transform driver; + + private void Start() + { + driver.gameObject.SetActive(false); + } + + public IEnumerator RotationLouSi() + { + driver.gameObject.SetActive(true); + Tween driverT = driver.DOLocalRotate(new Vector3(360, 0, 0), 2.0f, RotateMode.FastBeyond360).SetLoops(-1).SetEase(Ease.Linear); + driverT.Pause(); + Sequence sequence = DOTween.Sequence(); + bool isFinish = true; + sequence.Append( + driver.DOLocalMove(lousiTrans[0].localPosition, 0.55f).SetEase(Ease.Linear). + OnComplete(() => { + driverT.Play(); + })).Append( + driver.DOLocalMoveX(driver.localPosition.x + .3f, 0.5f).SetEase(Ease.Linear).SetDelay(1.0f) + ) + .Append( + driver.DOLocalMove(lousiTrans[1].localPosition, 0.5f).SetEase(Ease.Linear) + ).Append( + driver.DOLocalMoveX(driver.localPosition.x + 0.3f, 0.5f).SetEase(Ease.Linear).SetDelay(1.0f) + ).OnComplete(()=> + { + driverT.Pause(); + driver.gameObject.SetActive(false); + isFinish = false; + }); + + while (isFinish) + { + yield return new WaitForEndOfFrame(); + } + } + + + } +} + diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/BoltDriver.cs.meta b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/BoltDriver.cs.meta new file mode 100644 index 0000000..07dc5af --- /dev/null +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/BoltDriver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fed4784425efa3240a01dbc3badc16bf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/CpuAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/CpuAnimation.cs index 4174575..155807c 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/CpuAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/CpuAnimation.cs @@ -24,12 +24,58 @@ namespace DisComputer public Vector3 closeEuler; + public GameObject lock01Go; + // Start is called before the first frame update void Start() { + isHit01 = false; + } + + private void Update() + { + if (isHit01) + { + if (Input.GetMouseButtonDown(0)) + { + if (hit.collider) + { + hit.collider.gameObject.SetActive(false); + buckleGo.transform.DOLocalRotate(openEuler, 0.35f).SetEase(Ease.Linear); + isHit01 = false; + onclick--; + } + + } + + + } + + + + } + + + + public override void SetLoadState() + { + unloadTipGo.SetActive(false); + buckleGo.SetActive(true); + mainGo.SetActive(true); + buckleGo.transform.localEulerAngles = closeEuler; + mainGo.transform.localPosition = mainInitPos; } + public override void SetUnloadState() + { + unloadTipGo.SetActive(false); + buckleGo.SetActive(false); + mainGo.SetActive(false); + buckleGo.transform.localEulerAngles = openEuler; + mainGo.transform.localPosition = mainShowPos; + } + public override bool IsCompareTag(object data) { @@ -84,12 +130,53 @@ namespace DisComputer StartCoroutine(Focuse()); } + //扣锁检测层 + public LayerMask checkLayer; + private RaycastHit hit; + private bool isHit01 = false; + + private int onclick = 1; + IEnumerator Focuse() { yield return StartCoroutine(ProgressFocuse()); unloadTipGo.SetActive(true); - yield return new WaitForSeconds(1.0f); - buckleGo.transform.DOLocalRotate(openEuler, 0.45f).SetEase(Ease.Linear).OnComplete(() => + lock01Go.SetActive(true); + isHit01 = false; + onclick = 1; + while(true) + { + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (Physics.Raycast(ray, out hit, 50, checkLayer.value)) + { + if (hit.collider.gameObject.name.Contains("lock01")) + { + isHit01 = true; + //Debug.LogFormat(">>>>>>>>>>>> hit go {0}", hit.collider.gameObject.tag); + } + } + + if (onclick == 0) + { + break; + } + yield return new WaitForEndOfFrame(); + } + + yield return new WaitForSeconds(0.50f); + + unloadTipGo.SetActive(false); + mainGo.transform.DOLocalMove(mainShowPos, 0.5f).SetDelay(0.5f).SetEase(Ease.Linear).OnComplete(() => { + + CommonTool.WaitTimeAfterDo(this, .350f, () => + { + OnUnLoadFinishHandle?.Invoke(); + mainGo.SetActive(false); + RewindCameraView(); + }); + }); + + /*buckleGo.transform.DOLocalRotate(openEuler, 0.45f).SetEase(Ease.Linear).OnComplete(() => { unloadTipGo.SetActive(false); mainGo.transform.DOLocalMove(mainShowPos, 0.5f).SetDelay(0.5f).SetEase(Ease.Linear).OnComplete(() => { @@ -101,7 +188,7 @@ namespace DisComputer RewindCameraView(); }); }); - }); + });*/ } diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/DianYuanAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/DianYuanAnimation.cs index 634cb6e..bd3636c 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/DianYuanAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/DianYuanAnimation.cs @@ -24,6 +24,19 @@ namespace DisComputer } + public override void SetLoadState() + { + dianYuanGo.transform.localPosition = initPos; + dianYuanGo.SetActive(true); + } + + public override void SetUnloadState() + { + dianYuanGo.transform.localPosition = showPos; + dianYuanGo.SetActive(false); + } + + public override bool IsCompareTag(object data) { diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/JiXiangAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/JiXiangAnimation.cs index bfdb025..404057a 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/JiXiangAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/JiXiangAnimation.cs @@ -42,6 +42,28 @@ namespace DisComputer } + + public override void SetLoadState() + { + mainGo.SetActive(true); + buckleGo.SetActive(true); + mainGo.transform.localPosition = mainInitPos; + buckleGo.transform.localEulerAngles = closeEuler; + buckleGo.transform.localPosition = buckleInitPos; + + + } + + public override void SetUnloadState() + { + mainGo.SetActive(false); + buckleGo.SetActive(false); + mainGo.transform.localPosition = mainShowPos; + buckleGo.transform.localEulerAngles = openEuler; + buckleGo.transform.localPosition = buckleShowPos; + } + + public override bool IsCompareTag(object data) { @@ -75,9 +97,6 @@ namespace DisComputer } - - - public override void OnLoadAct() { base.OnLoadAct(); diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/NeiCunTiaoAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/NeiCunTiaoAnimation.cs index efebdeb..56683c3 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/NeiCunTiaoAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/NeiCunTiaoAnimation.cs @@ -40,12 +40,75 @@ namespace DisComputer public Vector3 closeBuck02Euler; + + public GameObject lock01Go; + + public GameObject lock02Go; + // Start is called before the first frame update void Start() { + isHit01 = false; + isHit02 = false; + } + + + private void Update() + { + if (isHit01) + { + if (Input.GetMouseButtonDown(0)) + { + if(hit.collider) + { + hit.collider.gameObject.SetActive(false); + buckle01Go.transform.DOLocalRotate(openEuler, 0.35f).SetEase(Ease.Linear); + isHit01 = false; + onclick--; + } + + } + + + } + if (isHit02) { + if (Input.GetMouseButtonDown(0)) + { + if (hit.collider) + { + hit.collider.gameObject.SetActive(false); + buckle02Go.transform.DOLocalRotate(openBuck02Euler, 0.35f).SetEase(Ease.Linear); + onclick--; + isHit02 = false; + } + + } + } + } + + public override void SetUnloadState() + { + tipActGo.SetActive(false); + mainGo.SetActive(false); + buckle01Go.transform.localEulerAngles = openEuler; + buckle02Go.transform.localEulerAngles = openBuck02Euler; + mainGo.transform.localPosition = mainShowPos; + + } + + public override void SetLoadState() + { + tipActGo.SetActive(false); + mainGo.SetActive(true); + buckle01Go.transform.localEulerAngles = closeEuler; + buckle02Go.transform.localEulerAngles = closeBuck02Euler; + mainGo.transform.localPosition = mainInitPos; + } + + public override bool IsCompareTag(object data) { @@ -102,16 +165,66 @@ namespace DisComputer { base.OnUnLoadAct(); StartCoroutine(Focuse()); - - + } + //零件检测层 + public LayerMask checkLayer; + private RaycastHit hit; + private bool isHit01 = false; + private bool isHit02 = false; + private int onclick = 2; IEnumerator Focuse() { yield return StartCoroutine(ProgressFocuse()); tipActGo.SetActive(true); - yield return new WaitForSeconds(1.0f); - buckle01Go.transform.DOLocalRotate(openEuler, 0.35f).SetEase(Ease.Linear).SetDelay(0.3f).OnComplete(() => + lock01Go.SetActive(true); + lock02Go.SetActive(true); + onclick = 2; + isHit01 = false; + isHit02 = false; + while (true) + { + + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (Physics.Raycast(ray, out hit, 50, checkLayer.value)) + { + + if (hit.collider.gameObject.name.Contains("lock01")) + { + + isHit01 = true; + //Debug.LogFormat(">>>>>>>>>>>> hit go {0}", hit.collider.gameObject.tag); + + } + if (hit.collider.gameObject.name.Contains("lock02")) + { + //Debug.LogFormat(">>>>>>>>>>>> hit go {0}", hit.collider.gameObject.tag); + isHit02 = true; + } + } + + if (onclick == 0) + { + break; + } + yield return new WaitForEndOfFrame(); + } + + yield return new WaitForSeconds(0.50f); + + tipActGo.SetActive(false); + mainGo.transform.DOLocalMove(mainShowPos, 0.35f).SetEase(Ease.Linear).OnComplete(() => { + + CommonTool.WaitTimeAfterDo(this, .35f, () => { + OnUnLoadFinishHandle?.Invoke(); + mainGo.SetActive(false); + RewindCameraView(); + }); + + + }); + /* buckle01Go.transform.DOLocalRotate(openEuler, 0.35f).SetEase(Ease.Linear).SetDelay(0.3f).OnComplete(() => { tipActGo.SetActive(false); mainGo.transform.DOLocalMove(mainShowPos, 0.35f).SetEase(Ease.Linear).OnComplete(() => { @@ -128,7 +241,7 @@ namespace DisComputer buckle02Go.transform.DOLocalRotate(openBuck02Euler, 0.35f).SetEase(Ease.Linear).OnComplete(() => { - }); + });*/ } diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SimpleAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SimpleAnimation.cs index 3e50003..58f45e5 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SimpleAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SimpleAnimation.cs @@ -25,6 +25,18 @@ namespace DisComputer } + public override void SetLoadState() + { + showGo.SetActive(true); + showGo.transform.localPosition = initPos; + } + + public override void SetUnloadState() + { + showGo.transform.localPosition = showPos; + showGo.SetActive(false); + } + public override bool IsCompareTag(object data) { diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareAnimationBase.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareAnimationBase.cs index 5c8ae40..562d200 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareAnimationBase.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareAnimationBase.cs @@ -54,6 +54,24 @@ namespace DisComputer } + + /// + /// 设置成拆卸状态 + /// + public virtual void SetUnloadState() + { + + } + + /// + /// 设置成安装状态 + /// + public virtual void SetLoadState() + { + + } + + float interval = 0.3f; public void CoolPointTip(string tip) { @@ -86,6 +104,7 @@ namespace DisComputer protected IEnumerator ProgressFocuse() { yield return new WaitForEndOfFrame(); + MouseControl.Instance.isFocuseState = true; //关闭零件包栏 LzFramework.UI.TTUIPage.ClosePage(); //隐藏提示指引 @@ -104,6 +123,7 @@ namespace DisComputer protected void RewindCameraView() { Camera.main.DOFieldOfView(55, 0.5f).SetEase(Ease.Linear); + MouseControl.Instance.isFocuseState = false; } diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareItemControl.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareItemControl.cs index f43e2f5..06929f9 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareItemControl.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/SpareItemControl.cs @@ -136,7 +136,7 @@ namespace DisComputer /// public void ActiveRegistType(SpareType _type) { - Debug.LogFormat(">>>>>>>>>> 注册当前零件类型成功 {0}",_type); + //Debug.LogFormat(">>>>>>>>>> 注册当前零件类型成功 {0}",_type); triggerGo.SetActive(true); if(GameConfig.state == GameState.Load) { diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/XianKaAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/XianKaAnimation.cs index 92c30e0..226bc73 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/XianKaAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/XianKaAnimation.cs @@ -30,12 +30,54 @@ namespace DisComputer public Vector3 openEuler; public Vector3 closeEuler; + + public GameObject lock01Go; + // Start is called before the first frame update void Start() { + isHit01 = false; + } + + private void Update() + { + if (isHit01) + { + if (Input.GetMouseButtonDown(0)) + { + if (hit.collider) + { + hit.collider.gameObject.SetActive(false); + buckleGo.transform.DOLocalRotate(openEuler, 0.35f).SetEase(Ease.Linear); + isHit01 = false; + onclick--; + } + } + } } + + + public override void SetLoadState() + { + mainGo.SetActive(true); + buckleGo.SetActive(true); + unloadTipGo.SetActive(false); + mainGo.transform.localPosition = mainInitPos; + buckleGo.transform.localEulerAngles = closeEuler; + + } + + public override void SetUnloadState() + { + mainGo.SetActive(false); + buckleGo.SetActive(true); + unloadTipGo.SetActive(false); + mainGo.transform.localPosition = mainShowPos; + buckleGo.transform.localEulerAngles = openEuler; + } + public override bool IsCompareTag(object data) { @@ -92,12 +134,51 @@ namespace DisComputer } + + //扣锁检测层 + public LayerMask checkLayer; + private RaycastHit hit; + private bool isHit01 = false; + private int onclick = 1; IEnumerator Focuse() { yield return StartCoroutine(ProgressFocuse()); unloadTipGo.SetActive(true); - yield return new WaitForSeconds(1.0f); - buckleGo.transform.DOLocalRotate(openEuler, 0.5f).SetEase(Ease.Linear).OnComplete(() => + lock01Go.SetActive(true); + isHit01 = false; + + while (true) + { + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (Physics.Raycast(ray, out hit, 50, checkLayer.value)) + { + + if (hit.collider.gameObject.name.Contains("lock01")) + { + isHit01 = true; + } + + } + + + if (onclick == 0) + { + break; + } + yield return new WaitForEndOfFrame(); + } + yield return new WaitForSeconds(0.5f); + unloadTipGo.SetActive(false); + mainGo.transform.DOLocalMove(mainShowPos, 0.5f).SetDelay(0.45f).SetEase(Ease.OutQuart).OnComplete(() => { + CommonTool.WaitTimeAfterDo(this, 0.350f, () => + { + OnUnLoadFinishHandle?.Invoke(); + mainGo.SetActive(false); + RewindCameraView(); + }); + }); + + /*buckleGo.transform.DOLocalRotate(openEuler, 0.5f).SetEase(Ease.Linear).OnComplete(() => { unloadTipGo.SetActive(false); mainGo.transform.DOLocalMove(mainShowPos, 0.5f).SetDelay(0.45f).SetEase(Ease.OutQuart).OnComplete(() => { @@ -108,7 +189,7 @@ namespace DisComputer RewindCameraView(); }); }); - }); + });*/ } diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/YingPanAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/YingPanAnimation.cs index 8448705..66bdd7a 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/YingPanAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/YingPanAnimation.cs @@ -32,6 +32,21 @@ namespace DisComputer } + public override void SetLoadState() + { + yingPanGo.SetActive(true); + luosiTran.gameObject.SetActive(true); + yingPanGo.transform.localPosition = pointConfigs[0].point; + luosiTran.localPosition = Vector3.zero; + } + + public override void SetUnloadState() + { + yingPanGo.SetActive(false); + luosiTran.gameObject.SetActive(false); + yingPanGo.transform.localPosition = pointConfigs[2].point; + luosiTran.localPosition = showDis; + } public override bool IsCompareTag(object data) { @@ -98,7 +113,11 @@ namespace DisComputer IEnumerator Focuse() { yield return StartCoroutine(ProgressFocuse()); + BoltDriver driver = luosiTran.GetComponent(); luosiTran.gameObject.SetActive(true); + yield return StartCoroutine(driver.RotationLouSi()) ; + + luosiTran.DOLocalMove(showDis, 0.35f).SetEase(Ease.Linear).OnComplete(() => { Sequence sequence = DOTween.Sequence(); sequence.Append(yingPanGo.transform.DOLocalMove(pointConfigs[0].point, 0.4f).SetEase(Ease.Linear)).SetDelay(0.3f) diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/ZhuBanAnimation.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/ZhuBanAnimation.cs index e7cc1eb..96673d3 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/ZhuBanAnimation.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Common/SpareAnimation/ZhuBanAnimation.cs @@ -35,6 +35,25 @@ namespace DisComputer } + + public override void SetUnloadState() + { + zhubanGo.SetActive(false); + luosiTran.gameObject.SetActive(false); + zhubanGo.transform.localPosition = showPos; + luosiTran.localPosition = showDis; + + } + + public override void SetLoadState() + { + zhubanGo.SetActive(true); + luosiTran.gameObject.SetActive(true); + zhubanGo.transform.localPosition = initPos; + luosiTran.localPosition = Vector3.zero; + } + + public override bool IsCompareTag(object data) { diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/IframeSokecter.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/IframeSokecter.cs index 29a1abf..82c5ee1 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/IframeSokecter.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/IframeSokecter.cs @@ -29,10 +29,10 @@ namespace DisComputer private void OnGUI() { - GUIStyle gUIStyle = new GUIStyle(); + /*GUIStyle gUIStyle = new GUIStyle(); gUIStyle.fontSize = 20; gUIStyle.normal.textColor = Color.green; - GUI.Label(new Rect(50, 0, 300, 50), recieveStr, gUIStyle); + GUI.Label(new Rect(50, 0, 300, 50), recieveStr, gUIStyle);*/ } void OnRecStart() diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MainControl.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MainControl.cs index 3deb1d7..5ce4ea9 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MainControl.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MainControl.cs @@ -40,13 +40,13 @@ namespace DisComputer private void Idle_Enter() { - Debug.LogFormat("进入待机状态"); + //Debug.LogFormat("进入待机状态"); TTUIPage.ShowPage(); TTUIPage.ShowPage(); TTUIPage.ShowPage(); - WebConnecter.Singleton.SendDataToWeb("装机程序进入待机状态"); + //WebConnecter.Singleton.SendDataToWeb("装机程序进入待机状态"); } private void Idle_Update() @@ -56,7 +56,7 @@ namespace DisComputer private void Idle_Exit() { - Debug.LogFormat("退出待机 "); + //Debug.LogFormat("退出待机 "); TTUIPage.ClosePage(); } @@ -65,8 +65,8 @@ namespace DisComputer private IEnumerator Active_Enter() { yield return new WaitForEndOfFrame(); - Debug.LogFormat("游戏状态"); - WebConnecter.Singleton.SendDataToWeb("装机程序进入组装状态"); + //Debug.LogFormat("游戏状态"); + //WebConnecter.Singleton.SendDataToWeb("装机程序进入组装状态"); } @@ -78,18 +78,18 @@ namespace DisComputer private void Active_Exit() { - Debug.LogFormat("退出游戏状态"); + //Debug.LogFormat("退出游戏状态"); } private void End_Enter() { - Debug.LogFormat("进入游戏结束状态"); + //Debug.LogFormat("进入游戏结束状态"); } private void End_Exit() { - Debug.LogFormat("退出游戏结束状态"); + //Debug.LogFormat("退出游戏结束状态"); } #endregion diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/ModelControl.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/ModelControl.cs index 21833ad..65c74ad 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/ModelControl.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/ModelControl.cs @@ -40,7 +40,7 @@ namespace DisComputer /// public void RewindTargetRoatation() { - dragTarget.transform.DORotate(new Vector3(0, 300, 0), 0.5f); + curRotPlatform.transform.DORotate(new Vector3(0, 0, 0), 0.5f); } @@ -186,7 +186,8 @@ namespace DisComputer isFree = true; target.SetParent(showPlatform,true); curRotPlatform = showPlatform; - + destopPlatform.localEulerAngles = Vector3.zero; + }); target.DORotate(new Vector3(0, 300, 0), 0.5f); } @@ -207,6 +208,7 @@ namespace DisComputer isFree = false; target.SetParent(destopPlatform, true); curRotPlatform = destopPlatform; + showPlatform.localEulerAngles = Vector3.zero; }); target.DORotate(new Vector3(0, 30, 0), 0.5f); diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MouseControl.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MouseControl.cs index 52cdbc0..7825223 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MouseControl.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/MouseControl.cs @@ -25,6 +25,10 @@ namespace DisComputer private bool isDelTemp = false; + + [HideInInspector] + //是否进入聚焦状态 + public bool isFocuseState = false; // Update is called once per frame void Update() @@ -33,6 +37,9 @@ namespace DisComputer if (MainControl.Instance.mainState != MainState.Active) return; + if (isFocuseState) + return; + //缩放摄像机视距 RollCameraView(); diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/PcControl.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/PcControl.cs index 250a6aa..6c907e5 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/PcControl.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Control/Main/PcControl.cs @@ -3,6 +3,8 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using LzFramework; +using EduCoderTool; +using Newtonsoft.Json; namespace DisComputer { @@ -14,22 +16,7 @@ namespace DisComputer public class PcControl : Singleton { - public SpareItemControl zhubanControl; - - public SpareItemControl yingPanControl; - - public SpareItemControl dianYuanControl; - - public SpareItemControl guangQuControl; - - public SpareItemControl xianKaControl; - - public SpareItemControl cpuControl; - - public SpareItemControl neiCunTiaoControl; - - public SpareItemControl jiXiangControl; - + public List spareAnimationInfos; private int curSpIndex = 0; @@ -44,115 +31,96 @@ namespace DisComputer private void Update() { - if ( Input.GetKey(KeyCode.U) &&Input.GetKeyDown(KeyCode.Alpha1)) - { - jiXiangControl.spareAnimation.OnUnLoadAct(); - - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha1)) - { - jiXiangControl.spareAnimation.OnLoadAct(); - - } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha2)) - { - neiCunTiaoControl.spareAnimation.OnUnLoadAct(); - - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha2)) + if (Input.GetKeyDown(KeyCode.U)) { - neiCunTiaoControl.spareAnimation.OnLoadAct(); - + SetUnloadState(7); } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha3)) + if (Input.GetKeyDown(KeyCode.B)) { - yingPanControl.spareAnimation.OnUnLoadAct(); - - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha3)) - { - yingPanControl.spareAnimation.OnLoadAct(); - + SetLoadState(7); } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha4)) + + //重置安装模式 + if (Input.GetKeyDown(KeyCode.Space)) { - xianKaControl.spareAnimation.OnUnLoadAct(); + if(GameConfig.state == GameState.Load) + { + GameConfig.state = GameState.Unload; + } + else + { + GameConfig.state = GameState.Load; + } + Debug.LogFormat(">>>>>>>>>> cur SP index {0}", curSpIndex); + curSpIndex--; + ReadyLoadNextStep(0); - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha4)) - { - xianKaControl.spareAnimation.OnLoadAct(); } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha5)) - { - cpuControl.spareAnimation.OnUnLoadAct(); - - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha5)) - { - cpuControl.spareAnimation.OnLoadAct(); - - } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha6)) - { - dianYuanControl.spareAnimation.OnUnLoadAct(); - - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha6)) - { - dianYuanControl.spareAnimation.OnLoadAct(); - - } + } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha7)) - { - guangQuControl.spareAnimation.OnUnLoadAct(); - - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha7)) - { - guangQuControl.spareAnimation.OnLoadAct(); - - } - if (Input.GetKey(KeyCode.U) && Input.GetKeyDown(KeyCode.Alpha8)) + + /// + /// 设置拆机步数 + /// + /// + public void SetUnloadState(int step) + { + for(int i = 0; i < spareAnimationInfos.Count; i++) { - zhubanControl.spareAnimation.OnUnLoadAct(); + if (i < step) + { + Debug.LogFormat("*** Set UnloadMode 隐藏 {0} ", spareAnimationInfos[i].type); + spareAnimationInfos[i].control.spareAnimation.SetUnloadState(); + }else + { + Debug.LogFormat("*** Set UnloadMode 显示 {0} ", spareAnimationInfos[i].type); + spareAnimationInfos[i].control.spareAnimation.SetLoadState(); + } - } - if (Input.GetKey(KeyCode.R) && Input.GetKeyDown(KeyCode.Alpha8)) - { - zhubanControl.spareAnimation.OnLoadAct(); - } - //重置安装模式 - if (Input.GetKeyDown(KeyCode.Space)) + curSpIndex = step; + SetNextSpareType(); + + } + + /// + /// 设置装机步数 + /// + /// + public void SetLoadState(int step) + { + + + for (int i = 0; i < spareAnimationInfos.Count; i++) { - if(GameConfig.state == GameState.Load) + if(i < step) { - GameConfig.state = GameState.Unload; + Debug.LogFormat("*** Set loadMode 显示 {0} ", spareAnimationInfos[i].type); + spareAnimationInfos[i].control.spareAnimation.SetLoadState(); } else { - GameConfig.state = GameState.Load; + Debug.LogFormat("*** Set loadMode 隐藏 {0} ", spareAnimationInfos[i].type); + spareAnimationInfos[i].control.spareAnimation.SetUnloadState(); } - Debug.LogFormat(">>>>>>>>>> cur SP index {0}", curSpIndex); - curSpIndex--; - ReadyLoadNextStep(0); - - + } + curSpIndex = 8 - step; + + SetNextSpareType(); } + /// /// 注册零件控制事件 /// @@ -192,7 +160,7 @@ namespace DisComputer curSpIndex++; } - Debug.LogFormat(" *** cur index {0}",curSpIndex); + //Debug.LogFormat(" *** cur index {0}",curSpIndex); if (curSpIndex > 8)//拆装成功 { Debug.LogFormat("拆卸成功！！！"); @@ -218,10 +186,10 @@ namespace DisComputer { isReadyed = true; curSpIndex--; - Debug.LogFormat(" ----- cur index {0}", curSpIndex); + //Debug.LogFormat(" ----- cur index {0}", curSpIndex); } - Debug.LogFormat(" *** cur index {0}", curSpIndex); + //Debug.LogFormat(" *** cur index {0}", curSpIndex); if (curSpIndex <= 0) {//全部安装成功 curSpIndex = 1; StartCoroutine(FinishLoadMode()); @@ -255,6 +223,12 @@ namespace DisComputer IEnumerator FinishUnLoadMode() { yield return new WaitForSeconds(2.50f); + WebData webData = new WebData(); + webData.Data = ""; + webData.GameState = "Success"; + string json = JsonConvert.SerializeObject(webData); + + WebConnecter.Singleton.SendDataToWeb(json); string tipStr = string.Format("恭喜你顺利通过拆卸课程，接下来进入组装课程！加油！！"); MessageContainer.SendMessage("",this,MsgName.MainViewQuitFocuseMode); yield return new WaitForSeconds(0.5f); @@ -272,6 +246,14 @@ namespace DisComputer yield return new WaitForSeconds(2.50f); string tipStr = string.Format("恭喜你顺利通过安装课程，并掌握了计算机拆装！！"); MessageContainer.SendMessage("", this, MsgName.MainViewQuitFocuseMode); + + WebData webData = new WebData(); + webData.Data = ""; + webData.GameState = "Success"; + string json = JsonConvert.SerializeObject(webData); + + WebConnecter.Singleton.SendDataToWeb(json); + yield return new WaitForSeconds(0.50f); LzFramework.UI.TTUIPage.ShowPage(tipStr); } @@ -285,7 +267,7 @@ namespace DisComputer /// void UnloadFinish() { - Debug.LogFormat("当前{0}拆除成功",curSpType.ToString()); + // Debug.LogFormat("当前{0}拆除成功",curSpType.ToString()); isReadyed = false; MessageContainer.SendMessage("quit", this, MsgName.TipViewShowOperation); HideTipSpare(); @@ -300,7 +282,7 @@ namespace DisComputer void LoadFinish() { isReadyed = false; - Debug.LogFormat("当前{0}安装成功", curSpType.ToString()); + //Debug.LogFormat("当前{0}安装成功", curSpType.ToString()); HideTipSpare(); string spareName = CommonTool.GetSpareName(curSpType); string tip = string.Format("恭喜你完成了{0}的安装", spareName); @@ -349,37 +331,16 @@ namespace DisComputer /// void SetSpareControl(SpareType type) { - - switch (type) + + for(int i = 0; i < spareAnimationInfos.Count; i++) { - case SpareType.Cpu: - curSpControl = cpuControl; - break; - case SpareType.DianYuan: - curSpControl = dianYuanControl; - break; - case SpareType.GuangQu: - curSpControl = guangQuControl; - break; - case SpareType.JiXiang: - curSpControl = jiXiangControl; - break; - case SpareType.NeiCun: - curSpControl = neiCunTiaoControl; - break; - case SpareType.Null: - - break; - case SpareType.XianKa: - curSpControl = xianKaControl; - break; - case SpareType.YingPan: - curSpControl = yingPanControl; - break; - case SpareType.ZhuBan: - curSpControl = zhubanControl; - break; + if(spareAnimationInfos[i].type == type) + { + curSpControl = spareAnimationInfos[i].control; + } } + + curSpControl.ActiveRegistType(type); @@ -389,5 +350,12 @@ namespace DisComputer } + + [Serializable] + public class SpareAnimationInfo + { + public SpareType type; + public SpareItemControl control; + } } diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Data/WebData.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Data/WebData.cs new file mode 100644 index 0000000..7d5d3cd --- /dev/null +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Data/WebData.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// web端通讯地址 +/// +public class WebData +{ + public string GameState; + public string Data; + +} diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Data/WebData.cs.meta b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Data/WebData.cs.meta new file mode 100644 index 0000000..f555791 --- /dev/null +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/Data/WebData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5230de7177cd26846904b0ee3596fc35 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/MainView/MainMenuView.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/MainView/MainMenuView.cs index f3a1d91..2df83b6 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/MainView/MainMenuView.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/MainView/MainMenuView.cs @@ -148,8 +148,6 @@ namespace DisComputer #region **************** onclick ***************** - - /// /// 点击选择 /// diff --git a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/SparePartsView/SpareGrids.cs b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/SparePartsView/SpareGrids.cs index 07c3559..6f7dc85 100644 --- a/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/SparePartsView/SpareGrids.cs +++ b/DisassemblingComputer/Assets/Courses/DisaComputer/Scripts/UI/View/SparePartsView/SpareGrids.cs @@ -76,13 +76,13 @@ namespace DisComputer /// public void AddSpareToGrid(SpareType _type) { - Debug.LogFormat(">>>>>>>>>>>>> Add Fly Spare Type {0}", _type); + // Debug.LogFormat(">>>>>>>>>>>>> Add Fly Spare Type {0}", _type); for (int i = 0; i < gridNum; i++) { - Debug.LogFormat(">>>>>>>>>>>>> Add gridInfos[i].type {0}", gridInfos[i].type); + //Debug.LogFormat(">>>>>>>>>>>>> Add gridInfos[i].type {0}", gridInfos[i].type); if (gridInfos[i].type == SpareType.Null) { - Debug.LogFormat(">>>>>>>>>>>>> Add Fly Spare Type {0}",_type); + //Debug.LogFormat(">>>>>>>>>>>>> Add Fly Spare Type {0}",_type); gridInfos[i].type = _type; FlySpareAct(gridInfos[i]); diff --git a/DisassemblingComputer/Assets/StreamingAssets/build_info b/DisassemblingComputer/Assets/StreamingAssets/build_info index aaa75c2..3eab5aa 100644 --- a/DisassemblingComputer/Assets/StreamingAssets/build_info +++ b/DisassemblingComputer/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from DESKTOP-Q4UN19A at 2020/6/10 16:54:45 \ No newline at end of file +Build from DESKTOP-Q4UN19A at 2020/6/11 22:31:08 \ No newline at end of file diff --git a/DisassemblingComputer/ProjectSettings/ProjectSettings.asset b/DisassemblingComputer/ProjectSettings/ProjectSettings.asset index b23fb88..03a7316 100644 --- a/DisassemblingComputer/ProjectSettings/ProjectSettings.asset +++ b/DisassemblingComputer/ProjectSettings/ProjectSettings.asset @@ -51,7 +51,7 @@ PlayerSettings: defaultScreenWidth: 1024 defaultScreenHeight: 768 defaultScreenWidthWeb: 1040 - defaultScreenHeightWeb: 650 + defaultScreenHeightWeb: 585 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 diff --git a/DisassemblingComputer/ProjectSettings/QualitySettings.asset b/DisassemblingComputer/ProjectSettings/QualitySettings.asset index 0621bef..dff0719 100644 --- a/DisassemblingComputer/ProjectSettings/QualitySettings.asset +++ b/DisassemblingComputer/ProjectSettings/QualitySettings.asset @@ -29,9 +29,16 @@ QualitySettings: vSyncCount: 0 lodBias: 0.3 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -57,9 +64,16 @@ QualitySettings: vSyncCount: 0 lodBias: 0.4 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 16 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -85,9 +99,16 @@ QualitySettings: vSyncCount: 1 lodBias: 0.7 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 64 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -113,16 +134,23 @@ QualitySettings: vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 name: Very High pixelLightCount: 3 shadows: 2 - shadowResolution: 2 + shadowResolution: 1 shadowProjection: 1 shadowCascades: 2 shadowDistance: 40 @@ -133,17 +161,24 @@ QualitySettings: blendWeights: 4 textureQuality: 0 anisotropicTextures: 1 - antiAliasing: 4 + antiAliasing: 8 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 - vSyncCount: 1 + vSyncCount: 0 lodBias: 1.5 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 1024 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - serializedVersion: 2 @@ -169,9 +204,51 @@ QualitySettings: vSyncCount: 1 lodBias: 2 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 + particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 + resolutionScalingFixedDPIFactor: 1 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Level 6 + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + shadowNearPlaneOffset: 3 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} + shadowmaskMode: 1 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 4 + softParticles: 1 + softVegetation: 1 + realtimeReflectionProbes: 1 + billboardsFaceCameraPosition: 1 + vSyncCount: 1 + lodBias: 2 + maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 4096 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: @@ -180,7 +257,7 @@ QualitySettings: Nintendo Switch: 5 PS4: 5 PSP2: 2 - Standalone: 5 + Standalone: 3 Tizen: 2 WebGL: 3 WiiU: 5 diff --git a/DisassemblingComputer/ProjectSettings/TagManager.asset b/DisassemblingComputer/ProjectSettings/TagManager.asset index fba60b9..4fd9668 100644 --- a/DisassemblingComputer/ProjectSettings/TagManager.asset +++ b/DisassemblingComputer/ProjectSettings/TagManager.asset @@ -12,6 +12,8 @@ TagManager: - DianYuan - GuangQu - ZhuBan + - lock01 + - lock02 layers: - Default - TransparentFX diff --git a/Output/DisaComputer/Build/DisaComputer.data.unityweb b/Output/DisaComputer/Build/DisaComputer.data.unityweb index 53a248b..e028610 100644 Binary files a/Output/DisaComputer/Build/DisaComputer.data.unityweb and b/Output/DisaComputer/Build/DisaComputer.data.unityweb differ diff --git a/Output/DisaComputer/Build/DisaComputer.wasm.code.unityweb b/Output/DisaComputer/Build/DisaComputer.wasm.code.unityweb index a96987d..890c9ec 100644 Binary files a/Output/DisaComputer/Build/DisaComputer.wasm.code.unityweb and b/Output/DisaComputer/Build/DisaComputer.wasm.code.unityweb differ diff --git a/Output/DisaComputer/Build/DisaComputer.wasm.framework.unityweb b/Output/DisaComputer/Build/DisaComputer.wasm.framework.unityweb index 0e97bd4..50c5d8a 100644 Binary files a/Output/DisaComputer/Build/DisaComputer.wasm.framework.unityweb and b/Output/DisaComputer/Build/DisaComputer.wasm.framework.unityweb differ diff --git a/Output/DisaComputer/StreamingAssets/build_info b/Output/DisaComputer/StreamingAssets/build_info index ebb4986..60763a4 100644 --- a/Output/DisaComputer/StreamingAssets/build_info +++ b/Output/DisaComputer/StreamingAssets/build_info @@ -1 +1 @@ -Build from DESKTOP-Q4UN19A at 2020/6/9 16:06:57 \ No newline at end of file +Build from DESKTOP-Q4UN19A at 2020/6/11 17:33:57 \ No newline at end of file diff --git a/Output/DisaComputer/TemplateData/webgl-logo.png b/Output/DisaComputer/TemplateData/webgl-logo.png index 8af9ba6..c7e5f72 100644 Binary files a/Output/DisaComputer/TemplateData/webgl-logo.png and b/Output/DisaComputer/TemplateData/webgl-logo.png differ diff --git a/Output/DisaComputer/index.html b/Output/DisaComputer/index.html index 7c76a09..ea619e5 100644 --- a/Output/DisaComputer/index.html +++ b/Output/DisaComputer/index.html @@ -10,7 +10,6 @@