diff --git a/Assets/ArtRes/RenderTexture/æ£å¸¸é«˜ç²±.renderTexture b/Assets/ArtRes/RenderTexture/æ£å¸¸é«˜ç²±.renderTexture
new file mode 100644
index 0000000..67bf7a8
--- /dev/null
+++ b/Assets/ArtRes/RenderTexture/æ£å¸¸é«˜ç²±.renderTexture
@@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: "\u6B63\u5E38\u9AD8\u7CB1"
+ m_ImageContentsHash:
+ serializedVersion: 2
+ Hash: 00000000000000000000000000000000
+ m_ForcedFallbackFormat: 4
+ m_DownscaleFallback: 0
+ m_IsAlphaChannelOptional: 0
+ serializedVersion: 5
+ m_Width: 600
+ m_Height: 600
+ m_AntiAliasing: 1
+ m_MipCount: -1
+ m_DepthStencilFormat: 94
+ m_ColorFormat: 8
+ m_MipMap: 0
+ m_GenerateMips: 1
+ m_SRGB: 0
+ m_UseDynamicScale: 0
+ m_BindMS: 0
+ m_EnableCompatibleFormat: 1
+ m_EnableRandomWrite: 0
+ m_TextureSettings:
+ serializedVersion: 2
+ m_FilterMode: 1
+ m_Aniso: 0
+ m_MipBias: 0
+ m_WrapU: 1
+ m_WrapV: 1
+ m_WrapW: 1
+ m_Dimension: 2
+ m_VolumeDepth: 1
+ m_ShadowSamplingMode: 2
diff --git a/Assets/ArtRes/RenderTexture/æ£å¸¸é«˜ç²±.renderTexture.meta b/Assets/ArtRes/RenderTexture/æ£å¸¸é«˜ç²±.renderTexture.meta
new file mode 100644
index 0000000..149d8a0
--- /dev/null
+++ b/Assets/ArtRes/RenderTexture/æ£å¸¸é«˜ç²±.renderTexture.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb2169cf27c4ec54aa65469ee996e57a
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 8400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ArtRes/RenderTexture/ç—…æ ª.renderTexture b/Assets/ArtRes/RenderTexture/ç—…æ ª.renderTexture
new file mode 100644
index 0000000..b0db988
--- /dev/null
+++ b/Assets/ArtRes/RenderTexture/ç—…æ ª.renderTexture
@@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: "\u75C5\u682A"
+ m_ImageContentsHash:
+ serializedVersion: 2
+ Hash: 00000000000000000000000000000000
+ m_ForcedFallbackFormat: 4
+ m_DownscaleFallback: 0
+ m_IsAlphaChannelOptional: 0
+ serializedVersion: 5
+ m_Width: 600
+ m_Height: 600
+ m_AntiAliasing: 1
+ m_MipCount: -1
+ m_DepthStencilFormat: 94
+ m_ColorFormat: 8
+ m_MipMap: 0
+ m_GenerateMips: 1
+ m_SRGB: 0
+ m_UseDynamicScale: 0
+ m_BindMS: 0
+ m_EnableCompatibleFormat: 1
+ m_EnableRandomWrite: 0
+ m_TextureSettings:
+ serializedVersion: 2
+ m_FilterMode: 1
+ m_Aniso: 0
+ m_MipBias: 0
+ m_WrapU: 1
+ m_WrapV: 1
+ m_WrapW: 1
+ m_Dimension: 2
+ m_VolumeDepth: 1
+ m_ShadowSamplingMode: 2
diff --git a/Assets/ArtRes/RenderTexture/ç—…æ ª.renderTexture.meta b/Assets/ArtRes/RenderTexture/ç—…æ ª.renderTexture.meta
new file mode 100644
index 0000000..e70dc59
--- /dev/null
+++ b/Assets/ArtRes/RenderTexture/ç—…æ ª.renderTexture.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 76c94c4c4c4548a4c9cbc8d1ea0c1236
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 8400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GameAssets/Models/NewMeasuringBox/Materials/三相四线费控智能电能表_BaseColor.mat b/Assets/GameAssets/Models/NewMeasuringBox/Materials/三相四线费控智能电能表_BaseColor.mat
index 7fe5f9e..bd2e807 100644
--- a/Assets/GameAssets/Models/NewMeasuringBox/Materials/三相四线费控智能电能表_BaseColor.mat
+++ b/Assets/GameAssets/Models/NewMeasuringBox/Materials/三相四线费控智能电能表_BaseColor.mat
@@ -9,8 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: "\u4E09\u76F8\u56DB\u7EBF\u8D39\u63A7\u667A\u80FD\u7535\u80FD\u8868_BaseColor"
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
- m_ValidKeywords:
- - _NORMALMAP
+ m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@@ -47,7 +46,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: b0ebfa8c35735b1468ec918df53e4fbd, type: 3}
+ m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
index f7eede0..9fd4226 100644
--- a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
+++ b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
@@ -123,6 +123,84 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1001 &136924459
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 536866439}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -1660739062635597432, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_Name
+ value: "\u9AD8\u7CB1\u75C5\u682A"
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 2884319168972385861, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 3057514198336764871, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+--- !u!4 &136924460 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+ m_PrefabInstance: {fileID: 136924459}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &267617284
PrefabInstance:
m_ObjectHideFlags: 0
@@ -136,7 +214,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_RootOrder
- value: 7
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
propertyPath: m_LocalPosition.x
@@ -201,103 +279,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
m_PrefabInstance: {fileID: 267617284}
m_PrefabAsset: {fileID: 0}
---- !u!1 &465194742
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 465194746}
- - component: {fileID: 465194745}
- - component: {fileID: 465194744}
- - component: {fileID: 465194743}
- m_Layer: 0
- m_Name: Cube (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!65 &465194743
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 465194742}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &465194744
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 465194742}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &465194745
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 465194742}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &465194746
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 465194742}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 167.28362, y: 20.096848, z: 5.7358003}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &531521516
MeshCollider:
m_ObjectHideFlags: 0
@@ -312,6 +293,39 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -6024898228448900963, guid: 543377e480fab384db837fbf32857c2e, type: 3}
+--- !u!1 &536866438
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 536866439}
+ m_Layer: 11
+ m_Name: SplitSong
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &536866439
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 536866438}
+ m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+ m_LocalPosition: {x: 196.83362, y: -151.29782, z: -37.713696}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1882503365}
+ - {fileID: 136924460}
+ m_Father: {fileID: 0}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!1001 &649240898
PrefabInstance:
m_ObjectHideFlags: 0
@@ -585,104 +599,6 @@ MonoBehaviour:
target: {fileID: 267617285}
minDistance: 2
isClose: 0
---- !u!1 &851143855
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 851143859}
- - component: {fileID: 851143858}
- - component: {fileID: 851143857}
- - component: {fileID: 851143856}
- m_Layer: 0
- m_Name: Cylinder (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!136 &851143856
-CapsuleCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 851143855}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- m_Radius: 0.5000001
- m_Height: 2
- m_Direction: 1
- m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
---- !u!23 &851143857
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 851143855}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &851143858
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 851143855}
- m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &851143859
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 851143855}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 162.81705, y: 21.561146, z: 4.1377797}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 6
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &907607040
MeshCollider:
m_ObjectHideFlags: 0
@@ -772,6 +688,124 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 2146966834713944380, guid: 543377e480fab384db837fbf32857c2e, type: 3}
+--- !u!1 &1567901894
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1567901898}
+ - component: {fileID: 1567901897}
+ - component: {fileID: 1567901896}
+ - component: {fileID: 1567901895}
+ m_Layer: 0
+ m_Name: Camera_Disease
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1567901895
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1567901894}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RenderShadows: 1
+ m_RequiresDepthTextureOption: 2
+ m_RequiresOpaqueTextureOption: 2
+ m_CameraType: 0
+ m_Cameras: []
+ m_RendererIndex: -1
+ m_VolumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ m_VolumeTrigger: {fileID: 0}
+ m_VolumeFrameworkUpdateModeOption: 2
+ m_RenderPostProcessing: 0
+ m_Antialiasing: 0
+ m_AntialiasingQuality: 2
+ m_StopNaN: 0
+ m_Dithering: 0
+ m_ClearDepth: 1
+ m_AllowXRRendering: 1
+ m_RequiresDepthTexture: 0
+ m_RequiresColorTexture: 0
+ m_Version: 2
+--- !u!81 &1567901896
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1567901894}
+ m_Enabled: 1
+--- !u!20 &1567901897
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1567901894}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 2
+ m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_FocalLength: 50
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 1000
+ field of view: 60
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 2048
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!4 &1567901898
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1567901894}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1966461577}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &1635360163
MeshCollider:
m_ObjectHideFlags: 0
@@ -1016,6 +1050,202 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 114.35687, y: 0.20000686, z: 80.99066}
m_Center: {x: 36.978424, y: 0.00000074505806, z: -20.949902}
+--- !u!1001 &1882503364
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 536866439}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -1660739062635597432, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_Name
+ value: "\u9AD8\u7CB1"
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 2884319168972385861, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 3057514198336764871, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ propertyPath: m_Layer
+ value: 11
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+--- !u!4 &1882503365 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+ m_PrefabInstance: {fileID: 1882503364}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1902030981
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1902030985}
+ - component: {fileID: 1902030984}
+ - component: {fileID: 1902030983}
+ - component: {fileID: 1902030982}
+ m_Layer: 0
+ m_Name: Camera_Normal
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1902030982
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1902030981}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_RenderShadows: 1
+ m_RequiresDepthTextureOption: 2
+ m_RequiresOpaqueTextureOption: 2
+ m_CameraType: 0
+ m_Cameras: []
+ m_RendererIndex: -1
+ m_VolumeLayerMask:
+ serializedVersion: 2
+ m_Bits: 1
+ m_VolumeTrigger: {fileID: 0}
+ m_VolumeFrameworkUpdateModeOption: 2
+ m_RenderPostProcessing: 0
+ m_Antialiasing: 0
+ m_AntialiasingQuality: 2
+ m_StopNaN: 0
+ m_Dithering: 0
+ m_ClearDepth: 1
+ m_AllowXRRendering: 1
+ m_RequiresDepthTexture: 0
+ m_RequiresColorTexture: 0
+ m_Version: 2
+--- !u!81 &1902030983
+AudioListener:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1902030981}
+ m_Enabled: 1
+--- !u!20 &1902030984
+Camera:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1902030981}
+ m_Enabled: 1
+ serializedVersion: 2
+ m_ClearFlags: 2
+ m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
+ m_projectionMatrixMode: 1
+ m_GateFitMode: 2
+ m_FOVAxisMode: 0
+ m_SensorSize: {x: 36, y: 24}
+ m_LensShift: {x: 0, y: 0}
+ m_FocalLength: 50
+ m_NormalizedViewPortRect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 1
+ height: 1
+ near clip plane: 0.3
+ far clip plane: 1000
+ field of view: 60
+ orthographic: 0
+ orthographic size: 5
+ m_Depth: 0
+ m_CullingMask:
+ serializedVersion: 2
+ m_Bits: 2048
+ m_RenderingPath: -1
+ m_TargetTexture: {fileID: 0}
+ m_TargetDisplay: 0
+ m_TargetEye: 3
+ m_HDR: 1
+ m_AllowMSAA: 1
+ m_AllowDynamicResolution: 0
+ m_ForceIntoRT: 0
+ m_OcclusionCulling: 1
+ m_StereoConvergence: 10
+ m_StereoSeparation: 0.022
+--- !u!4 &1902030985
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1902030981}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1966461577}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &1952885506
MeshCollider:
m_ObjectHideFlags: 0
@@ -1030,6 +1260,39 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 3417751804086596371, guid: 543377e480fab384db837fbf32857c2e, type: 3}
+--- !u!1 &1966461576
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1966461577}
+ m_Layer: 0
+ m_Name: SplitCamera
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!4 &1966461577
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1966461576}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 196.83362, y: -150.35, z: -40.71}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1902030985}
+ - {fileID: 1567901898}
+ m_Father: {fileID: 0}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1986188604
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/高粱预制体.prefab b/Assets/Resources/Prefabs/高粱预制体.prefab
index 717770f..3e06624 100644
--- a/Assets/Resources/Prefabs/高粱预制体.prefab
+++ b/Assets/Resources/Prefabs/高粱预制体.prefab
@@ -10,6 +10,7 @@ GameObject:
m_Component:
- component: {fileID: 963909014448707086}
- component: {fileID: 6594386118979159493}
+ - component: {fileID: 644732198677733951}
m_Layer: 0
m_Name: "\u9AD8\u7CB1\u9884\u5236\u4F53"
m_TagString: Untagged
@@ -46,8 +47,26 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 004bbb5ca55ea5c43be4d41cdcdcf1f0, type: 3}
m_Name:
m_EditorClassIdentifier:
+ triggerID: 0
+ triggerName:
+ _highlight: {fileID: 0}
DiseasedStrain: {fileID: 117401410597684183}
HealthyStrain: {fileID: 117401409998911646}
+ State: 0
+ RandomRotate: 1
+--- !u!65 &644732198677733951
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 963909014448707081}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 0.5, y: 2, z: 0.5}
+ m_Center: {x: 0, y: 1, z: 0}
--- !u!1001 &963909013790211718
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab.meta b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab.meta
index a656861..11241c0 100644
--- a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab.meta
+++ b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 41cc8f299a3c7bf41a64c00063ae2b9b
+guid: adf6c3a5ab84e3f469563df770ad1416
PrefabImporter:
externalObjects: {}
userData:
diff --git a/Assets/Scripts/CameraOrbit.cs b/Assets/Scripts/CameraOrbit.cs
new file mode 100644
index 0000000..b2f5247
--- /dev/null
+++ b/Assets/Scripts/CameraOrbit.cs
@@ -0,0 +1,150 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DG.Tweening;
+public class CameraOrbit : MonoBehaviour
+{
+ public Transform target;
+ public float distance = 5f;
+ public float xSpeed = 120f;
+ public float ySpeed = 120f;
+ public float scrollSpeed = 1f;
+ public float yMinLimit = -20f;
+ public float yMaxLimit = 80f;
+ public float distanceMin = 0.5f;
+ public float distanceMax = 15f;
+ public float smoothTime = 2f;
+ public float rotationYAxis;
+ public float rotationXAxis;
+ public float velocityX;
+ public float velocityY;
+ private bool start = true;
+ public static bool isMove = true;
+ private Transform pos;//»ñÈ¡EmptyµÄ×ÓÎïÌåpos
+ private Vector3 offset;//»ñÈ¡³õʼʱ¾µÍ·Ïà¶ÔÓÚposµÄÆ«ÒÆÁ¿
+ private Transform mainCamera;
+ public bool limit = true;
+ private bool Enable = true;
+ public static float ClampAngle(float angle, float min, float max)
+ {
+ if (angle < -360f)
+ {
+ angle += 360f;
+ }
+ if (angle > 360f)
+ {
+ angle -= 360f;
+ }
+ return Mathf.Clamp(angle, min, max);
+ }
+
+ private void LateUpdate()
+ {
+
+ if (Enable && this.target != null && isMove)
+ {
+ if (Input.GetMouseButton(1))
+ {
+ this.start = false;
+ if (limit)
+ {
+
+ }
+ else
+ {
+ this.velocityX += (this.xSpeed * Input.GetAxis("Mouse X")) * 0.02f;
+ this.velocityY += (this.ySpeed * Input.GetAxis("Mouse Y")) * 0.02f;
+ }
+ }
+ //if (!this.start)
+ //{
+ this.rotationYAxis += this.velocityX;
+ this.rotationXAxis -= this.velocityY;
+ this.rotationXAxis = ClampAngle(this.rotationXAxis, this.yMinLimit, this.yMaxLimit);
+ Quaternion quaternion2 = Quaternion.Euler(this.rotationXAxis, this.rotationYAxis, 0f);
+ Vector3 vector = new Vector3(0f, 0f, -this.distance);
+ Vector3 vector2 = ((Vector3)(quaternion2 * vector)) + this.target.position;
+ base.transform.rotation = quaternion2;
+ base.transform.position = vector2;
+ this.velocityX = Mathf.Lerp(this.velocityX, 0f, Time.deltaTime * this.smoothTime);
+ this.velocityY = Mathf.Lerp(this.velocityY, 0f, Time.deltaTime * this.smoothTime);
+
+ float axis = 0;
+ if (limit)
+ { }
+ else
+ {
+ axis = Input.GetAxis("Mouse ScrollWheel");
+ }
+ if ((axis < 0f) && (this.distance < this.distanceMax))
+ {
+ this.distance += this.scrollSpeed;
+ }
+ else if ((axis > 0f) && (this.distance > this.distanceMin))
+ {
+ this.distance -= this.scrollSpeed;
+ }
+ }
+ }
+
+ public void Resume()
+ {
+ Enable = false;
+
+
+
+ transform.DOLocalMove(initPos, 1).OnComplete(() =>
+ {
+ Vector3 eulerAngles = base.transform.eulerAngles;
+ this.rotationYAxis = eulerAngles.y;
+ this.rotationXAxis = eulerAngles.x;
+ velocityX = 0;
+ distance = initDis;
+ velocityY = 0;
+ Enable = true;
+ });
+ transform.DOLocalRotate(initRot, 1);
+ }
+ public Vector3 initPos, initRot; float initDis;
+ private void Start()
+ {
+ Vector3 eulerAngles = base.transform.eulerAngles;
+ this.rotationYAxis = eulerAngles.y;
+ this.rotationXAxis = eulerAngles.x;
+ //SliderValue(this.distance);
+
+ StartCoroutine(Delay());
+ }
+ IEnumerator Delay()
+ {
+ yield return 1;
+ initDis = this.distance;
+ initPos = transform.localPosition;
+ initRot = transform.localEulerAngles;
+ }
+ public bool InScene()
+ {
+ bool inscene = false;
+ if (Input.mousePosition.x > 0 && Input.mousePosition.x < Screen.width && Input.mousePosition.y > 0 && Input.mousePosition.y < Screen.height)
+ inscene = true;
+ else
+ inscene = false;
+ return inscene;
+ }
+
+ ///
+ /// Ïà»ú´©Ç½
+ ///
+ private void AvoidCrossWall()
+ {
+ RaycastHit hit;
+ if (Physics.Raycast(pos.position, mainCamera.position - pos.position, out hit, offset.magnitude))
+ {
+ Debug.DrawLine(pos.position, hit.point);
+ if (hit.collider.tag == "Wall")
+ {
+ mainCamera.position = hit.point;
+ }
+ }
+ }
+}
diff --git a/Assets/Scripts/CameraOrbit.cs.meta b/Assets/Scripts/CameraOrbit.cs.meta
new file mode 100644
index 0000000..99fc17f
--- /dev/null
+++ b/Assets/Scripts/CameraOrbit.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9d8c265c4ff73a740a73377f69fc474e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/CameraOrbitS.cs b/Assets/Scripts/CameraOrbitS.cs
new file mode 100644
index 0000000..5a3c7a2
--- /dev/null
+++ b/Assets/Scripts/CameraOrbitS.cs
@@ -0,0 +1,150 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using DG.Tweening;
+public class CameraOrbitS : MonoBehaviour
+{
+ public Transform target;
+ public float distance = 5f;
+ public float xSpeed = 120f;
+ public float ySpeed = 120f;
+ public float scrollSpeed = 1f;
+ public float yMinLimit = -20f;
+ public float yMaxLimit = 80f;
+ public float distanceMin = 0.5f;
+ public float distanceMax = 15f;
+ public float smoothTime = 2f;
+ public float rotationYAxis;
+ public float rotationXAxis;
+ public float velocityX;
+ public float velocityY;
+ private bool start = true;
+ public static bool isMove = true;
+ private Transform pos;//»ñÈ¡EmptyµÄ×ÓÎïÌåpos
+ private Vector3 offset;//»ñÈ¡³õʼʱ¾µÍ·Ïà¶ÔÓÚposµÄÆ«ÒÆÁ¿
+ private Transform mainCamera;
+ public bool limit = true;
+ private bool Enable = true;
+ public static float ClampAngle(float angle, float min, float max)
+ {
+ if (angle < -360f)
+ {
+ angle += 360f;
+ }
+ if (angle > 360f)
+ {
+ angle -= 360f;
+ }
+ return Mathf.Clamp(angle, min, max);
+ }
+
+ private void LateUpdate()
+ {
+
+ if (Enable && this.target != null && isMove)
+ {
+ if (Input.GetMouseButton(1))
+ {
+ this.start = false;
+ if (limit)
+ {
+
+ }
+ else
+ {
+ this.velocityX += (this.xSpeed * Input.GetAxis("Mouse X")) * 0.02f;
+ this.velocityY += (this.ySpeed * Input.GetAxis("Mouse Y")) * 0.02f;
+ }
+ }
+ //if (!this.start)
+ //{
+ this.rotationYAxis += this.velocityX;
+ this.rotationXAxis -= this.velocityY;
+ this.rotationXAxis = ClampAngle(this.rotationXAxis, this.yMinLimit, this.yMaxLimit);
+ Quaternion quaternion2 = Quaternion.Euler(this.rotationXAxis, this.rotationYAxis, 0f);
+ Vector3 vector = new Vector3(0f, 0f, -this.distance);
+ Vector3 vector2 = ((Vector3)(quaternion2 * vector)) + this.target.position;
+ base.transform.rotation = quaternion2;
+ base.transform.position = vector2;
+ this.velocityX = Mathf.Lerp(this.velocityX, 0f, Time.deltaTime * this.smoothTime);
+ this.velocityY = Mathf.Lerp(this.velocityY, 0f, Time.deltaTime * this.smoothTime);
+
+ float axis = 0;
+ if (limit)
+ { }
+ else
+ {
+ axis = Input.GetAxis("Mouse ScrollWheel");
+ }
+ if ((axis < 0f) && (this.distance < this.distanceMax))
+ {
+ this.distance += this.scrollSpeed;
+ }
+ else if ((axis > 0f) && (this.distance > this.distanceMin))
+ {
+ this.distance -= this.scrollSpeed;
+ }
+ }
+ }
+
+ public void Resume()
+ {
+ Enable = false;
+
+
+
+ transform.DOLocalMove(initPos, 1).OnComplete(() =>
+ {
+ Vector3 eulerAngles = base.transform.eulerAngles;
+ this.rotationYAxis = eulerAngles.y;
+ this.rotationXAxis = eulerAngles.x;
+ velocityX = 0;
+ distance = initDis;
+ velocityY = 0;
+ Enable = true;
+ });
+ transform.DOLocalRotate(initRot, 1);
+ }
+ public Vector3 initPos, initRot; float initDis;
+ private void Start()
+ {
+ Vector3 eulerAngles = base.transform.eulerAngles;
+ this.rotationYAxis = eulerAngles.y;
+ this.rotationXAxis = eulerAngles.x;
+ //SliderValue(this.distance);
+
+ StartCoroutine(Delay());
+ }
+ IEnumerator Delay()
+ {
+ yield return 1;
+ initDis = this.distance;
+ initPos = transform.localPosition;
+ initRot = transform.localEulerAngles;
+ }
+ public bool InScene()
+ {
+ bool inscene = false;
+ if (Input.mousePosition.x > 0 && Input.mousePosition.x < Screen.width && Input.mousePosition.y > 0 && Input.mousePosition.y < Screen.height)
+ inscene = true;
+ else
+ inscene = false;
+ return inscene;
+ }
+
+ ///
+ /// Ïà»ú´©Ç½
+ ///
+ private void AvoidCrossWall()
+ {
+ RaycastHit hit;
+ if (Physics.Raycast(pos.position, mainCamera.position - pos.position, out hit, offset.magnitude))
+ {
+ Debug.DrawLine(pos.position, hit.point);
+ if (hit.collider.tag == "Wall")
+ {
+ mainCamera.position = hit.point;
+ }
+ }
+ }
+}
diff --git a/Assets/Scripts/CameraOrbitS.cs.meta b/Assets/Scripts/CameraOrbitS.cs.meta
new file mode 100644
index 0000000..811fb90
--- /dev/null
+++ b/Assets/Scripts/CameraOrbitS.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0b467eb831b91cc4ab123ece8292e9a1
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/HQB/SorghumController.cs b/Assets/Scripts/HQB/SorghumController.cs
index 5c24e5e..ac66674 100644
--- a/Assets/Scripts/HQB/SorghumController.cs
+++ b/Assets/Scripts/HQB/SorghumController.cs
@@ -8,7 +8,7 @@ public enum SorghumState
Diseased
}
-public class SorghumController : MonoBehaviour
+public class SorghumController : PermanentTriggerBase
{
public GameObject DiseasedStrain;
public GameObject HealthyStrain;
@@ -37,16 +37,8 @@ public class SorghumController : MonoBehaviour
}
}
-
- // Start is called before the first frame update
- void Start()
+ protected override void OnMDown()
{
-
- }
-
- // Update is called once per frame
- void Update()
- {
-
+ GameManager.UIMgr.ShowPanel();
}
}
diff --git a/Assets/Scripts/RawImageScript.cs b/Assets/Scripts/RawImageScript.cs
new file mode 100644
index 0000000..b35aebe
--- /dev/null
+++ b/Assets/Scripts/RawImageScript.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+public class RawImageScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+ //Õý³£Ö²ÖêºÍ²¡Öê¶Ô±ÈÃæ°å
+ public UI_GraphicRextualPanel rextualPanel;
+ public void OnPointerEnter(PointerEventData eventData)
+ {
+
+ GameObject hoveredObject = eventData.pointerEnter;
+ if (hoveredObject.name == "Õý³£¸ßÁ»")
+ {
+ Debug.Log("ÎÒ½øÕý³£ÁË");
+ rextualPanel.ToptextMeshProUGUI.text = "1";
+ rextualPanel.ContentTextMeshProUGUI.text = "11111";
+ }
+ else if(hoveredObject.name == "²¡Öê")
+ {
+ Debug.Log("ÎÒ½ø²¡ÖêÁË");
+ rextualPanel.ToptextMeshProUGUI.text = "2";
+ rextualPanel.ContentTextMeshProUGUI.text = "22222";
+ }
+ }
+
+ public void OnPointerExit(PointerEventData eventData)
+ {
+ GameObject hoveredObject = eventData.pointerEnter;
+ if (hoveredObject.name == "Õý³£¸ßÁ»")
+ {
+ Debug.Log("ÎÒÍ˳öÕý³£ÁË");
+ }
+ else if (hoveredObject.name == "²¡Öê")
+ {
+ Debug.Log("ÎÒÍ˳ö²¡ÖêÁË");
+ }
+ }
+}
diff --git a/Assets/Scripts/RawImageScript.cs.meta b/Assets/Scripts/RawImageScript.cs.meta
new file mode 100644
index 0000000..f09eeaf
--- /dev/null
+++ b/Assets/Scripts/RawImageScript.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a5549af0ab4860f4982ec854145a825c
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI.meta b/Assets/Scripts/UI.meta
new file mode 100644
index 0000000..6925f2e
--- /dev/null
+++ b/Assets/Scripts/UI.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d248b4e6d44687445adca82f52e53775
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/UIPanel.meta b/Assets/Scripts/UI/UIPanel.meta
new file mode 100644
index 0000000..f7966fd
--- /dev/null
+++ b/Assets/Scripts/UI/UIPanel.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 063ec7e6537caf149affcc40d90f5a58
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs b/Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs
new file mode 100644
index 0000000..cecee99
--- /dev/null
+++ b/Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs
@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class UI_GraphicRextualPanel : BasePanel
+{
+ public RawImage rawImage;
+
+ //¶¥²¿ÎÄ×Ö
+ public TextMeshProUGUI ToptextMeshProUGUI;
+
+ //ÄÚÈÝ
+ public TextMeshProUGUI ContentTextMeshProUGUI;
+
+ protected override void Awake()
+ {
+ base.Awake();
+ }
+ public override void ShowMe()
+ {
+ base.ShowMe();
+ }
+ public override void HideMe()
+ {
+ base.HideMe();
+ }
+ protected override void OnClick(string btnName)
+ {
+ switch (btnName)
+ {
+ case "returnBtn":
+ //Bootstrap.Instance.uiManager.HidePanel();
+ //LiveSceneManger.Instance.TipBtn.gameObject.SetActive(true);
+ break;
+ }
+ }
+}
diff --git a/Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs.meta b/Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs.meta
new file mode 100644
index 0000000..6d72e98
--- /dev/null
+++ b/Assets/Scripts/UI/UIPanel/UI_GraphicRextualPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4512a1fb2a67f084dad0e6f502abcae4
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: