diff --git a/BulkCargo_UnityProject/Assets/GameAssets/Model/华能（福建）海港有限公司海关监管场所/Materials/lambert157.mat b/BulkCargo_UnityProject/Assets/GameAssets/Model/华能（福建）海港有限公司海关监管场所/Materials/lambert157.mat index 93408545..ef777dde 100644 --- a/BulkCargo_UnityProject/Assets/GameAssets/Model/华能（福建）海港有限公司海关监管场所/Materials/lambert157.mat +++ b/BulkCargo_UnityProject/Assets/GameAssets/Model/华能（福建）海港有限公司海关监管场所/Materials/lambert157.mat @@ -124,7 +124,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.63170195, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.39215687, g: 0.7372549, b: 0, a: 1} - _EmissionColor: {r: 0, g: 509.99216, b: 1024, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度1）.png b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度1）.png new file mode 100644 index 00000000..0de85ef8 Binary files /dev/null and b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度1）.png differ diff --git a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度1）.png.meta b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度1）.png.meta new file mode 100644 index 00000000..9ad27bce --- /dev/null +++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度1）.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 09f3443a49251594b9e90ee00cb2cbfe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度2）.png b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度2）.png new file mode 100644 index 00000000..aadaf594 Binary files /dev/null and b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度2）.png differ diff --git a/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度2）.png.meta b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度2）.png.meta new file mode 100644 index 00000000..2af2db32 --- /dev/null +++ b/BulkCargo_UnityProject/Assets/GameAssets/UITextures/福州海关散货系统（文件+切图）/切图/bg-弹窗（透明度2）.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 8bd5b470d052489459a8a41bbe6cd108 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BulkCargo_UnityProject/Assets/MiniMap/Editor/MiniMapManagerEditor.cs b/BulkCargo_UnityProject/Assets/MiniMap/Editor/MiniMapManagerEditor.cs index 89f48a82..0c867f8c 100644 --- a/BulkCargo_UnityProject/Assets/MiniMap/Editor/MiniMapManagerEditor.cs +++ b/BulkCargo_UnityProject/Assets/MiniMap/Editor/MiniMapManagerEditor.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEditor; using UnityEngine.UIElements; +using static UnityEngine.GraphicsBuffer; [CustomEditor(typeof(MiniMapManager))] public class MiniMapManagerEditor : Editor @@ -87,16 +88,24 @@ public class MiniMapManagerEditor : Editor SerializedProperty OriginTransform; SerializedProperty MiniMap; SerializedProperty PlayerInMap; + SerializedProperty FullScreenMiniMapOrthographicSize; SerializedProperty DragSpeed; SerializedProperty ZoomSpeed; - //SerializedProperty OrthographicSizeClamp; - SerializedProperty MinOrthographicSize; + SerializedProperty OrthographicSizeClamp; + + SerializedProperty MiniMapTransport; + SerializedProperty MiniMapRayLayer; + SerializedProperty RayDistance; bool use_chinese; + MiniMapManager _target; + protected virtual void OnEnable() { + _target = target as MiniMapManager; + KeepPlayerInMiniMapCenter = serializedObject.FindProperty("KeepPlayerInMiniMapCenter"); MiniCamera = serializedObject.FindProperty("MiniCamera"); Player = serializedObject.FindProperty("Player"); @@ -108,8 +117,11 @@ public class MiniMapManagerEditor : Editor DragSpeed = serializedObject.FindProperty("DragSpeed"); ZoomSpeed = serializedObject.FindProperty("ZoomSpeed"); - //OrthographicSizeClamp = serializedObject.FindProperty("OrthographicSizeClamp"); - MinOrthographicSize = serializedObject.FindProperty("MinOrthographicSize"); + OrthographicSizeClamp = serializedObject.FindProperty("OrthographicSizeClamp"); + + MiniMapTransport = serializedObject.FindProperty("MiniMapTransport"); + MiniMapRayLayer = serializedObject.FindProperty("MiniMapRayLayer"); + RayDistance = serializedObject.FindProperty("RayDistance"); } public override void OnInspectorGUI() @@ -133,9 +145,18 @@ public class MiniMapManagerEditor : Editor EditorGUILayout.PropertyField(FullScreenMiniMapOrthographicSize, new GUIContent(use_chinese ? "СͼȫͼʱߴС" : FullScreenMiniMapOrthographicSize.name)); EditorGUILayout.PropertyField(DragSpeed, new GUIContent(use_chinese ? "Сͼקٶ" : DragSpeed.name)); EditorGUILayout.PropertyField(ZoomSpeed, new GUIContent(use_chinese ? "Сͼٶ" : ZoomSpeed.name)); - //EditorGUILayout.PropertyField(OrthographicSizeClamp, new GUIContent(use_chinese ? "СͼƷΧ" : OrthographicSizeClamp.name)); - EditorGUILayout.PropertyField(MinOrthographicSize, new GUIContent(use_chinese ? "СͼƷΧ" : MinOrthographicSize.name)); + EditorGUILayout.PropertyField(OrthographicSizeClamp, new GUIContent(use_chinese ? "СͼƷΧ" : OrthographicSizeClamp.name)); + GUILayout.Space(5); + GUILayout.Label("Сͼ"); + GUILayout.Space(5); + + EditorGUILayout.PropertyField(MiniMapTransport, new GUIContent(use_chinese ? "ǷСͼ" : MiniMapTransport.name)); + if (_target.MiniMapTransport) + { + EditorGUILayout.PropertyField(MiniMapRayLayer, new GUIContent(use_chinese ? "Сͼ߼" : MiniMapRayLayer.name)); + EditorGUILayout.PropertyField(RayDistance, new GUIContent(use_chinese ? "߾" : RayDistance.name)); + } serializedObject.ApplyModifiedProperties(); } diff --git a/BulkCargo_UnityProject/Assets/MiniMap/Prefabs/MiniMapRoot.prefab b/BulkCargo_UnityProject/Assets/MiniMap/Prefabs/MiniMapRoot.prefab index d2b99e88..9cd7d393 100644 --- a/BulkCargo_UnityProject/Assets/MiniMap/Prefabs/MiniMapRoot.prefab +++ b/BulkCargo_UnityProject/Assets/MiniMap/Prefabs/MiniMapRoot.prefab @@ -155,7 +155,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 23 + m_Bits: 4294967295 m_RenderingPath: -1 m_TargetTexture: {fileID: 8400000, guid: eb2348187ce6e8342b18435f608b12a5, type: 2} m_TargetDisplay: 0 @@ -179,7 +179,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - m_RenderShadows: 1 + m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 @@ -287,6 +287,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d1616ef1655c92d4582abd6baa9bfc90, type: 3} m_Name: m_EditorClassIdentifier: + MapFrameRectTransform: {fileID: 3896793119978184412} + SizeScale: {x: 0, y: 0} --- !u!1 &3896793119596260640 GameObject: m_ObjectHideFlags: 0 @@ -407,7 +409,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 60} m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0, y: 0} --- !u!222 &3896793119978184411 @@ -619,7 +621,12 @@ MonoBehaviour: orthographicSizeRate: 0 DragSpeed: 0.5 ZoomSpeed: 1 - MinOrthographicSize: 20 + OrthographicSizeClamp: {x: 5, y: 15} + MiniMapTransport: 1 + MiniMapRayLayer: + serializedVersion: 2 + m_Bits: 2147483647 + RayDistance: 1000 --- !u!1 &3896793120727956044 GameObject: m_ObjectHideFlags: 0 diff --git a/BulkCargo_UnityProject/Assets/MiniMap/Scenes/MiniMapDemo.unity b/BulkCargo_UnityProject/Assets/MiniMap/Scenes/MiniMapDemo.unity index 39ed63e2..84b42122 100644 --- a/BulkCargo_UnityProject/Assets/MiniMap/Scenes/MiniMapDemo.unity +++ b/BulkCargo_UnityProject/Assets/MiniMap/Scenes/MiniMapDemo.unity @@ -1285,6 +1285,75 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1796139520} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1930899385 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3896793120661545789, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_Name + value: MiniMapRoot + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ed7444d8edc56e741ae55811aa53b43b, type: 3} --- !u!1 &2060622013 GameObject: m_ObjectHideFlags: 0 @@ -1542,77 +1611,3 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3896793119409442310 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalPosition.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545786, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3896793120661545787, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: Player - value: - objectReference: {fileID: 2093585512} - - target: {fileID: 3896793120661545789, guid: ed7444d8edc56e741ae55811aa53b43b, - type: 3} - propertyPath: m_Name - value: MiniMapRoot - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ed7444d8edc56e741ae55811aa53b43b, type: 3} diff --git a/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMap.cs b/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMap.cs index 8931bdd5..45958603 100644 --- a/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMap.cs +++ b/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMap.cs @@ -10,11 +10,19 @@ public class MiniMap : MonoBehaviour, IPointerDownHandler, IPointerMoveHandler, /// ű /// MiniMapManager m_MiniMapManager; - + /// + /// Ƿ񱣳ס״̬ + /// bool hold; + /// + /// µ + /// + Vector2 PointDownPos; + public void OnPointerDown(PointerEventData eventData) { hold = eventData.button == PointerEventData.InputButton.Left; + PointDownPos = eventData.position; } public void OnPointerExit(PointerEventData eventData) @@ -26,6 +34,7 @@ public class MiniMap : MonoBehaviour, IPointerDownHandler, IPointerMoveHandler, { if (hold) { + m_MiniMapManager.MiniCamera.transform.position += new Vector3(-eventData.delta.x, 0, -eventData.delta.y) * m_MiniMapManager.DragSpeed * 0.1f * m_MiniMapManager.orthographicSizeRate; //ֵҪorthographicSize @@ -47,13 +56,27 @@ public class MiniMap : MonoBehaviour, IPointerDownHandler, IPointerMoveHandler, public void OnPointerUp(PointerEventData eventData) { hold = false; + if (m_MiniMapManager.MiniMapTransport) + { + if (eventData.position == PointDownPos) + { + //Debug.Log($"Click Point: {eventData.position}"); + //Ҫʹ߼⣬ + var _transPoint = new Vector2((eventData.position.x - MapFrameRectTransform.anchoredPosition.x) * SizeScale.x, (eventData.position.y - MapFrameRectTransform.anchoredPosition.y) * SizeScale.y); + var _ray = m_MiniMapManager.MiniCamera.ScreenPointToRay(_transPoint); + Debug.DrawRay(_ray.origin, _ray.direction * 1000, Color.blue, 10); + if (Physics.Raycast(_ray, out RaycastHit _hit, m_MiniMapManager.RayDistance, m_MiniMapManager.MiniMapRayLayer)) + { + m_MiniMapManager.TransportPlayer(_hit.point); + } + } + } } public void OnScroll(PointerEventData eventData) { m_MiniMapManager.MiniCamera.orthographicSize -= eventData.scrollDelta.y * m_MiniMapManager.ZoomSpeed; - //m_MiniMapManager.MiniCamera.orthographicSize = Mathf.Clamp(m_MiniMapManager.MiniCamera.orthographicSize, m_MiniMapManager.OrthographicSizeClamp.x, m_MiniMapManager.OrthographicSizeClamp.y); - m_MiniMapManager.MiniCamera.orthographicSize = Mathf.Clamp(m_MiniMapManager.MiniCamera.orthographicSize, m_MiniMapManager.MinOrthographicSize, m_MiniMapManager.FullScreenMiniMapOrthographicSize); + m_MiniMapManager.MiniCamera.orthographicSize = Mathf.Clamp(m_MiniMapManager.MiniCamera.orthographicSize, m_MiniMapManager.OrthographicSizeClamp.x, m_MiniMapManager.OrthographicSizeClamp.y); var clamp_value = m_MiniMapManager.MiniCamera.orthographicSize - m_MiniMapManager.FullScreenMiniMapOrthographicSize; @@ -68,6 +91,15 @@ public class MiniMap : MonoBehaviour, IPointerDownHandler, IPointerMoveHandler, } } + /// + /// ͼ߿ + /// + public RectTransform MapFrameRectTransform; + + /// + /// ת + /// + public Vector2 SizeScale; // Start is called before the first frame update void Start() { @@ -76,5 +108,6 @@ public class MiniMap : MonoBehaviour, IPointerDownHandler, IPointerMoveHandler, { this.enabled = false; } + SizeScale = new Vector2(m_MiniMapManager.MiniCamera.targetTexture.width / MapFrameRectTransform.rect.width, m_MiniMapManager.MiniCamera.targetTexture.height / MapFrameRectTransform.rect.height); } } diff --git a/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMapManager.cs b/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMapManager.cs index 4ebc5efc..5aca619c 100644 --- a/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMapManager.cs +++ b/BulkCargo_UnityProject/Assets/MiniMap/Scripts/MiniMapManager.cs @@ -1,5 +1,7 @@ using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting.Dependencies.NCalc; +using UnityEditor.Experimental.GraphView; using UnityEngine; public class MiniMapManager : MonoBehaviour @@ -74,8 +76,20 @@ public class MiniMapManager : MonoBehaviour /// ųߴ /// СֵӦ0 /// - //public Vector2 OrthographicSizeClamp = new Vector2(5, 15); - public float MinOrthographicSize = 20; + public Vector2 OrthographicSizeClamp = new Vector2(5, 15); + + /// + /// ǷСͼ + /// + public bool MiniMapTransport; + /// + /// Сͼ߼ + /// + public LayerMask MiniMapRayLayer; + /// + /// ߾ + /// + public float RayDistance = 1000; // Start is called before the first frame update void Start() { @@ -132,4 +146,22 @@ public class MiniMapManager : MonoBehaviour PlayerInMap.anchoredPosition = new Vector2(MiniMap.rect.height * heightRate, MiniMap.rect.width * widthRate) / orthographicSizeRate; } } + + /// + /// + /// + /// + public void TransportPlayer(Vector3 _point) + { + CameraMove.Instance.ShieldingOperation = true; + if (Player.position.y - _point.y > 0) + { + Player.position = new Vector3(_point.x, Player.position.y, _point.z); + } + else + { + Player.position = new Vector3(_point.x, _point.y + 1, _point.z); + } + CameraMove.Instance.ReInitTransform(); + } } diff --git a/BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab b/BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab index 11cf3c63..1fccbbdf 100644 --- a/BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab +++ b/BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab @@ -78423,7 +78423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 523225d195de0e047bec42efdf4e94b8, type: 3} + m_Sprite: {fileID: 21300000, guid: 8bd5b470d052489459a8a41bbe6cd108, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity b/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity index 6bce0516..c076568d 100644 --- a/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity +++ b/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity @@ -3773,7 +3773,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -48, y: 29} - m_SizeDelta: {x: 223, y: 223} + m_SizeDelta: {x: 133.8, y: 133.8} m_Pivot: {x: 1, y: 0} --- !u!114 &1674400509 MonoBehaviour: @@ -3912,7 +3912,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 9000 + far clip plane: 9200 field of view: 60 orthographic: 0 orthographic size: 5 @@ -3938,14 +3938,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1701869329} - m_LocalRotation: {x: -0.032324355, y: -0.958363, z: 0.25679263, w: -0.12063611} - m_LocalPosition: {x: -40.39758, y: 237.4118, z: 688.6841} + m_LocalRotation: {x: -0.066452235, y: -0.9098438, z: 0.37686956, w: -0.16042991} + m_LocalPosition: {x: -195, y: 500, z: 670} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 30, y: -194.349, z: 0} + m_LocalEulerAnglesHint: {x: 45, y: -200, z: 0} --- !u!114 &1701869334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3969,7 +3969,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -5725,6 +5725,11 @@ PrefabInstance: propertyPath: orthographic size value: 300 objectReference: {fileID: 0} + - target: {fileID: 3896793119431439233, guid: ed7444d8edc56e741ae55811aa53b43b, + type: 3} + propertyPath: m_CullingMask.m_Bits + value: 23 + objectReference: {fileID: 0} - target: {fileID: 3896793119431439234, guid: ed7444d8edc56e741ae55811aa53b43b, type: 3} propertyPath: m_LocalPosition.x diff --git a/BulkCargo_UnityProject/Assets/Scenes/福州海关/蓉城海关/华能（福建）海港有限公司海关监管场所.unity b/BulkCargo_UnityProject/Assets/Scenes/福州海关/蓉城海关/华能（福建）海港有限公司海关监管场所.unity index f45dc55a..0013a200 100644 --- a/BulkCargo_UnityProject/Assets/Scenes/福州海关/蓉城海关/华能（福建）海港有限公司海关监管场所.unity +++ b/BulkCargo_UnityProject/Assets/Scenes/福州海关/蓉城海关/华能（福建）海港有限公司海关监管场所.unity @@ -219,6 +219,36 @@ Transform: type: 3} m_PrefabInstance: {fileID: 27276868} m_PrefabAsset: {fileID: 0} +--- !u!114 &51377579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013602} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} +--- !u!114 &51452949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!4 &59420247 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 980a114d4ae91e4488b70f2c91087d0d, @@ -641,7 +671,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &148406087 Transform: @@ -738,7 +768,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 148406086} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -5464,21 +5494,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!114 &148461185 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &148461186 BoxCollider: m_ObjectHideFlags: 0 @@ -5492,21 +5507,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0} m_Center: {x: 0.000076293945, y: -0.0000061988685, z: 0} ---- !u!114 &157020361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013586} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &157020362 BoxCollider: m_ObjectHideFlags: 0 @@ -5520,16 +5520,16 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0} m_Center: {x: 0.000045776367, y: 0.0004515648, z: 0} ---- !u!114 &191936706 +--- !u!114 &168188086 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013607} + m_GameObject: {fileID: 1504013586} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} m_Name: m_EditorClassIdentifier: DeviceType: 0 @@ -6047,7 +6047,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &271908280 Transform: @@ -6058,7 +6058,7 @@ Transform: m_GameObject: {fileID: 271908279} m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.94537354, y: 1.0429193, z: 0.362455} - m_LocalScale: {x: 3.5, y: 1, z: 29.499992} + m_LocalScale: {x: 3.5, y: 1, z: 27} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5332504561705545598} @@ -6192,7 +6192,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &341412931 Transform: @@ -6595,21 +6595,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 361159385} m_PrefabAsset: {fileID: 0} ---- !u!114 &363879152 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013595} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &363879153 BoxCollider: m_ObjectHideFlags: 0 @@ -6941,7 +6926,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &414037409 Transform: @@ -7038,7 +7023,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414037408} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -11844,6 +11829,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 422163937} m_PrefabAsset: {fileID: 0} +--- !u!114 &422379310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1 &452556474 GameObject: m_ObjectHideFlags: 0 @@ -11971,21 +11971,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 461523151} m_PrefabAsset: {fileID: 0} ---- !u!114 &465561772 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013596} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &465561773 BoxCollider: m_ObjectHideFlags: 0 @@ -12018,7 +12003,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &507878041 Transform: @@ -12236,21 +12221,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &521496420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &521496421 BoxCollider: m_ObjectHideFlags: 0 @@ -12264,21 +12234,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0} m_Center: {x: 0, y: -0.0001282692, z: 0} ---- !u!114 &544163767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013600} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &544163768 BoxCollider: m_ObjectHideFlags: 0 @@ -12292,21 +12247,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.000000034778566} m_Center: {x: -0.000011444092, y: -0.00052499765, z: -5} ---- !u!114 &552338767 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013602} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &552338768 BoxCollider: m_ObjectHideFlags: 0 @@ -12581,21 +12521,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 604663167} m_PrefabAsset: {fileID: 0} ---- !u!114 &604992683 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013609} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &604992684 BoxCollider: m_ObjectHideFlags: 0 @@ -12905,6 +12830,36 @@ MonoBehaviour: DeviceType: 1 DeviceIndex: DeviceUI: {fileID: 0} +--- !u!114 &636360118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} +--- !u!114 &675699724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013596} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1 &690684751 GameObject: m_ObjectHideFlags: 0 @@ -12924,7 +12879,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &690684752 Transform: @@ -13143,7 +13098,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &717536050 Transform: @@ -13263,7 +13218,7 @@ MonoBehaviour: - {fileID: 31756126100262334} - {fileID: 8392404681504990491} renderer_Ground: {fileID: 717536053} ---- !u!114 &744138413 +--- !u!114 &739194065 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13272,7 +13227,7 @@ MonoBehaviour: m_GameObject: {fileID: 1504013589} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} m_Name: m_EditorClassIdentifier: DeviceType: 0 @@ -14130,21 +14085,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 899362128} m_PrefabAsset: {fileID: 0} ---- !u!114 &925957605 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013604} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &925957606 BoxCollider: m_ObjectHideFlags: 0 @@ -14158,6 +14098,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.0000000086946415} m_Center: {x: 0.000076293945, y: -0.00040292737, z: -0.49999988} +--- !u!114 &931172651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &962939671 PrefabInstance: m_ObjectHideFlags: 0 @@ -14534,6 +14489,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1002137697} m_PrefabAsset: {fileID: 0} +--- !u!114 &1005203510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1007397980 PrefabInstance: m_ObjectHideFlags: 0 @@ -14630,7 +14600,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &1009662999 Transform: @@ -14727,7 +14697,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1009662998} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -20004,6 +19974,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1111995058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1124091286 PrefabInstance: m_ObjectHideFlags: 0 @@ -20259,21 +20244,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1142308797} m_PrefabAsset: {fileID: 0} ---- !u!114 &1156660493 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013599} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1156660494 BoxCollider: m_ObjectHideFlags: 0 @@ -20456,21 +20426,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a82806da5c454734f835493fd914ba51, type: 3} ---- !u!114 &1171626050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013591} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1171626051 BoxCollider: m_ObjectHideFlags: 0 @@ -20503,7 +20458,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &1185296015 Transform: @@ -20703,6 +20658,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1201500902} m_PrefabAsset: {fileID: 0} +--- !u!114 &1228799835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1247747296 PrefabInstance: m_ObjectHideFlags: 0 @@ -21021,21 +20991,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1265497891} m_PrefabAsset: {fileID: 0} ---- !u!114 &1266027166 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013605} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1266027167 BoxCollider: m_ObjectHideFlags: 0 @@ -21479,21 +21434,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1376220322} m_PrefabAsset: {fileID: 0} ---- !u!114 &1392613959 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013598} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1392613960 BoxCollider: m_ObjectHideFlags: 0 @@ -22242,21 +22182,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1489180198} m_PrefabAsset: {fileID: 0} ---- !u!114 &1502660612 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013597} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1502660613 BoxCollider: m_ObjectHideFlags: 0 @@ -22875,10 +22800,10 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013606} + m_GameObject: {fileID: 1504013607} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} m_Name: m_EditorClassIdentifier: DeviceType: 0 @@ -22903,10 +22828,10 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013608} + m_GameObject: {fileID: 1504013606} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} m_Name: m_EditorClassIdentifier: DeviceType: 0 @@ -22931,10 +22856,10 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013610} + m_GameObject: {fileID: 1504013608} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} m_Name: m_EditorClassIdentifier: DeviceType: 0 @@ -22953,6 +22878,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0} m_Center: {x: -0.000045776367, y: -0.00010538101, z: 0} +--- !u!114 &1504013617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013610} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1519005341 PrefabInstance: m_ObjectHideFlags: 0 @@ -23042,6 +22982,21 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a82806da5c454734f835493fd914ba51, type: 3} +--- !u!114 &1528496646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013609} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1534874058 PrefabInstance: m_ObjectHideFlags: 0 @@ -23763,7 +23718,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &1685493383 Transform: @@ -23860,7 +23815,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1685493382} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -28711,6 +28666,21 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1713282140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1717412529 PrefabInstance: m_ObjectHideFlags: 0 @@ -29048,7 +29018,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &1815889330 Transform: @@ -29145,7 +29115,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1815889329} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -34040,21 +34010,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1823370508} m_PrefabAsset: {fileID: 0} ---- !u!114 &1832410378 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013603} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1832410379 BoxCollider: m_ObjectHideFlags: 0 @@ -34068,6 +34023,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.000000034778566} m_Center: {x: 0.000015258789, y: -0.00052499765, z: -5} +--- !u!114 &1832410380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1835477927 PrefabInstance: m_ObjectHideFlags: 0 @@ -34179,7 +34149,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &1836384018 Transform: @@ -34276,7 +34246,7 @@ ParticleSystem: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1836384017} serializedVersion: 8 - lengthInSec: 5 + lengthInSec: 1 simulationSpeed: 1 stopAction: 0 cullingMode: 0 @@ -39097,21 +39067,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1836397147} m_PrefabAsset: {fileID: 0} ---- !u!114 &1839878693 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013587} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1839878694 BoxCollider: m_ObjectHideFlags: 0 @@ -39125,6 +39080,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.0000000086946415} m_Center: {x: 0.000045776367, y: 0.00026845932, z: 0.00000011920929} +--- !u!114 &1839878695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013587} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &1844965110 PrefabInstance: m_ObjectHideFlags: 0 @@ -39574,21 +39544,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1879677218} m_PrefabAsset: {fileID: 0} ---- !u!114 &1909451227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013592} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &1909451228 BoxCollider: m_ObjectHideFlags: 0 @@ -39602,6 +39557,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.0000000086946415} m_Center: {x: 0.000076293945, y: -0.00009775161, z: -0.49999988} +--- !u!114 &1909451229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!4 &1922674118 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a82806da5c454734f835493fd914ba51, @@ -40389,21 +40359,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2050940616} m_PrefabAsset: {fileID: 0} ---- !u!114 &2052183639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013590} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &2052183640 BoxCollider: m_ObjectHideFlags: 0 @@ -40417,6 +40372,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0} m_Center: {x: 0, y: 0.0001091957, z: 0} +--- !u!114 &2052183641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &2053606554 PrefabInstance: m_ObjectHideFlags: 0 @@ -40586,16 +40556,16 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2065784613} m_PrefabAsset: {fileID: 0} ---- !u!114 &2093927075 +--- !u!114 &2090994351 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013594} + m_GameObject: {fileID: 1504013600} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} m_Name: m_EditorClassIdentifier: DeviceType: 0 @@ -40614,6 +40584,36 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.0000000086946415} m_Center: {x: 0.000015258789, y: 0.00026845932, z: 0.00000011920929} +--- !u!114 &2093927077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013594} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} +--- !u!114 &2109359830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &2131493957 PrefabInstance: m_ObjectHideFlags: 0 @@ -40709,21 +40709,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2131493957} m_PrefabAsset: {fileID: 0} ---- !u!114 &2145418070 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1504013601} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 664453e88152fe6429a5bcf681ac120a, type: 3} - m_Name: - m_EditorClassIdentifier: - DeviceType: 0 - DeviceIndex: - DeviceUI: {fileID: 0} --- !u!65 &2145418071 BoxCollider: m_ObjectHideFlags: 0 @@ -40737,6 +40722,21 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 58.2032, y: 18.671604, z: 0.000000034778566} m_Center: {x: 0.000015258789, y: -0.00052499765, z: -5} +--- !u!114 &2145418072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1504013601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6096461c8dcb2884a8a5e639ea76e811, type: 3} + m_Name: + m_EditorClassIdentifier: + DeviceType: 0 + DeviceIndex: + DeviceUI: {fileID: 0} --- !u!1001 &2146884286 PrefabInstance: m_ObjectHideFlags: 0 @@ -40885,7 +40885,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &66019372070679870 GameObject: @@ -41139,7 +41139,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &373244850526701920 MeshFilter: @@ -41186,7 +41186,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &454823859003597826 Transform: @@ -41217,7 +41217,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!23 &500914060096025312 MeshRenderer: @@ -41814,7 +41814,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &1311205889631818458 GameObject: @@ -41834,7 +41834,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &1382726777938869136 GameObject: @@ -42002,7 +42002,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &1561460911281706629 GameObject: @@ -42022,7 +42022,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &1567739152357342542 MeshFilter: @@ -42577,7 +42577,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &2627935901737016475 GameObject: @@ -42597,7 +42597,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &2649373770970233241 GameObject: @@ -42716,7 +42716,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!23 &2782638515674195408 MeshRenderer: @@ -42778,7 +42778,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &2953757273725866472 Transform: @@ -42989,7 +42989,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!23 &3328107285758826120 MeshRenderer: @@ -43198,7 +43198,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &3483901720481452429 Transform: @@ -43460,7 +43460,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &3614807707506630965 MeshFilter: @@ -43534,7 +43534,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &3665477800000872538 Transform: @@ -43588,7 +43588,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &3772808899108192812 Transform: @@ -43661,7 +43661,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &3912606345510446680 GameObject: @@ -43681,7 +43681,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &3957539019067674376 MeshFilter: @@ -44129,7 +44129,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!1 &4463229980563719436 GameObject: @@ -44225,7 +44225,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!23 &4574062420235472890 MeshRenderer: @@ -44368,7 +44368,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &4674364345985765847 MeshFilter: @@ -44521,7 +44521,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!114 &4862684186697871329 MonoBehaviour: @@ -44549,7 +44549,7 @@ MeshCollider: m_GameObject: {fileID: 4862684186697871328} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -44664,7 +44664,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!4 &5038169495330174595 Transform: @@ -44900,7 +44900,7 @@ MeshCollider: m_GameObject: {fileID: 47850842014905683} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -45297,7 +45297,7 @@ MeshCollider: m_GameObject: {fileID: 3912606345510446680} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -45396,7 +45396,7 @@ MeshCollider: m_GameObject: {fileID: 1508472220836852333} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -45588,7 +45588,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!23 &6151109134305084863 MeshRenderer: @@ -45755,7 +45755,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!114 &6298699686942498219 MonoBehaviour: @@ -45783,7 +45783,7 @@ MeshCollider: m_GameObject: {fileID: 6298699686942498218} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46145,7 +46145,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &6865148979451384361 MeshFilter: @@ -46173,7 +46173,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!114 &6911104809143676607 MonoBehaviour: @@ -46201,7 +46201,7 @@ MeshCollider: m_GameObject: {fileID: 6911104809143676606} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46331,7 +46331,7 @@ MeshCollider: m_GameObject: {fileID: 3881423447833452357} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46403,7 +46403,7 @@ MeshCollider: m_GameObject: {fileID: 1269311655072754006} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46597,7 +46597,7 @@ MeshCollider: m_GameObject: {fileID: 2845526218500119884} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46651,7 +46651,7 @@ MeshCollider: m_GameObject: {fileID: 4570076910002914209} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46902,7 +46902,7 @@ MeshCollider: m_GameObject: {fileID: 1311205889631818458} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -46948,7 +46948,7 @@ MeshCollider: m_GameObject: {fileID: 3285176226731684466} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47064,7 +47064,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!33 &7826478647566332201 MeshFilter: @@ -47170,7 +47170,7 @@ MeshCollider: m_GameObject: {fileID: 4448004527154455163} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47224,7 +47224,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!114 &7989374221221375873 MonoBehaviour: @@ -47252,7 +47252,7 @@ MeshCollider: m_GameObject: {fileID: 7989374221221375872} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47462,7 +47462,7 @@ MeshCollider: m_GameObject: {fileID: 6864219395193432696} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47637,7 +47637,7 @@ MeshCollider: m_GameObject: {fileID: 6115130600533236934} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47710,7 +47710,7 @@ MeshCollider: m_GameObject: {fileID: 2776204862681890223} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47817,7 +47817,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 + m_StaticEditorFlags: 0 m_IsActive: 1 --- !u!114 &8447146709214204514 MonoBehaviour: @@ -47845,7 +47845,7 @@ MeshCollider: m_GameObject: {fileID: 8447146709214204513} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -47982,7 +47982,7 @@ MeshCollider: m_GameObject: {fileID: 3459088485135628185} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -48028,7 +48028,7 @@ MeshCollider: m_GameObject: {fileID: 2604301357345175538} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -48221,7 +48221,7 @@ MeshCollider: m_GameObject: {fileID: 3600291122407306824} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -48294,7 +48294,7 @@ MeshCollider: m_GameObject: {fileID: 2627935901737016475} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -48474,7 +48474,7 @@ MeshCollider: m_GameObject: {fileID: 1561460911281706629} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 @@ -48531,7 +48531,7 @@ MeshCollider: m_GameObject: {fileID: 365711846234564147} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Camera/CameraRoamManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Camera/CameraRoamManager.cs index c4f98c7e..240b0dbf 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Camera/CameraRoamManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Camera/CameraRoamManager.cs @@ -156,7 +156,6 @@ public class CameraRoamManager : Singleton } else { - CameraMove.Instance.ShieldingOperation = false; if (m_RoamingTween != null) { if (_roam_continue) @@ -164,6 +163,7 @@ public class CameraRoamManager : Singleton m_RoamingTween.Pause(); } } + CameraMove.Instance.ReInitTransform(); } } } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraController.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraController.cs index c3046212..90184bcc 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraController.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraController.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using DG.Tweening; using UnityEngine.UIElements; +using UnityEditor.Search; public class CameraController : MonoBehaviour { @@ -58,7 +59,9 @@ public class CameraController : MonoBehaviour horizontal = eulerx = myLocalAng.eulerAngles.y; vertical = eulery = myLocalAng.eulerAngles.x; if (vertical > 180) - vertical -= 360; + { + eulery = vertical -= 360; + } myPos = transform.position; } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs index 8aca783d..aa62fd35 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs @@ -135,6 +135,19 @@ public class CameraMove : CameraController #region Զ幦 + /// + /// + /// + public void ReInitTransform() + { + Target = null; + ShieldingOperation = true; + InitTransform(); + init_position = transform.position; + init_rotation = transform.eulerAngles; + ShieldingOperation = false; + } + public void KillAllTween() { DOTween.Kill(transform); diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs new file mode 100644 index 00000000..722a7a48 --- /dev/null +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class CameraDevice : DeviceBase +{ + /// + /// Ƿÿɼ״̬ + /// + public void SetActiveState() + { + DeviceUI.gameObject.SetActive(T_BAS_CAMERA != null); + } +} diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs.meta b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs.meta new file mode 100644 index 00000000..4e25d160 --- /dev/null +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6096461c8dcb2884a8a5e639ea76e811 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/DeviceBase.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/DeviceBase.cs index 8d07ac30..f57eebb3 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/DeviceBase.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/DeviceBase.cs @@ -20,7 +20,7 @@ public class DeviceBase : MonoBehaviour /// /// ͷб /// - public static List CameraList = new List(); + public static List CameraList = new List(); /// /// б /// @@ -64,7 +64,7 @@ public class DeviceBase : MonoBehaviour switch (DeviceType) { case DeviceType.CAMERA: - CameraList.Add(this); + CameraList.Add(this as CameraDevice); DeviceIndex = transform.name.Split('_')[1]; //transform.parent.GetComponent().enabled = false; break; diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/YardDevice.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/YardDevice.cs index 1ffb9821..e280e68a 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/YardDevice.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/YardDevice.cs @@ -1,126 +1,227 @@ -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; - -/// -/// ѳ -/// -public class YardDevice : DeviceBase -{ - /// - /// λ - /// - public WeightUnit WeightUnit; - /// - /// µȾ - /// - public List MeshRenderers = new List(); - - /// - /// Զѷ - /// ѷͬ - /// - public bool AutoAllocationWeight = true; - /// - /// öѳж - /// - public List Piles = new List(); - /// - /// ѳѷ - /// - public float YardMaxWeight; - /// - /// չʾСٷֱ - /// - [Range(0, 1)] - public float MinimumPercentage = 0.1f; - +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.EventSystems; +using XCharts.Runtime; + +/// +/// ѳ +/// +public class YardDevice : DeviceBase +{ + /// + /// λ + /// + public WeightUnit WeightUnit; + /// + /// µȾ + /// + public List MeshRenderers = new List(); + + /// + /// Զѷ + /// ѷͬ + /// + public bool AutoAllocationWeight = true; + /// + /// öѳж + /// + public List Piles = new List(); + /// + /// ѳѷ + /// + public float YardMaxWeight; + /// + /// չʾСٷֱ + /// + [Range(0, 1)] + public float MinimumPercentage = 0.1f; + /// /// Ч - /// - public ParticleSystem ParticleSystem; - - /// - /// ˸ű - /// - private Shark shark; - public override void Awake() - { - base.Awake(); - MeshRenderers = transform.parent.GetComponentsInChildren().ToList(); - Piles = transform.parent.GetComponentsInChildren().ToList(); - shark = GetComponent(); - ParticleSystem = transform.parent.GetComponentInChildren(); - if (AutoAllocationWeight) - { - for (int i = 0; i < Piles.Count; i++) - { - Piles[i].Init(YardMaxWeight / Piles.Count, MinimumPercentage); - } - } - } - - public void SetOutLine(bool _enable) - { - if (_enable) - { - for (int i = 0; i < MeshRenderers.Count; i++) - { - MeshRenderers[i].material.EnableKeyword("_ENABLE"); - } - ParticleSystem?.Play(); - //shark.StartShak(); - } - else - { - for (int i = 0; i < MeshRenderers.Count; i++) - { - MeshRenderers[i].material.DisableKeyword("_ENABLE"); - } - ParticleSystem?.Stop(); - //shark.StopShak(); - } - } - - /// - /// ¶ѷ - /// - public void UpdateYardWeight(float _weight) - { - ResetPiles(); - if (_weight > YardMaxWeight) - { - Piles.ForEach(x => x.UpdateWeight(YardMaxWeight / Piles.Count)); - return; - } - if (AutoAllocationWeight) - { - var _use_pile_count = Mathf.FloorToInt(_weight / (YardMaxWeight / Piles.Count)); - if (_use_pile_count == 0) - { - Piles[0].UpdateWeight(_weight); - } - else - { - for (int i = 0; i < _use_pile_count; i++) - { - Piles[i].UpdateWeight(YardMaxWeight / Piles.Count); - } - //ʣûIJ - Piles[_use_pile_count].UpdateWeight(_weight % (YardMaxWeight / Piles.Count)); - } - } - } - - /// - /// Pile - /// - public void ResetPiles() - { - for (int i = 0; i < Piles.Count; i++) - { - Piles[i].gameObject.SetActive(false); - } - } -} + /// + public ParticleSystem ParticleSystem; + + /// + /// ѡ + /// + private bool Selected; + + /// + /// ѡеĶѳ + /// + public static YardDevice SelectedYardDevice; + + /// + /// ˸ű + /// + private Shark shark; + + /// + /// ɫ + /// + Color HoverColor = new Color(0, 0, 1, 0.5f); + /// + /// ѡɫ + /// + Color SelectColor = new Color(0, 1, 0, 0.5f); + public override void Awake() + { + base.Awake(); + MeshRenderers = transform.parent.GetComponentsInChildren().ToList(); + Piles = transform.parent.GetComponentsInChildren().ToList(); + shark = GetComponent(); + ParticleSystem = transform.parent.GetComponentInChildren(); + if (AutoAllocationWeight) + { + for (int i = 0; i < Piles.Count; i++) + { + Piles[i].Init(YardMaxWeight / Piles.Count, MinimumPercentage); + } + } + } + + public void SetOutLine(bool _enable) + { + if (_enable) + { + for (int i = 0; i < MeshRenderers.Count; i++) + { + MeshRenderers[i].material.EnableKeyword("_ENABLE"); + } + //SetOnHoverd(true); + //shark.StartShak(); + } + else + { + for (int i = 0; i < MeshRenderers.Count; i++) + { + MeshRenderers[i].material.DisableKeyword("_ENABLE"); + } + //SetOnHoverd(false); + //shark.StopShak(); + } + } + + /// + /// ¶ѷ + /// + public void UpdateYardWeight(float _weight) + { + ResetPiles(); + if (_weight > YardMaxWeight) + { + Piles.ForEach(x => x.UpdateWeight(YardMaxWeight / Piles.Count)); + return; + } + if (AutoAllocationWeight) + { + var _use_pile_count = Mathf.FloorToInt(_weight / (YardMaxWeight / Piles.Count)); + if (_use_pile_count == 0) + { + Piles[0].UpdateWeight(_weight); + } + else + { + for (int i = 0; i < _use_pile_count; i++) + { + Piles[i].UpdateWeight(YardMaxWeight / Piles.Count); + } + //ʣûIJ + Piles[_use_pile_count].UpdateWeight(_weight % (YardMaxWeight / Piles.Count)); + } + } + } + + /// + /// Pile + /// + public void ResetPiles() + { + for (int i = 0; i < Piles.Count; i++) + { + Piles[i].gameObject.SetActive(false); + } + } + + private void OnMouseEnter() + { + if (!EventSystem.current.IsPointerOverGameObject()) + { + //ParticleSystem.MainModule _main = ParticleSystem.main; + //_main.startColor = HoverColor; + + //ParticleSystem.Play(); + SetOnHoverd(true); + } + } + + private void OnMouseExit() + { + if (!Selected) + { + //ParticleSystem.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); + SetOnHoverd(false); + } + } + + private void OnMouseDown() + { + if (!EventSystem.current.IsPointerOverGameObject()) + { + if (SelectedYardDevice != null && SelectedYardDevice != this) + { + SelectedYardDevice.SetOnSelected(false); + } + SelectedYardDevice = this; + SelectedYardDevice.SetOnSelected(true); + UIManager.Instance.ShowYardInformationPage(T_BAS_YARD, (_force) => + { + if (_force) + { + SelectedYardDevice = null; + SetOnSelected(false); + } + else + { + if (SelectedYardDevice != this) + { + SetOnSelected(false); + } + } + }); + } + } + + public void SetOnHoverd(bool _hovered) + { + if (_hovered) + { + ParticleSystem.MainModule _main = ParticleSystem.main; + _main.startColor = HoverColor; + + ParticleSystem.Play(); + } + else + { + ParticleSystem.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); + } + } + + public void SetOnSelected(bool _selected) + { + Selected = _selected; + if (_selected) + { + ParticleSystem.MainModule _main = ParticleSystem.main; + _main.startColor = SelectColor; + + ParticleSystem.Play(); + } + else + { + ParticleSystem.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear); + } + } +} diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs index ad311879..9e1b03b1 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs @@ -13,11 +13,11 @@ public class ApiManager : Singleton /// /// ӿipַ /// - public string IpAddress + public string IpAddress { get { - if(!Application.isEditor) + if (!Application.isEditor) { // return "http://" + CallForTest.instance.ServerIP + ":4000"; @@ -68,7 +68,7 @@ public class ApiManager : Singleton { base.Awake(); - + //var _ip_str_url = Path.Combine(Application.streamingAssetsPath, "configure.json"); //StartCoroutine(RequestBase.Get(_ip_str_url, (_data, _error) => //{ @@ -390,7 +390,7 @@ public class ApiManager : Singleton { yield return null; var _post_check_yard = IpAddress + ApiDic["PostCheckYard"]; - var _post_data = $"{{ \"SHIP_NAME_EN\": \"{_SHIP_NAME_EN}\",\"VOYAGE_NO\": \"{_VOYAGE_NO}\",\"STANDARD_NAME\": \"{_SHIP_NAME_EN}\",\"SILO_CODE\":\"{_SILO_CODE}\"}}"; + var _post_data = $"{{ \"MONITOR_ID\": \"{CallForTest.instance.MONITOR_ID}\",\"SHIP_NAME_EN\": \"{_SHIP_NAME_EN}\",\"VOYAGE_NO\": \"{_VOYAGE_NO}\",\"STANDARD_NAME\": \"{_SHIP_NAME_EN}\",\"SILO_CODE\":\"{_SILO_CODE}\"}}"; StartCoroutine(RequestBase.Post(_post_check_yard, _post_data, (_data, _error) => { if (_error != null) diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs index 06687729..c46fcbcd 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs @@ -68,13 +68,14 @@ public class MainScene : Singleton _belt_scale_icon.GetComponent().InitModel(DeviceBase.DeviceBaseList[i]); break; case DeviceType.YARD: - if (ModelRoot.Instance.YardIconPrefab == null) - { - ModelRoot.Instance.YardIconPrefab = Resources.Load("Prefabs/UI/DeviceIcons/YardIcon") as GameObject; - } - var _yard_icon = Instantiate(ModelRoot.Instance.YardIconPrefab, ModelRoot.Instance.Canvas_3D); - _yard_icon.transform.position = DeviceBase.DeviceBaseList[i].transform.position; - _yard_icon.GetComponent().InitModel(DeviceBase.DeviceBaseList[i]); + //չʾUIֱӺģͽ + //if (ModelRoot.Instance.YardIconPrefab == null) + //{ + // ModelRoot.Instance.YardIconPrefab = Resources.Load("Prefabs/UI/DeviceIcons/YardIcon") as GameObject; + //} + //var _yard_icon = Instantiate(ModelRoot.Instance.YardIconPrefab, ModelRoot.Instance.Canvas_3D); + //_yard_icon.transform.position = DeviceBase.DeviceBaseList[i].transform.position; + //_yard_icon.GetComponent().InitModel(DeviceBase.DeviceBaseList[i]); break; default: break; @@ -104,6 +105,11 @@ public class MainScene : Singleton DeviceBase.CameraList[i].T_BAS_CAMERA = _camera; DeviceBase.CameraList[i].DeviceUI.InitData(); } + else + { + DeviceBase.CameraList[i].T_BAS_CAMERA = null; + DeviceBase.CameraList[i].SetActiveState(); + } } m_camera_done = true; } @@ -122,7 +128,7 @@ public class MainScene : Singleton if (_yard != null) { DeviceBase.YardList[i].T_BAS_YARD = _yard; - DeviceBase.YardList[i].DeviceUI.InitData(); + DeviceBase.YardList[i].DeviceUI?.InitData(); } } m_yard_done = true; diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs index d0c0ca48..f366afa5 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs @@ -3,6 +3,7 @@ using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; using UnityEngine; +using System; public class UIManager : Singleton { @@ -200,10 +201,10 @@ public class UIManager : Singleton /// 򿪶ѳϢ /// /// - public void ShowYardInformationPage(T_BAS_YARD _T_BAS_YARD) + public void ShowYardInformationPage(T_BAS_YARD _T_BAS_YARD, Action _callback_onclose = null) { //UIRoot.Instance.YardInformation.ShowPanel(); - UIRoot.Instance.YardInformation.UpdatePageData(_T_BAS_YARD); + UIRoot.Instance.YardInformation.UpdatePageData(_T_BAS_YARD, _callback_onclose); } #endregion diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/PhysicManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/PhysicManager.cs index 0dd1d1f2..1c5c65e3 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/PhysicManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/PhysicManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.EventSystems; public class PhysicManager : MonoBehaviour { @@ -26,9 +27,12 @@ public class PhysicManager : MonoBehaviour { if (Input.GetMouseButtonDown(0)) { - if (PhysicRay(ModelRoot.Instance.MainCamera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit)) + if (!EventSystem.current.IsPointerOverGameObject()) { - Debug.Log(hit.collider.name); + if (PhysicRay(ModelRoot.Instance.MainCamera.ScreenPointToRay(Input.mousePosition), out RaycastHit hit)) + { + Debug.Log(hit.collider.name); + } } } } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs index 9b60972f..2a7a1b0c 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs @@ -257,7 +257,7 @@ public class MeasuringScale : PanelBase TimeSearchButton.onClick.AddListener(ApplyHistoryData); - CloseButton.onClick.AddListener(HidePanel); + CloseButton.onClick.AddListener(ForceHidePanel); MeasuringScaleItemPrefab = Resources.Load("Prefabs/UI/MeasuringScaleInfo/MeasuringScaleItem"); //Ĭʱ @@ -276,14 +276,20 @@ public class MeasuringScale : PanelBase ApplyHistoryData(); } - public override void ShowPanel(bool _hide_last_panel = true) + public override void ShowPanel(bool _hide_last_panel = true, Action _on_panel_close = null, bool _force = false) { - base.ShowPanel(_hide_last_panel); + base.ShowPanel(_hide_last_panel, _on_panel_close); gameObject.SetActive(true); } - public override void HidePanel() + + void ForceHidePanel() { - base.HidePanel(); + HidePanel(true); + } + + public override void HidePanel(bool _force) + { + base.HidePanel(_force); gameObject.SetActive(false); PickTime(false); } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/PanelBase.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/PanelBase.cs index 7fb69211..309cf52a 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/PanelBase.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/PanelBase.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -9,6 +10,10 @@ public class PanelBase : UITool /// ǰ /// public static PanelBase current_panel; + /// + /// ر¼ + /// + public Action on_panel_close; // Start is called before the first frame update protected virtual void Start() { @@ -25,20 +30,28 @@ public class PanelBase : UITool /// չʾ /// /// һ - public virtual void ShowPanel(bool _hide_last_panel = true) + /// رִ¼ + /// + public virtual void ShowPanel(bool _hide_last_panel = true, Action _on_panel_close = null, bool _force = false) { - if (_hide_last_panel && current_panel != null && current_panel != this) + //if (_hide_last_panel && current_panel != null && current_panel != this) + //{ + // current_panel.HidePanel(); + //} + if (_hide_last_panel && current_panel != null) { - current_panel.HidePanel(); + //ͲִͬбرĻصΪTrueӦóƤʱرն⻹ȡ + current_panel.HidePanel(current_panel != this); } current_panel = this; + on_panel_close = _on_panel_close; } /// /// /// - public virtual void HidePanel() + public virtual void HidePanel(bool _force = false) { - + on_panel_close?.Invoke(_force); } } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs index bb51727a..e9c3c542 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using System; using TMPro; using ZenFulcrum.EmbeddedBrowser; using Competition.Mysql.Model; @@ -35,18 +36,23 @@ public class VideoWebPage : PanelBase protected override void Start() { - CloseButton.onClick.AddListener(HidePanel); + CloseButton.onClick.AddListener(ForceHidePanel); } - public override void ShowPanel(bool _hide_last_panel = true) + void ForceHidePanel() { - base.ShowPanel(_hide_last_panel); + HidePanel(true); + } + + public override void ShowPanel(bool _hide_last_panel = true, Action _on_panel_close = null, bool _force = false) + { + base.ShowPanel(_hide_last_panel, _on_panel_close, true); gameObject.SetActive(true); } - public override void HidePanel() + public override void HidePanel(bool _force) { - base.HidePanel(); + base.HidePanel(_force); gameObject.SetActive(false); } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardInformation.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardInformation.cs index c414d5f9..94eb063c 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardInformation.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardInformation.cs @@ -35,23 +35,35 @@ public class YardInformation : PanelBase /// ѳ /// public List YardItems = new List(); - + /// + /// ر + /// public Button CloseButton; + /// + /// ǰѡĶѳ + /// + public T_BAS_YARD CurrentYard; // Start is called before the first frame update protected override void Start() { - CloseButton.onClick.AddListener(HidePanel); + CloseButton.onClick.AddListener(ForceHidePanel); YardItemsPrefab = Resources.Load("Prefabs/UI/YardInfo/YardItem"); } - public override void ShowPanel(bool _hide_last_panel = true) + public override void ShowPanel(bool _hide_last_panel = true, Action _on_panel_close = null, bool _force = false) { - base.ShowPanel(_hide_last_panel); + base.ShowPanel(_hide_last_panel, _on_panel_close); gameObject.SetActive(true); } - public override void HidePanel() + + void ForceHidePanel() { - base.HidePanel(); + HidePanel(true); + } + + public override void HidePanel(bool _force) + { + base.HidePanel(_force); gameObject.SetActive(false); } @@ -59,9 +71,9 @@ public class YardInformation : PanelBase /// ҳչʾ /// /// ѳϢ - public void UpdatePageData(T_BAS_YARD _T_BAS_YARD) + public void UpdatePageData(T_BAS_YARD _T_BAS_YARD, Action _callback_onclose = null) { - ShowPanel();//ȴӿЭ + ShowPanel(_on_panel_close: _callback_onclose);//ȴӿЭ transform.localScale = Vector3.zero; YardName.text = _T_BAS_YARD.YARD_NAME; @@ -77,9 +89,15 @@ public class YardInformation : PanelBase for (int i = 0; i < _storage_list.Count; i++) { + //˿ʣΪ0 + if (float.Parse(_storage_list[i].STOCK_BALANCE.ToString()) == 0) + { + continue; + } var _yard = Instantiate(YardItemsPrefab); _yard.transform.parent = YardItemContent; _yard.Init(_storage_list[i]); + YardItems.Add(_yard); } DOTween.To(() => transform.localScale, _scale => transform.localScale = _scale, Vector3.one, 0.5f); })); diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs index 0e88cb13..9a24eca2 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs @@ -25,6 +25,7 @@ public class DeviceUIBase : MonoBehaviour, IPointerClickHandler break; case DeviceType.YARD: //򿪶 + //תģֱչʾ UIManager.Instance.ShowYardInformationPage(DeviceBase.T_BAS_YARD); break; default: