diff --git a/Assets/Art/UI/InstructionsWindow/微信图片_20250307112018.png b/Assets/Art/UI/InstructionsWindow/微信图片_20250307112018.png new file mode 100644 index 0000000..2bce25f Binary files /dev/null and b/Assets/Art/UI/InstructionsWindow/微信图片_20250307112018.png differ diff --git a/Assets/Art/UI/InstructionsWindow/微信图片_20250307112018.png.meta b/Assets/Art/UI/InstructionsWindow/微信图片_20250307112018.png.meta new file mode 100644 index 0000000..79d5c8a --- /dev/null +++ b/Assets/Art/UI/InstructionsWindow/微信图片_20250307112018.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 20d39b38ec5c56142882ea1cbf5cb076 +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/ExplainContainPanel.prefab b/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab index 1873f08..c4d3061 100644 --- a/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab +++ b/Assets/Resources/UIPrefabs/ExplainContainPanel.prefab @@ -1459,7 +1459,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 71a6e945c4ab7e0408aab234d3d35876, type: 3} + m_Sprite: {fileID: 21300000, guid: 20d39b38ec5c56142882ea1cbf5cb076, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index a5945f6..1423fc8 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -5333,6 +5333,7 @@ GameObject: - component: {fileID: 245494940} - component: {fileID: 245494942} - component: {fileID: 245494941} + - component: {fileID: 245494943} m_Layer: 0 m_Name: SM_WuDing (1) m_TagString: Untagged @@ -5405,6 +5406,27 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 245494939} m_Mesh: {fileID: -3130494583979749377, guid: 8e33a0d3a1fb42640b3c0953f210cff1, type: 3} +--- !u!65 &245494943 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 245494939} + 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: 4.424665, y: 5.318528, z: 0.0050608534} + m_Center: {x: 0, y: -0.00000023841864, z: 0.00000006263147} --- !u!1 &248663901 GameObject: m_ObjectHideFlags: 0 @@ -10002,6 +10024,11 @@ PrefabInstance: propertyPath: m_Name value: SM_NiuPeng objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e806e45c69a90284b8463d5689f0ddf5, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: e806e45c69a90284b8463d5689f0ddf5, type: 3} propertyPath: m_StaticEditorFlags @@ -10010,7 +10037,19 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e806e45c69a90284b8463d5689f0ddf5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 453034786} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e806e45c69a90284b8463d5689f0ddf5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 453034785} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e806e45c69a90284b8463d5689f0ddf5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 453034784} m_SourcePrefab: {fileID: 100100000, guid: e806e45c69a90284b8463d5689f0ddf5, type: 3} --- !u!4 &453034782 stripped Transform: @@ -10018,6 +10057,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 453034781} m_PrefabAsset: {fileID: 0} +--- !u!1 &453034783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e806e45c69a90284b8463d5689f0ddf5, + type: 3} + m_PrefabInstance: {fileID: 453034781} + m_PrefabAsset: {fileID: 0} +--- !u!65 &453034784 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453034783} + 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: 26.042675, y: 0.924917, z: 12.5047} + m_Center: {x: 0, y: -17.010632, z: 1.4361992e-14} +--- !u!65 &453034785 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453034783} + 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.5134087, y: 33.60577, z: 12.5047} + m_Center: {x: 12.910141, y: 0, z: 0} +--- !u!65 &453034786 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 453034783} + 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: 26.042675, y: 0.6934908, z: 12.5047} + m_Center: {x: 0, y: 16.456142, z: -6.482228e-15} --- !u!1 &453195620 GameObject: m_ObjectHideFlags: 0 @@ -20753,6 +20861,11 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 65 objectReference: {fileID: 0} + - target: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} propertyPath: m_StaticEditorFlags @@ -20876,6 +20989,22 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 239823058} + - targetCorrespondingSourceObject: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2014939067} + - targetCorrespondingSourceObject: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2014939066} + - targetCorrespondingSourceObject: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2014939065} + - targetCorrespondingSourceObject: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2014939064} - targetCorrespondingSourceObject: {fileID: -1928066970077973081, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3} insertIndex: -1 @@ -26296,7 +26425,15 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 930185579} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2526995416229006087, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1099926484} + - targetCorrespondingSourceObject: {fileID: 1502753842218846443, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1099926483} m_SourcePrefab: {fileID: 100100000, guid: 91cd557b6f1a77747a3e874f80172a64, type: 3} --- !u!4 &1099926480 stripped Transform: @@ -26304,6 +26441,60 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1099926479} m_PrefabAsset: {fileID: 0} +--- !u!1 &1099926481 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1502753842218846443, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + m_PrefabInstance: {fileID: 1099926479} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1099926482 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2526995416229006087, guid: 91cd557b6f1a77747a3e874f80172a64, + type: 3} + m_PrefabInstance: {fileID: 1099926479} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1099926483 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099926481} + 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: 0.008762398, y: 5.3185267, z: 3.0358713} + m_Center: {x: 0.00000005727634, y: 0, z: -0.00078392046} +--- !u!65 &1099926484 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099926482} + 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: 4.4246655, y: 0.008761598, z: 3.0358717} + m_Center: {x: -0.00000035762787, y: -0.00000015250411, z: -0.00078398007} --- !u!1 &1106273654 GameObject: m_ObjectHideFlags: 0 @@ -32566,7 +32757,11 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1724175222} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1450726276} m_SourcePrefab: {fileID: 100100000, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} --- !u!4 &1450726274 stripped Transform: @@ -32574,6 +32769,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1450726273} m_PrefabAsset: {fileID: 0} +--- !u!1 &1450726275 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 535cb80b23ea14242891d8d17c3d5ea7, + type: 3} + m_PrefabInstance: {fileID: 1450726273} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1450726276 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1450726275} + 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: 4.424665, y: 3.0358691, z: 0.30196142} + m_Center: {x: 0, y: 0, z: 0.000000007450581} --- !u!1 &1457828095 GameObject: m_ObjectHideFlags: 0 @@ -42953,6 +43175,96 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2012886446} m_Mesh: {fileID: -7628297149760489497, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3} +--- !u!1 &2014939063 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 299176642149413249, guid: 6d0303911f413ab4391ab98ee2c2f263, + type: 3} + m_PrefabInstance: {fileID: 928817547} + m_PrefabAsset: {fileID: 0} +--- !u!65 &2014939064 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014939063} + 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: 124.72181, y: 4900.0015, z: 3139.1914} + m_Center: {x: -99.16621, y: -3.716122, z: -1455.4048} +--- !u!65 &2014939065 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014939063} + 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: 3000.2515, y: 107.95466, z: 3139.1914} + m_Center: {x: 1409.7037, y: 2444.7, z: -1455.4045} +--- !u!65 &2014939066 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014939063} + 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: 64.98337, y: 4900.0015, z: 3139.1914} + m_Center: {x: 2897.8997, y: -3.7159433, z: -1455.4047} +--- !u!65 &2014939067 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014939063} + 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: 3000.2517, y: 106.095474, z: 0} + m_Center: {x: 1409.7036, y: -2462.768, z: 116.28986} --- !u!1 &2015000222 GameObject: m_ObjectHideFlags: 0 @@ -44783,6 +45095,7 @@ GameObject: - component: {fileID: 2083301440} - component: {fileID: 2083301442} - component: {fileID: 2083301441} + - component: {fileID: 2083301443} m_Layer: 0 m_Name: CP_Yisheng_A2 m_TagString: Untagged @@ -44906,6 +45219,18 @@ SkinnedMeshRenderer: m_Center: {x: 0.009692604, y: 0.0027597146, z: 0.02484438} m_Extent: {x: 0.02530164, y: 0.025080834, z: 0.031839672} m_DirtyAABB: 0 +--- !u!114 &2083301443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2083301439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dbb1ac4a40a3d924bb8a6fdf0e65c700, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2084632546 GameObject: m_ObjectHideFlags: 0 @@ -60270,7 +60595,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: -5211233724015896257, guid: 1996edd0d2516904b8a5168f8f1f82be, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3099212564684846504} m_SourcePrefab: {fileID: 100100000, guid: 1996edd0d2516904b8a5168f8f1f82be, type: 3} --- !u!4 &3099212564684846502 stripped Transform: @@ -60278,6 +60607,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3099212564684846501} m_PrefabAsset: {fileID: 0} +--- !u!1 &3099212564684846503 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5211233724015896257, guid: 1996edd0d2516904b8a5168f8f1f82be, + type: 3} + m_PrefabInstance: {fileID: 3099212564684846501} + m_PrefabAsset: {fileID: 0} +--- !u!65 &3099212564684846504 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3099212564684846503} + 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: 0.35290253, y: 31.911812, z: 10.9286585} + m_Center: {x: 0.00000011175871, y: 0, z: -0.00000035762798} --- !u!23 &3101972164378248452 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/_Scripts/Application/SceneCtrls/ColCtrl.cs b/Assets/_Scripts/Application/SceneCtrls/ColCtrl.cs new file mode 100644 index 0000000..1b2eab2 --- /dev/null +++ b/Assets/_Scripts/Application/SceneCtrls/ColCtrl.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +/******************************************************************************* +*Create By CG +*Function +*******************************************************************************/ +namespace ZXK.LouDiXvMuNiu +{ + public class ColCtrl : MonoBehaviour + { + private void OnEnable() + { + if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState")) + { + transform.GetComponent().enabled = false; + } + else + { + transform.GetComponent().enabled = true; + } + } + } +} \ No newline at end of file diff --git a/Assets/_Scripts/Application/SceneCtrls/ColCtrl.cs.meta b/Assets/_Scripts/Application/SceneCtrls/ColCtrl.cs.meta new file mode 100644 index 0000000..bba214e --- /dev/null +++ b/Assets/_Scripts/Application/SceneCtrls/ColCtrl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dbb1ac4a40a3d924bb8a6fdf0e65c700 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scripts/Application/SceneCtrls/PeoplePlanToolShowCtrl.cs b/Assets/_Scripts/Application/SceneCtrls/PeoplePlanToolShowCtrl.cs index 834b3e2..3a3d4bd 100644 --- a/Assets/_Scripts/Application/SceneCtrls/PeoplePlanToolShowCtrl.cs +++ b/Assets/_Scripts/Application/SceneCtrls/PeoplePlanToolShowCtrl.cs @@ -20,7 +20,6 @@ namespace ZXK.LouDiXvMuNiu if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_TQFAQCL) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CSPLCL) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_JZLVJC) - || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ)) { transform.parent.Find("ShortHand").gameObject.SetActive(_isShort); @@ -34,6 +33,7 @@ namespace ZXK.LouDiXvMuNiu { if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_RGSJ) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ) + || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD)) { transform.parent.Find("LongHand").gameObject.SetActive(!_isShort); @@ -51,7 +51,6 @@ namespace ZXK.LouDiXvMuNiu if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_TQFAQCL) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CSPLCL) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_JZLVJC) - || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ)) { foreach (Transform item in transform) @@ -71,6 +70,7 @@ namespace ZXK.LouDiXvMuNiu { if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_RGSJ) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ) + || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP) || GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD)) { foreach (Transform item in transform) diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index e75cf75..1783878 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 3536 + controlID: 13775 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -49,9 +49,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 302 - width: 1182 - height: 689 + y: 429 + width: 730 + height: 562 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1182 - height: 668 - m_Scale: {x: 0.3078125, y: 0.3078125} - m_Translation: {x: 590.99994, y: 333.99997} + width: 730 + height: 541 + m_Scale: {x: 0.19010417, y: 0.19010417} + m_Translation: {x: 365, y: 270.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1919.9998 - y: -1085.076 - width: 3839.9998 - height: 2170.152 + x: -1920 + y: -1422.904 + width: 3840 + height: 2845.808 m_MinimalGUI: 1 - m_defaultScale: 0.3078125 - m_LastWindowPixelSize: {x: 1182, y: 689} + m_defaultScale: 0.19010417 + m_LastWindowPixelSize: {x: 730, y: 562} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1183 + width: 731 height: 939 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 3537 + controlID: 13776 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -168,8 +168,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1183 - height: 229 + width: 731 + height: 356 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -201,8 +201,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 1182 - height: 208 + width: 730 + height: 335 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -630,7 +630,7 @@ MonoBehaviour: sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: bd56d3ae483ce7a4ca6ccdbcf4c5ded6 - m_Gizmos: 0 + m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 @@ -639,9 +639,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.37670505, y: -2.3844569, z: 2.2497458} + m_Target: {x: 1919.8, y: 1080, z: 0} speed: 2 - m_Value: {x: -0.37670505, y: -2.3844569, z: 2.2497458} + m_Value: {x: 1919.8, y: 1080, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -687,13 +687,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.16660939, y: 0.10244136, z: -0.017406387, w: -0.9805332} + m_Target: {x: -0.113512255, y: -0.87044156, z: 0.41598156, w: -0.23752649} speed: 2 - m_Value: {x: -0.16660929, y: 0.1024413, z: -0.017406376, w: -0.9805326} + m_Value: {x: -0.113511525, y: -0.87043595, z: 0.41597888, w: -0.23752496} m_Size: - m_Target: 0.94379973 + m_Target: 2203.0815 speed: 2 - m_Value: 0.94379973 + m_Value: 2203.0815 m_Ortho: m_Target: 0 speed: 2 @@ -711,7 +711,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: -0.113512255, y: -0.87044156, z: 0.41598156, w: -0.23752649} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -807,11 +807,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 229 - width: 1183 - height: 710 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + y: 356 + width: 731 + height: 583 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -840,9 +840,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 539 - width: 993 - height: 452 + y: 429 + width: 974 + height: 562 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -877,9 +877,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1183 + x: 731 y: 0 - width: 127 + width: 537 height: 939 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -909,9 +909,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1183 + x: 731 y: 73 - width: 125 + width: 535 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -926,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7e96fbff - m_LastClickedID: -289154 - m_ExpandedIDs: f299fbffcee2fcff28c7fdff94ccfdff1eeafeff7e75ffff2efbfffff4ffffff30780000507800002c10010036110100d6110100f2180100b6260100d6260100 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 52d2f5ff56d2f5ffe0ecf5ff2646f6ff8aa4f6ff8ca4f6ff8ea4f6fffaa4f6fffca4f6ff00a5f6ff2ca5f6ff30a5f6fff6b7f6ff66d1f6ffa006f7ffa206f7ffa406f7ff1007f7ff1207f7ff1607f7ff4207f7ff4607f7ff9825f7ff3c3bf7ff668ff7ffd400f8ffdc59f8ff68a6f8ff9cb8f8ff2cc7f8ff6eddf8ff72ddf8ff5e1bf9ff9a21f9ff2648f9ff2a48f9ff7a8df9ff64abf9ffb812faffea66faffb26bfaffa4c5faff9a0bfbff8069fbffa669fbffb269fbffc269fbffca69fbffd069fbfff299fbffcee2fcff28c7fdff94ccfdff1eeafeff7e75ffff2efbfffff4ffffff30780000507800002c10010036110100d6110100f2180100b6260100ce260100d6260100a21d0200202302004a23020072230200a824020026250200322502002e260200f02602008e2a02000437020024370200ca380200483e0200723e02009a3e02004e4002005a4002005641020018420200b6450200b27302004c77020020bc020040bc0200c0c3020008c402006cc502008ec50200eac6020042da020026de02006ede0200d2df020050e102003ce60200f2f1020012f20200e42e0300003603002e450300a2490300e24f0300be500300945103006a640300aa6a0300866b0300769203007c920300949203009c920300 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -967,9 +967,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1310 + x: 1268 y: 0 - width: 255 + width: 309 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -999,9 +999,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1311 - y: 19 - width: 253 + x: 1268 + y: 73 + width: 307 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1024,7 +1024,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/StreamingAssets/Excel + - Assets/Art/UI/InstructionsWindow m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1041,7 +1041,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 5e780000 m_LastClickedID: 30814 - m_ExpandedIDs: ffffffff00000000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000ca780000cc780000ce780000d6780000d8780000da780000e0780000e2780000e47800002c7c0000347c0000d68b0000d625010018260100 + m_ExpandedIDs: ffffffff00000000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000ca780000cc780000ce780000d0780000d6780000d8780000da780000de780000e0780000e2780000e4780000e47b0000347c0000d68b0000d625010018260100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1066,10 +1066,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 56} - m_SelectedIDs: 7e96fbff + scrollPos: {x: 0, y: 0} + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000ca780000cc780000ce780000d6780000d8780000da780000e0780000e2780000e4780000e47b00002c7c0000347c0000d68b0000d625010018260100 + m_ExpandedIDs: ffffffff00000000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000ca780000cc780000ce780000d0780000d6780000d8780000da780000dc780000de780000e0780000e2780000e4780000e67b0000d68b0000d625010018260100562601001cca0300 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1094,8 +1094,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 7e96fbff - m_LastClickedInstanceID: -289154 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1140,12 +1140,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1565 + x: 1577 y: 0 - width: 355 + width: 343 height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -1172,9 +1172,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1566 - y: 19 - width: 354 + x: 1577 + y: 73 + width: 342 height: 918 m_SerializedDataModeController: m_DataMode: 0