LOD

2025-05-29 09:49:50 +08:00 · 2025-05-29 09:49:50 +08:00 · 1f1081665d
parent 53624253bd 9ca6469f95
commit 1f1081665d
53 changed files with 5927 additions and 830 deletions
--- a/.vs/CultivationOfBrewing-2/FileContentIndex/3cd11182-c825-4372-a39c-9b0e83723edb.vsidx
+++ b/.vs/CultivationOfBrewing-2/FileContentIndex/3cd11182-c825-4372-a39c-9b0e83723edb.vsidx
--- a/.vs/CultivationOfBrewing-2/v17/.suo
+++ b/.vs/CultivationOfBrewing-2/v17/.suo
--- a/.vs/CultivationOfBrewing-2/v17/fileList.bin
+++ b/.vs/CultivationOfBrewing-2/v17/fileList.bin
--- a/Assembly-CSharp-Editor-firstpass.csproj
+++ b/Assembly-CSharp-Editor-firstpass.csproj
@ -457,6 +457,10 @@
      <HintPath>Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Cells">
+      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="DOTweenPro">
      <HintPath>Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.dll</HintPath>
      <Private>False</Private>
@ -501,6 +505,14 @@
      <HintPath>Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Words">
+      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Aspose.Slides">
+      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>Assets\Scripts\Editor\ExcelDll\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>False</Private>
@ -517,6 +529,10 @@
      <HintPath>Assets\Scripts\Editor\ExcelDll\Excel.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Pdf">
+      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Newtonsoft.Json">
      <HintPath>Assets\Plugins\Newtonsoft.Json.dll</HintPath>
      <Private>False</Private>
@ -525,22 +541,6 @@
      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Aspose.Cells">
-      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Words">
-      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Slides">
-      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Pdf">
-      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="nunit.framework">
      <HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
      <Private>False</Private>
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@ -446,6 +446,10 @@
      <HintPath>Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Cells">
+      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="DOTweenPro">
      <HintPath>Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.dll</HintPath>
      <Private>False</Private>
@ -490,6 +494,14 @@
      <HintPath>Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Words">
+      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Aspose.Slides">
+      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>Assets\Scripts\Editor\ExcelDll\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>False</Private>
@ -506,6 +518,10 @@
      <HintPath>Assets\Scripts\Editor\ExcelDll\Excel.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Pdf">
+      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Newtonsoft.Json">
      <HintPath>Assets\Plugins\Newtonsoft.Json.dll</HintPath>
      <Private>False</Private>
@ -514,22 +530,6 @@
      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Aspose.Cells">
-      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Words">
-      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Slides">
-      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Pdf">
-      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="nunit.framework">
      <HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
      <Private>False</Private>
--- a/Assembly-CSharp-firstpass.csproj
+++ b/Assembly-CSharp-firstpass.csproj
@ -493,6 +493,10 @@
      <HintPath>Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Cells">
+      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="DOTweenPro">
      <HintPath>Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.dll</HintPath>
      <Private>False</Private>
@ -513,26 +517,6 @@
      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.OdinInspector.Editor.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Sirenix.Utilities">
-      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Utilities.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
-      <HintPath>Library\PackageCache\com.unity.visualscripting@1.9.2\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>Assets\Plugins\Newtonsoft.Json.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Sirenix.Serialization">
-      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Cells">
-      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="Aspose.Words">
      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
      <Private>False</Private>
@ -541,10 +525,26 @@
      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Sirenix.Utilities">
+      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Utilities.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Unity.VisualScripting.Antlr3.Runtime">
+      <HintPath>Library\PackageCache\com.unity.visualscripting@1.9.2\Runtime\VisualScripting.Flow\Dependencies\NCalc\Unity.VisualScripting.Antlr3.Runtime.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Aspose.Pdf">
      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>Assets\Plugins\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Sirenix.Serialization">
+      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="mscorlib">
      <HintPath>E:\Unity\2021.3.37f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll</HintPath>
      <Private>False</Private>
--- a/Assets/ArtRes/Models/Materials/fa
+++ b/Assets/ArtRes/Models/Materials/fa
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: afc95d36eabf33c488666c6f04d7d325
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Models/Materials/fa.mat
+++ b/Assets/ArtRes/Models/Materials/fa.mat
@ -1,113 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: fa
-  m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
-  - _ALPHABLEND_ON
-  - _NORMALMAP
-  m_InvalidKeywords: []
-  m_LightmapFlags: 0
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
-  disabledShaderPasses:
-  - GRABPASS
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 2800000, guid: 7a301173b25c5db45ba9f9dab16de56e, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: b4108af5bca8a6c4cba6b20d9b1e6202, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BlendOp: 0
-    - _BumpScale: 1
-    - _CameraFadingEnabled: 0
-    - _CameraFarFadeDistance: 2
-    - _CameraNearFadeDistance: 1
-    - _Cull: 0
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DistortionBlend: 0.5
-    - _DistortionEnabled: 0
-    - _DistortionStrength: 1
-    - _DistortionStrengthScaled: 0
-    - _DstBlend: 10
-    - _EmissionEnabled: 0
-    - _FlipbookMode: 0
-    - _GlossMapScale: 1
-<<<<<<< HEAD
-    - _Glossiness: 0.267
-=======
-    - _Glossiness: 0.026
->>>>>>> ca51b2b3d02d5199d54e36a1db68520359753a99
-    - _GlossyReflections: 1
-    - _LightingEnabled: 1
-    - _Metallic: 0
-    - _Mode: 2
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SoftParticlesEnabled: 0
-    - _SoftParticlesFarFadeDistance: 1
-    - _SoftParticlesNearFadeDistance: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 5
-    - _UVSec: 0
-    - _ZWrite: 0
-    m_Colors:
-    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
-<<<<<<< HEAD
-    - _Color: {r: 1, g: 1, b: 1, a: 0.94509804}
-=======
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
->>>>>>> ca51b2b3d02d5199d54e36a1db68520359753a99
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
-  m_BuildTextureStacks: []
--- a/Assets/ArtRes/Models/Materials/fa.mat.meta
+++ b/Assets/ArtRes/Models/Materials/fa.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f64a23ffd2289df4fb064c488f130984
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Models/Materials/gaoliangguoshi.mat
+++ b/Assets/ArtRes/Models/Materials/gaoliangguoshi.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3766730588959130187
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@ -7,12 +20,11 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: fa 4
-  m_Shader: {fileID: -6465566751694194690, guid: 1a207e3bee00db44b940e6f362a8e148, type: 3}
+  m_Name: gaoliangguoshi
+  m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3}
  m_ValidKeywords: []
  m_InvalidKeywords:
  - _EMISSION
-  - _NORMALMAP
  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -23,11 +35,11 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _BASE_COLOR_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BUMP_MAP:
-        m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EMISSION_COLOR_MAP:
@ -51,7 +63,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _TRANSPARENCY_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
@ -93,37 +105,24 @@ Material:
    - _QueueControl: 0
    - _QueueOffset: 0
    - _REFLECTIONS_IOR: 1.52
-    - _REFLECTIONS_ROUGHNESS: 0.45
-    - _REFLECTIONS_WEIGHT: 0.089999996
+    - _REFLECTIONS_ROUGHNESS: 0
+    - _REFLECTIONS_WEIGHT: 1
    - _ReceiveShadows: 1
    - _Smoothness: 0
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _Surface: 0
-    - _TRANSPARENCY: 1
+    - _TRANSPARENCY: 0
    - _UVSec: 0
    - _WorkflowMode: 1
    - _ZWrite: 1
    m_Colors:
-    - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BASE_COLOR: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1}
+    - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &9035544008942703316
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
--- a/Assets/ArtRes/Models/Materials/gaoliangguoshi.mat.meta
+++ b/Assets/ArtRes/Models/Materials/gaoliangguoshi.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 482ab6e3e4be675498aeb4d483d88112
+guid: 7bbcc2913cbad8f45b24c641b06cdec0
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/ArtRes/Models/Materials/stem01.mat
+++ b/Assets/ArtRes/Models/Materials/stem01.mat
@ -7,12 +7,11 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: fa 5
-  m_Shader: {fileID: -6465566751694194690, guid: 1a207e3bee00db44b940e6f362a8e148, type: 3}
+  m_Name: stem01
+  m_Shader: {fileID: -6465566751694194690, guid: 44245ab89240f51459a5077d7145c452, type: 3}
  m_ValidKeywords: []
  m_InvalidKeywords:
  - _EMISSION
-  - _NORMALMAP
  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -23,11 +22,11 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _BASE_COLOR_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BUMP_MAP:
-        m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EMISSION_COLOR_MAP:
@ -51,7 +50,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _TRANSPARENCY_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
@ -93,28 +92,28 @@ Material:
    - _QueueControl: 0
    - _QueueOffset: 0
    - _REFLECTIONS_IOR: 1.52
-    - _REFLECTIONS_ROUGHNESS: 0.45
-    - _REFLECTIONS_WEIGHT: 0.089999996
+    - _REFLECTIONS_ROUGHNESS: 0
+    - _REFLECTIONS_WEIGHT: 1
    - _ReceiveShadows: 1
    - _Smoothness: 0
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _Surface: 0
-    - _TRANSPARENCY: 1
+    - _TRANSPARENCY: 0
    - _UVSec: 0
    - _WorkflowMode: 1
    - _ZWrite: 1
    m_Colors:
-    - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _BASE_COLOR: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+    - _BaseColor: {r: 0.7353569, g: 0.7353569, b: 0.7353569, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1}
+    - _REFLECTIONS_COLOR: {r: 1, g: 1, b: 1, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- !u!114 &5007009019920731954
+--- !u!114 &4885604237761699868
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
--- a/Assets/ArtRes/Models/Materials/stem01.mat.meta
+++ b/Assets/ArtRes/Models/Materials/stem01.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e25f56cf933cf6a4d99752f737f4b319
+guid: 24ac24b4af7a42d489a04bc0eccdc4e3
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/ArtRes/Models/Materials/vray_Material2.mat
+++ b/Assets/ArtRes/Models/Materials/vray_Material2.mat
@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: vray_Material2
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 3.2
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
--- a/Assets/ArtRes/Models/Materials/vray_Material2.mat.meta
+++ b/Assets/ArtRes/Models/Materials/vray_Material2.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a712b2a6bcd6d884aaf6fcb6c4f01168
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Models/Materials/vray_Material70.mat
+++ b/Assets/ArtRes/Models/Materials/vray_Material70.mat
@ -1,80 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: vray_Material70
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 3.2
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
--- a/Assets/ArtRes/Models/Materials/vray_Material70.mat.meta
+++ b/Assets/ArtRes/Models/Materials/vray_Material70.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e5dede25145e1564b99f05072ea0ff68
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Models/Materials/高粱低精度.mat
+++ b/Assets/ArtRes/Models/Materials/高粱低精度.mat
@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-277654952444676082
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@ -7,16 +20,14 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: fa 2
+  m_Name: "\u9AD8\u7CB1\u4F4E\u7CBE\u5EA6"
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_ValidKeywords:
-  - _EMISSION
-  - _NORMALMAP
  - _SURFACE_TYPE_TRANSPARENT
  m_InvalidKeywords: []
-  m_LightmapFlags: 1
+  m_LightmapFlags: 6
  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
+  m_DoubleSidedGI: 1
  m_CustomRenderQueue: 3000
  stringTagMap:
    RenderType: Transparent
@ -27,19 +38,19 @@ Material:
    serializedVersion: 3
    m_TexEnvs:
    - _BASE_COLOR_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BUMP_MAP:
-        m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: b4108af5bca8a6c4cba6b20d9b1e6202, type: 3}
+        m_Texture: {fileID: 2800000, guid: c5e1245445dc704458e2526beb9ccb1e, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BumpMap:
-        m_Texture: {fileID: 2800000, guid: 7a301173b25c5db45ba9f9dab16de56e, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _DetailAlbedoMap:
@ -67,7 +78,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: b4108af5bca8a6c4cba6b20d9b1e6202, type: 3}
+        m_Texture: {fileID: 2800000, guid: c5e1245445dc704458e2526beb9ccb1e, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
@ -99,7 +110,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _TRANSPARENCY_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
@ -116,15 +127,14 @@ Material:
        m_Offset: {x: 0, y: 0}
    m_Ints: []
    m_Floats:
-    - Boolean_8A2B8817: 0
    - _AlphaClip: 0
    - _BASE_COLOR_WEIGHT: 1
-    - _BUMP_MAP_STRENGTH: 0
+    - _BUMP_MAP_STRENGTH: 0.3
    - _Blend: 0
    - _BumpScale: 1
    - _ClearCoatMask: 0
    - _ClearCoatSmoothness: 0
-    - _Cull: 2
+    - _Cull: 0
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
@ -138,14 +148,12 @@ Material:
    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
-    - _Opacity: 1
-    - _OpacityThreshold: 0
    - _Parallax: 0.02
    - _QueueControl: 0
    - _QueueOffset: 0
    - _REFLECTIONS_IOR: 1.52
-    - _REFLECTIONS_ROUGHNESS: 0.45
-    - _REFLECTIONS_WEIGHT: 0.089999996
+    - _REFLECTIONS_ROUGHNESS: 0
+    - _REFLECTIONS_WEIGHT: 1
    - _ReceiveShadows: 1
    - _Smoothness: 0
    - _SmoothnessTextureChannel: 0
@ -154,36 +162,14 @@ Material:
    - _Surface: 1
    - _TRANSPARENCY: 1
    - _UVSec: 0
-    - _UseAoMap: 0
-    - _UseColorMap: 0
-    - _UseEmissiveMap: 0
-    - _UseMetallicMap: 0
-    - _UseNormalMap: 1
-    - _UseOpacityMap: 0
-    - _UseRoughnessMap: 0
    - _WorkflowMode: 1
    - _ZWrite: 0
    m_Colors:
    - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
+    - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1}
    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1}
+    - _REFLECTIONS_COLOR: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-    - _UvOffset: {r: 0, g: 0, b: 0, a: 0}
-    - _UvTiling: {r: 1, g: 1, b: 0, a: 0}
  m_BuildTextureStacks: []
--- !u!114 &3896894430608319909
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
--- a/Assets/ArtRes/Models/Materials/高粱低精度.mat.meta
+++ b/Assets/ArtRes/Models/Materials/高粱低精度.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ade6ede442a827e41af0d166477d2632
+guid: 5138510304827e84d9e97046386bd40a
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/ArtRes/Models/Materials/高粱病株低精度.mat
+++ b/Assets/ArtRes/Models/Materials/高粱病株低精度.mat
@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1102268470454046786
+--- !u!114 &-198708213131237833
 MonoBehaviour:
  m_ObjectHideFlags: 11
  m_CorrespondingSourceObject: {fileID: 0}
@ -20,37 +20,79 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: fa 3
-  m_Shader: {fileID: -6465566751694194690, guid: 1a207e3bee00db44b940e6f362a8e148, type: 3}
-  m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _EMISSION
-  - _NORMALMAP
-  m_LightmapFlags: 2
+  m_Name: "\u9AD8\u7CB1\u75C5\u682A\u4F4E\u7CBE\u5EA6"
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_ValidKeywords:
+  - _SURFACE_TYPE_TRANSPARENT
+  m_InvalidKeywords: []
+  m_LightmapFlags: 6
  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
    - _BASE_COLOR_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _BUMP_MAP:
-        m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3}
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 2800000, guid: 3c3b9adb7826b584395b3553710be6b6, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EMISSION_COLOR_MAP:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _METALNESS_MAP:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 3c3b9adb7826b584395b3553710be6b6, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _REFLECTIONS_COLOR_MAP:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
@ -63,8 +105,12 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
    - _TRANSPARENCY_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
@ -88,11 +134,11 @@ Material:
    - _BumpScale: 1
    - _ClearCoatMask: 0
    - _ClearCoatSmoothness: 0
-    - _Cull: 2
+    - _Cull: 0
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
+    - _DstBlend: 10
    - _EMISSION_WEIGHT: 1
    - _EnvironmentReflections: 1
    - _GlossMapScale: 1
@ -106,24 +152,24 @@ Material:
    - _QueueControl: 0
    - _QueueOffset: 0
    - _REFLECTIONS_IOR: 1.52
-    - _REFLECTIONS_ROUGHNESS: 0.45
-    - _REFLECTIONS_WEIGHT: 0.089999996
+    - _REFLECTIONS_ROUGHNESS: 0
+    - _REFLECTIONS_WEIGHT: 1
    - _ReceiveShadows: 1
    - _Smoothness: 0
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _Surface: 0
+    - _SrcBlend: 5
+    - _Surface: 1
    - _TRANSPARENCY: 1
    - _UVSec: 0
    - _WorkflowMode: 1
-    - _ZWrite: 1
+    - _ZWrite: 0
    m_Colors:
    - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _BaseColor: {r: 0.7794175, g: 0.8962264, b: 0.68907976, a: 1}
+    - _Color: {r: 0.7794175, g: 0.8962264, b: 0.6890797, a: 1}
    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1}
+    - _REFLECTIONS_COLOR: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/ArtRes/Models/Materials/高粱病株低精度.mat.meta
+++ b/Assets/ArtRes/Models/Materials/高粱病株低精度.mat.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 34dc4b8cbed045e4a85ff0c0130689ea
+guid: acd794efac1075f4aba0b981470db90d
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 2100000
--- a/Assets/ArtRes/Models/配景/树/花圃.fbm/Atlas-1-N.png.meta
+++ b/Assets/ArtRes/Models/配景/树/花圃.fbm/Atlas-1-N.png.meta
@ -7,7 +7,7 @@ TextureImporter:
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@ -53,7 +53,7 @@ TextureImporter:
  alphaUsage: 1
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1
--- a/Assets/ArtRes/Models/高粱.fbx
+++ b/Assets/ArtRes/Models/高粱.fbx
--- a/Assets/ArtRes/Models/高粱病株.fbx
+++ b/Assets/ArtRes/Models/高粱病株.fbx
--- a/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png
+++ b/Assets/ArtRes/Sprite/UI_Panel/UI_SessionPanel/教师.png
--- a/Assets/ArtRes/Texture/高粱贴图/高粱低精度.png
+++ b/Assets/ArtRes/Texture/高粱贴图/高粱低精度.png
--- a/Assets/ArtRes/Texture/高粱贴图/高粱低精度.png.meta
+++ b/Assets/ArtRes/Texture/高粱贴图/高粱低精度.png.meta
@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: c5e1245445dc704458e2526beb9ccb1e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 2
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 8192
+    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: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    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: 8192
+    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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ArtRes/Texture/高粱贴图/高粱病株低精度.png
+++ b/Assets/ArtRes/Texture/高粱贴图/高粱病株低精度.png
--- a/Assets/ArtRes/Texture/高粱贴图/高粱病株低精度.png.meta
+++ b/Assets/ArtRes/Texture/高粱贴图/高粱病株低精度.png.meta
@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 3c3b9adb7826b584395b3553710be6b6
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: 2
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 8192
+    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: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 8192
+    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: 8192
+    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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/GameAssets/Models/Man/Mat/头发.mat
+++ b/Assets/GameAssets/Models/Man/Mat/头发.mat
@ -1,89 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: "\u5934\u53D1"
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _NORMALMAP
-  m_InvalidKeywords: []
-  m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _BumpMap:
-        m_Texture: {fileID: 2800000, guid: eec46824de9a6aa46bd7c87640795d04, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 2800000, guid: e93797e60c6410f4c9a1fa8ea91ba51f, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BumpScale: 1
-    - _Cutoff: 0.5
-    - _DetailNormalMapScale: 1
-    - _DstBlend: 0
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []
--- a/Assets/GameAssets/Models/Man/Mat/头发.mat.meta
+++ b/Assets/GameAssets/Models/Man/Mat/头发.mat.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 497244edb962b0d4ca90c2132c486dc3
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ArtRes/Models/Materials/fa
+++ b/Assets/ArtRes/Models/Materials/fa
@ -1,18 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2443593614433728965
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 5
 --- !u!21 &2100000
 Material:
  serializedVersion: 8
@ -20,51 +7,62 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: fa 6
-  m_Shader: {fileID: -6465566751694194690, guid: 1a207e3bee00db44b940e6f362a8e148, type: 3}
+  m_Name: LineFlare
+  m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
  m_ValidKeywords: []
-  m_InvalidKeywords:
-  - _EMISSION
-  - _NORMALMAP
-  m_LightmapFlags: 2
-  m_EnableInstancingVariants: 0
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 2013
+  stringTagMap:
+    RenderType: Opaque
  disabledShaderPasses: []
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
-    - _BASE_COLOR_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BUMP_MAP:
-        m_Texture: {fileID: 2800000, guid: 7ac4f17a81480f9488d8ddc90d0d7b47, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EMISSION_COLOR_MAP:
+    - _BaseMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _METALNESS_MAP:
+    - _BumpMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _REFLECTIONS_COLOR_MAP:
+    - _DetailAlbedoMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _REFLECTIONS_IOR_MAP:
+    - _DetailMask:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _REFLECTIONS_ROUGHNESS_MAP:
+    - _DetailNormalMap:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
-    - _TRANSPARENCY_MAP:
-        m_Texture: {fileID: 2800000, guid: ac0fa7a6c8e3e9748ab5ea12b509a74a, type: 3}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - unity_Lightmaps:
@ -82,9 +80,8 @@ Material:
    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
-    - _BASE_COLOR_WEIGHT: 1
-    - _BUMP_MAP_STRENGTH: 0.3
    - _Blend: 0
+    - _BlendOp: 0
    - _BumpScale: 1
    - _ClearCoatMask: 0
    - _ClearCoatSmoothness: 0
@ -93,37 +90,39 @@ Material:
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
-    - _EMISSION_WEIGHT: 1
    - _EnvironmentReflections: 1
-    - _GlossMapScale: 1
-    - _Glossiness: 0.5
-    - _GlossyReflections: 1
-    - _METALNESS: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
    - _Metallic: 0
-    - _Mode: 0
    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _QueueControl: 0
-    - _QueueOffset: 0
-    - _REFLECTIONS_IOR: 1.52
-    - _REFLECTIONS_ROUGHNESS: 0.45
-    - _REFLECTIONS_WEIGHT: 0.089999996
+    - _Parallax: 0.005
+    - _QueueOffset: 13
    - _ReceiveShadows: 1
-    - _Smoothness: 0
+    - _SampleGI: 0
+    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
    - _Surface: 0
-    - _TRANSPARENCY: 1
-    - _UVSec: 0
    - _WorkflowMode: 1
    - _ZWrite: 1
    m_Colors:
-    - _BASE_COLOR: {r: 1, g: 1, b: 1, a: 1}
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EMISSION_COLOR: {r: 0, g: 0, b: 0, a: 1}
+    - _BaseColor: {r: 0.13154629, g: 1, b: 0.033018887, a: 1}
+    - _Color: {r: 0.13154626, g: 1, b: 0.033018887, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _REFLECTIONS_COLOR: {r: 0.058823533, g: 0.058823533, b: 0.058823533, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
+--- !u!114 &4563437184854181132
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 5
--- a/Assets/HQB/LineFlare.mat.meta
+++ b/Assets/HQB/LineFlare.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 349b9c4bed5bcee4e93531e193b78099
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/HQB/Scene/10002_2002_03_LiveScene-test.unity
+++ b/Assets/HQB/Scene/10002_2002_03_LiveScene-test.unity
@ -1529,6 +1529,11 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 400000, guid: 445778253575d6d428f6255fdf6ad9b0, type: 3}
  m_PrefabInstance: {fileID: 506756525}
  m_PrefabAsset: {fileID: 0}
+--- !u!23 &518522024 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -3998476776823381247, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 920617056}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &529537040 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 9187321579145288681, guid: 543377e480fab384db837fbf32857c2e, type: 3}
@ -2536,11 +2541,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.7071068
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
      propertyPath: m_LocalRotation.y
@ -2548,7 +2553,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -2562,6 +2567,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -8017869144671347534, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -2900095936978269615, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
      propertyPath: m_Name
      value: "\u9AD8\u7CB1"
@ -2570,8 +2583,79 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 1694021582791356747, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: a21cca814073e2848adf0f0486b4ab79, type: 2}
+    - target: {fileID: 1694021582791356747, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 4ea81c8ff47d8a2419f005558346cf10, type: 2}
+    - target: {fileID: 1694021582791356747, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 97ad710401f7bdc46b95361080b3fd49, type: 2}
+    - target: {fileID: 1694021582791356747, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: 65b1f29f4bcf4f54680ac62420f96fa5, type: 2}
+    - target: {fileID: 1694021582791356747, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: 5562b034296dd4c48a1d3c9f141cd5a0, type: 2}
+    - target: {fileID: 3195695852829364329, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+--- !u!1 &827966437 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+  m_PrefabInstance: {fileID: 827966436}
+  m_PrefabAsset: {fileID: 0}
+--- !u!23 &827966438 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -8494865417761350480, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+  m_PrefabInstance: {fileID: 827966436}
+  m_PrefabAsset: {fileID: 0}
+--- !u!23 &827966439 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: 1694021582791356747, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+  m_PrefabInstance: {fileID: 827966436}
+  m_PrefabAsset: {fileID: 0}
+--- !u!23 &827966440 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: 5860336300713426561, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+  m_PrefabInstance: {fileID: 827966436}
+  m_PrefabAsset: {fileID: 0}
+--- !u!205 &827966441
+LODGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 827966437}
+  serializedVersion: 2
+  m_LocalReferencePoint: {x: 0.011049271, y: 0.85338193, z: 0.3040673}
+  m_Size: 1.7067641
+  m_FadeMode: 0
+  m_AnimateCrossFading: 0
+  m_LastLODIsBillboard: 0
+  m_LODs:
+  - screenRelativeHeight: 0.550714
+    fadeTransitionWidth: 0
+    renderers:
+    - renderer: {fileID: 827966440}
+  - screenRelativeHeight: 0.1153086
+    fadeTransitionWidth: 0
+    renderers:
+    - renderer: {fileID: 827966439}
+  - screenRelativeHeight: 0.025195329
+    fadeTransitionWidth: 0
+    renderers:
+    - renderer: {fileID: 827966438}
+  m_Enabled: 1
 --- !u!1001 &839963840
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2738,6 +2822,11 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &857691707 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -8326642023725123173, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 920617056}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &873464289
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2855,6 +2944,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: "\u6559\u5E08\uFF08\u4F38\u624B\u52A8\u753B\uFF09"
      objectReference: {fileID: 0}
+    - target: {fileID: 7751996367803956135, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: 1abb1b6f9630bae479d11efa79cad9b2, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3c4efde06dda5f2459a3fecf3471ae17, type: 3}
 --- !u!1 &885825243 stripped
@ -2977,11 +3070,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0.7071068
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
      propertyPath: m_LocalRotation.y
@ -2989,7 +3082,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -3003,6 +3096,30 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -8326642023725123173, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: bdbf5cdea4e550a4a8c6c8f755b57de8, type: 2}
+    - target: {fileID: -8326642023725123173, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: baaef5b56a517a84ab5cd6c1182bbcb2, type: 2}
+    - target: {fileID: -8326642023725123173, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 3b4b6ba651e8594489a6c839755ce60a, type: 2}
+    - target: {fileID: -8326642023725123173, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: d7fbe96ca1bb3cd42ad09b9b14f21846, type: 2}
+    - target: {fileID: -8326642023725123173, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: da18bf1190d37ca41955f834e1f4371a, type: 2}
+    - target: {fileID: -7270185485263377004, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
      propertyPath: m_Name
      value: "\u9AD8\u7CB1\u75C5\u682A"
@ -3011,6 +3128,14 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 3281795873673712345, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5328063534922025856, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
 --- !u!1 &930017688 stripped
@ -3539,6 +3664,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 543377e480fab384db837fbf32857c2e, type: 3}
+--- !u!23 &1122854253 stripped
+MeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -8656078578208857367, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 920617056}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1144076230
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -5350,6 +5480,38 @@ MonoBehaviour:
  m_RequiresDepthTexture: 0
  m_RequiresColorTexture: 0
  m_Version: 2
+--- !u!1 &1853791771 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 920617056}
+  m_PrefabAsset: {fileID: 0}
+--- !u!205 &1853791775
+LODGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1853791771}
+  serializedVersion: 2
+  m_LocalReferencePoint: {x: 0.050009966, y: 0.85338205, z: 0.30406743}
+  m_Size: 1.7067641
+  m_FadeMode: 0
+  m_AnimateCrossFading: 0
+  m_LastLODIsBillboard: 0
+  m_LODs:
+  - screenRelativeHeight: 0.5464289
+    fadeTransitionWidth: 0
+    renderers:
+    - renderer: {fileID: 518522024}
+  - screenRelativeHeight: 0.11928467
+    fadeTransitionWidth: 0
+    renderers:
+    - renderer: {fileID: 857691707}
+  - screenRelativeHeight: 0.014444887
+    fadeTransitionWidth: 0
+    renderers:
+    - renderer: {fileID: 1122854253}
+  m_Enabled: 1
 --- !u!1 &1875192040
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
+++ b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
--- a/Assets/Resources/Prefabs/高粱预制体.prefab
+++ b/Assets/Resources/Prefabs/高粱预制体.prefab
@ -73,6 +73,7 @@ GameObject:
  - component: {fileID: 963909014448707086}
  - component: {fileID: 6594386118979159493}
  - component: {fileID: 4258570619904434678}
+  - component: {fileID: 3262949078777193882}
  m_Layer: 0
  m_Name: "\u9AD8\u7CB1\u9884\u5236\u4F53"
  m_TagString: Untagged
@ -129,6 +130,178 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 0.6, y: 1.84, z: 0.6}
  m_Center: {x: 0, y: 0.92, z: 0}
+--- !u!114 &3262949078777193882
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963909014448707081}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  profile: {fileID: 0}
+  profileSync: 0
+  camerasLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  effectGroup: 0
+  effectGroupLayer:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  effectNameFilter: 
+  combineMeshes: 0
+  alphaCutOff: 0
+  cullBackFaces: 1
+  ignoreObjectVisibility: 0
+  reflectionProbes: 0
+  GPUInstancing: 1
+  optimizeSkinnedMesh: 1
+  depthClip: 0
+  cameraDistanceFade: 0
+  cameraDistanceFadeNear: 0
+  cameraDistanceFadeFar: 1000
+  normalsOption: 0
+  ignore: 0
+  _highlighted: 0
+  fadeInDuration: 0
+  fadeOutDuration: 0
+  flipY: 0
+  constantWidth: 1
+  subMeshMask: -1
+  overlay: 0
+  overlayMode: 0
+  overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+  overlayAnimationSpeed: 1
+  overlayMinIntensity: 0.5
+  overlayBlending: 1
+  overlayTexture: {fileID: 0}
+  overlayTextureUVSpace: 0
+  overlayTextureScale: 1
+  overlayVisibility: 0
+  outline: 1
+  outlineColor: {r: 0.34440607, g: 0.990566, b: 0.0046724924, a: 1}
+  outlineColorStyle: 0
+  outlineGradient:
+    serializedVersion: 2
+    key0: {r: 1, g: 1, b: 1, a: 1}
+    key1: {r: 1, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  outlineGradientInLocalSpace: 0
+  outlineWidth: 0.45
+  outlineBlurPasses: 2
+  outlineQuality: 3
+  outlineEdgeMode: 0
+  outlineEdgeThreshold: 0.995
+  outlineDownsampling: 1
+  outlineVisibility: 0
+  glowBlendMode: 0
+  outlineBlitDebug: 0
+  outlineIndependent: 0
+  outlineContourStyle: 0
+  glow: 0
+  glowWidth: 0.4
+  glowQuality: 3
+  glowBlurMethod: 0
+  glowDownsampling: 2
+  glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
+  glowDithering: 1
+  glowMagicNumber1: 0.75
+  glowMagicNumber2: 0.5
+  glowAnimationSpeed: 1
+  glowVisibility: 0
+  glowBlitDebug: 0
+  glowBlendPasses: 1
+  glowPasses:
+  - offset: 4
+    alpha: 0.1
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 3
+    alpha: 0.2
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 2
+    alpha: 0.3
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  - offset: 1
+    alpha: 0.4
+    color: {r: 0.64, g: 1, b: 0, a: 1}
+  glowIgnoreMask: 0
+  innerGlow: 0
+  innerGlowWidth: 1
+  innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
+  innerGlowBlendMode: 0
+  innerGlowVisibility: 0
+  targetFX: 0
+  targetFXTexture: {fileID: 0}
+  targetFXColor: {r: 1, g: 1, b: 1, a: 1}
+  targetFXCenter: {fileID: 0}
+  targetFXRotationSpeed: 50
+  targetFXInitialScale: 4
+  targetFXEndScale: 1.5
+  targetFXScaleToRenderBounds: 1
+  targetFXAlignToGround: 0
+  targetFXFadePower: 32
+  targetFXGroundMaxDistance: 10
+  targetFXGroundLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  targetFXTransitionDuration: 0.5
+  targetFXStayDuration: 1.5
+  targetFXVisibility: 1
+  seeThrough: 2
+  seeThroughOccluderMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  seeThroughOccluderThreshold: 0.3
+  seeThroughOccluderMaskAccurate: 0
+  seeThroughOccluderCheckInterval: 1
+  seeThroughOccluderCheckIndividualObjects: 0
+  seeThroughDepthOffset: 0
+  seeThroughMaxDepth: 0
+  seeThroughIntensity: 0.8
+  seeThroughTintAlpha: 0.5
+  seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
+  seeThroughNoise: 1
+  seeThroughBorder: 0
+  seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
+  seeThroughBorderOnly: 0
+  seeThroughBorderWidth: 0.45
+  seeThroughOrdered: 0
+  seeThroughTexture: {fileID: 0}
+  seeThroughTextureUVSpace: 0
+  seeThroughTextureScale: 1
+  rmsCount: 0
+  hitFxInitialIntensity: 0
+  hitFxMode: 0
+  hitFxFadeOutDuration: 0.25
+  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+  hitFxRadius: 0.5
 --- !u!1 &5495461739195588011
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab
+++ b/Assets/Resources/UI/UI_Panel/UI_CustomSessionPanel.prefab
@ -764,6 +764,7 @@ MonoBehaviour:
  icon:
  - {fileID: 21300000, guid: 2c7d786d109ef214084e0fb315834b00, type: 3}
  - {fileID: 21300000, guid: 16c830209b0af6e42b877ee77e8c1174, type: 3}
+  - {fileID: 21300000, guid: eb4af3d112f9aff47bbfab888ecf5713, type: 3}
  headIcon: {fileID: 3245176101987448152}
  MidPanel: {fileID: 4321262606544612916}
  ContentPanel: {fileID: 2593408648689179035}
--- a/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab
+++ b/Assets/Resources/UI/UI_Panel/UI_PlantComparisonPanel.prefab
@ -144,7 +144,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a5549af0ab4860f4982ec854145a825c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  rextualPanel: {fileID: 4007482462058298327}
+  rextualPanel: {fileID: 0}
  targetRawImage: {fileID: 0}
 --- !u!1 &103622424108342245
 GameObject:
@ -5154,7 +5154,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 4949156397131831978}
-  - component: {fileID: 4007482462058298327}
+  - component: {fileID: -2053597471533093755}
  m_Layer: 5
  m_Name: UI_PlantComparisonPanel
  m_TagString: Untagged
@ -5184,7 +5184,7 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4007482462058298327
+--- !u!114 &-2053597471533093755
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -5193,12 +5193,12 @@ MonoBehaviour:
  m_GameObject: {fileID: 3213127863992522820}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 39a57370865ba71489611c8402e8de4f, type: 3}
+  m_Script: {fileID: 11500000, guid: a3f6b08a228f8d54a9764628dab61c5c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  rawImage: {fileID: 0}
-  ToptextMeshProUGUI: {fileID: 0}
-  ContentTextMeshProUGUI: {fileID: 0}
+  ToptextMeshProUGUI: {fileID: 4009316998971189925}
+  ContentTextMeshProUGUI: {fileID: 9213132001424090846}
 --- !u!1 &3326583893673649304
 GameObject:
  m_ObjectHideFlags: 0
@ -11574,7 +11574,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: a5549af0ab4860f4982ec854145a825c, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  rextualPanel: {fileID: 4007482462058298327}
+  rextualPanel: {fileID: 0}
  targetRawImage: {fileID: 0}
 --- !u!1 &7027306909045918957
 GameObject:
@ -14511,6 +14511,7 @@ GameObject:
  - component: {fileID: 2404267383160180}
  - component: {fileID: 843251802214501615}
  - component: {fileID: 1958389020031708348}
+  - component: {fileID: 395113591}
  m_Layer: 5
  m_Name: "\u9AD8\u7CB1RawImage"
  m_TagString: Untagged
@ -14559,20 +14560,34 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 0}
+  m_Texture: {fileID: 8400000, guid: fb2169cf27c4ec54aa65469ee996e57a, type: 2}
  m_UVRect:
    serializedVersion: 2
    x: 0
    y: 0
    width: 1
    height: 1
+--- !u!114 &395113591
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8114533561954947977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01b62ba21085e1b4d9bb07e1113f23af, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rextualPanel: {fileID: -2053597471533093755}
+  targetRawImage: {fileID: 1958389020031708348}
 --- !u!1 &8134453354313840729
 GameObject:
  m_ObjectHideFlags: 0
@ -15810,6 +15825,7 @@ GameObject:
  - component: {fileID: 5554581364043024722}
  - component: {fileID: 2197527208233419064}
  - component: {fileID: 3802914729905730975}
+  - component: {fileID: 395113590}
  m_Layer: 5
  m_Name: "\u7389\u7C73RawImage"
  m_TagString: Untagged
@ -15835,7 +15851,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 815, y: 584}
+  m_SizeDelta: {x: 679, y: 584}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2197527208233419064
 CanvasRenderer:
@ -15858,20 +15874,34 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Texture: {fileID: 0}
+  m_Texture: {fileID: 8400000, guid: 76c94c4c4c4548a4c9cbc8d1ea0c1236, type: 2}
  m_UVRect:
    serializedVersion: 2
    x: 0
    y: 0
    width: 1
    height: 1
+--- !u!114 &395113590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8915531652701088100}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01b62ba21085e1b4d9bb07e1113f23af, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rextualPanel: {fileID: -2053597471533093755}
+  targetRawImage: {fileID: 3802914729905730975}
 --- !u!1 &8928618135586076302
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/HQB/RangeFinding/MeasureDistance.prefab
+++ b/Assets/Scripts/HQB/RangeFinding/MeasureDistance.prefab
@ -61,7 +61,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  - {fileID: 2100000, guid: 349b9c4bed5bcee4e93531e193b78099, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -188,7 +188,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
+  - {fileID: 2100000, guid: 349b9c4bed5bcee4e93531e193b78099, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@ -260,7 +260,7 @@ MonoBehaviour:
  StObj: {fileID: 1414645914767451568}
  EdObj: {fileID: 1414645913928041328}
  IsRt: 1
-  LineWidth: 0.05
-  LineMat: {fileID: 2100000, guid: d704fb960bf87f043b794a93136b57e2, type: 2}
-  LineColor: {r: 1, g: 1, b: 1, a: 1}
+  LineWidth: 0.02
+  LineMat: {fileID: 2100000, guid: 349b9c4bed5bcee4e93531e193b78099, type: 2}
+  LineColor: {r: 0.13154629, g: 1, b: 0.033018887, a: 1}
  unittype: 100
--- a/Assets/Scripts/HQB/SorghumController.cs
+++ b/Assets/Scripts/HQB/SorghumController.cs
@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SocialPlatforms;

 public enum SorghumState
 {
@ -35,6 +36,20 @@ public class SorghumController : PermanentTriggerBase
            // Ó¦ÓÃÐÂµÄÐý×ª½Ç¶È
            transform.eulerAngles = currentRotation;
        }
+
+
+        switch (State)
+        {
+            case SorghumState.Diseased:
+                triggerName = "高粱_病株";
+                this.gameObject.name = "高粱_病株";
+                break;
+            case SorghumState.Healthy:
+                triggerName = "高粱_正常";
+                this.gameObject.name = "高粱_正常";
+                break;
+        }
+
    }

    protected override void OnMDown()
@ -47,7 +62,7 @@ public class SorghumController : PermanentTriggerBase


        GameObject targetObj = GameObject.Find("Split_Obj");
-        
+
        GameObject targetHD = targetObj.transform.GetChild(0).gameObject;
        GameObject targetSD = targetObj.transform.GetChild(1).gameObject;
        if (State == SorghumState.Diseased)
@ -62,7 +77,28 @@ public class SorghumController : PermanentTriggerBase
            targetHD.SetActive(false);
            targetSD.SetActive(true);
            GameManager.UIMgr.ShowPanel<UI_BGPanel>(E_UI_Layer.Top);
-            GameManager.UIMgr.ShowPanel<UI_GraphicRextualPanel>(E_UI_Layer.Top, (p) => { p.Init(); });
+            GameManager.UIMgr.ShowPanel<UI_PlantComparisonPanel>(E_UI_Layer.Top, (p) => { p.Init(); });
        }
    }
+
+    protected override void OnMEnter()
+    {
+        base.OnMEnter();
+        //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study)
+        //{
+        _highlight.SetHighlighted(true);
+        //}
+    }
+
+    protected override void OnMExit()
+    {
+        //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study)
+        _highlight.SetHighlighted(false);
+        base.OnMExit();
+    }
+
+    protected override void OnAwake()
+    {
+        base.OnAwake();
+    }
 }
--- a/Assets/Scripts/Project/Objects/Other/NPCController.cs
+++ b/Assets/Scripts/Project/Objects/Other/NPCController.cs
@ -42,14 +42,14 @@ public class NPCController : PermanentTriggerBase
    {
        base.OnMEnter();
        if (!isClose) return;
-        if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study)
-        {
+        //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study)
+        //{
            _highlight.SetHighlighted(true);
-        }
+        //}
    }
    protected override void OnMExit()
    {
-        if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study)
+        //if (GameManager.RunModelMgr?.ModeType != E_ModeType.Study)
            _highlight.SetHighlighted(false);
        base.OnMExit();
    }
--- a/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs
+++ b/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs
@ -51,7 +51,7 @@ public class NPC_Attach10002_2002 : NPC_Attach_Base
                //与客户沟通
                GameManager.UIMgr.ShowPanel<UI_CustomSessionPanel>(E_UI_Layer.Mid, (panel) =>
                {
-                    panel.Init(custom.triggerName, "컬혤묏야。", "寧돔일可", 0, (intTemp) =>
+                    panel.Init(custom.triggerName, "컬혤묏야。", "寧돔일可",2, (intTemp) =>
                    {
                        List<ItemInfo> items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "放大镜","剪刀","解剖刀","镊子" });
                        items2.ForEach(item =>
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs
@ -24,6 +24,8 @@ public class UI_PPTForPracticePanel : BasePanel

    public UI_SelectDevicePanel UI_SelectDevice;

+    protected bool isPPTLoading = false;
+
    protected override void Awake()
    {
        canvasGroup.alpha = 1f;
@ -136,7 +138,9 @@ public class UI_PPTForPracticePanel : BasePanel
    }
    protected override void OnChangeToggle(string togglePath, bool isOn)
    {
+        
        base.OnChangeToggle(togglePath, isOn);
+        if (isPPTLoading) return;//PPT正在加载中，不处理其他切换
        switch (togglePath)
        {
            default:
@ -146,6 +150,7 @@ public class UI_PPTForPracticePanel : BasePanel
                    {
                        DestroyImmediate(child.gameObject);
                    }
+                    isPPTLoading = true;
                    // Æô¶¯Ð³ÌÒì²½¼ÓÔØPPT
                    StartCoroutine(LoadPPTAsync(togglePath, textures =>
                    {
@ -181,6 +186,7 @@ public class UI_PPTForPracticePanel : BasePanel
            image.texture = texture;
            image.rectTransform.sizeDelta = new Vector2(1608, 940);
        }
+        isPPTLoading = false;//完成加载
    }

    private void DisplaySinglePage(Texture2D texture)
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs
@ -0,0 +1,77 @@
+using System.Collections;
+using System.Collections.Generic;
+using TMPro;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class UI_PlantComparisonPanel : BasePanel
+{
+    public RawImage rawImage;
+
+    //¶¥²¿ÎÄ×Ö
+    public TextMeshProUGUI ToptextMeshProUGUI;
+
+    //ÄÚÈÝ
+    public TextMeshProUGUI ContentTextMeshProUGUI;
+
+    //public RawImageScript rawImageScript_Left;
+    //public RawImageScript rawImageScript_Right;
+
+    public plantsInfo plantsInfo;
+
+    public void Init()
+    {
+        plantsInfo = JsonManager.Instance.LoadData<plantsInfo>("plantsInfo");
+        ToptextMeshProUGUI.text = "";
+        ContentTextMeshProUGUI.text = "";
+    }
+
+    public void showPlantPartOnRawImage(GameObject partObj)
+    {
+        ToptextMeshProUGUI.text = "";
+        ContentTextMeshProUGUI.text = "";
+
+        plantsInfo.allPlants.ForEach(plant => {
+            if (partObj.transform.parent.gameObject.name == plant.plantName)
+            {
+                string title = plant.plantName + ":";
+                plant.plantParts.ForEach(part =>
+                {
+                    if (partObj.name == part.partName)
+                    {
+                        ToptextMeshProUGUI.text = (title += part.partName);
+                        ContentTextMeshProUGUI.text = part.partIntro;
+                        return;
+                    }
+                });
+            }
+        });
+    }
+
+    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":
+                GameManager.UIMgr.HidePanel<UI_PlantComparisonPanel>();
+                GameManager.UIMgr.HidePanel<UI_BGPanel>();
+                //LiveSceneManger.Instance.TipBtn.gameObject.SetActive(true);
+                break;
+        }
+    }
+
+}
+
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs.meta
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a3f6b08a228f8d54a9764628dab61c5c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/RawImageScript_SC.cs
+++ b/Assets/Scripts/RawImageScript_SC.cs
@ -0,0 +1,111 @@
+using HighlightPlus;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
+public class RawImageScript_SC : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerMoveHandler
+{
+    //正常植株和病株对比面板
+    public UI_PlantComparisonPanel rextualPanel;
+    public RawImage targetRawImage;
+
+    HighlightEffect _highlight = null;
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+    }
+
+    public void OnPointerMove(PointerEventData eventData)
+    {
+        GameObject hoveredObject = eventData.pointerEnter;
+        RawImage rawImage = this.GetComponent<RawImage>();
+        // 步骤1：转换为RawImage局部坐标
+        RectTransformUtility.ScreenPointToLocalPointInRectangle(
+            targetRawImage.rectTransform,
+            Input.mousePosition,
+            null,
+            out Vector2 localPos);
+
+        Vector2 uv = CalculateUV(localPos);
+        if (uv.x < 0 || uv.x > 1 || uv.y < 0 || uv.y > 1) return;
+
+        Camera renderCamera = null;
+        int layerMask = 0;
+        if (hoveredObject.name == "高粱RawImage")
+        {
+            Debug.Log("我进高粱了");
+            renderCamera = GameObject.Find("Camera_Normal").GetComponent<Camera>();
+            layerMask = 1 << LayerMask.NameToLayer("Split_Normal");
+            // 步骤3：生成射线
+        }
+        else if (hoveredObject.name == "玉米RawImage")
+        {
+            Debug.Log("我进玉米了");
+            renderCamera = GameObject.Find("Camera_Disease").GetComponent<Camera>();
+            layerMask = 1 << LayerMask.NameToLayer("Split_Disease");
+        }
+        else
+        {
+            renderCamera = Camera.main;
+            layerMask = 1 << LayerMask.NameToLayer("Default");
+        }
+        Ray ray = renderCamera.ViewportPointToRay(uv);
+        if (Physics.Raycast(ray, out RaycastHit hit,
+            renderCamera.farClipPlane,
+            layerMask))
+        {
+            Debug.Log($"选中物体：{hit.collider.name}", hit.collider.gameObject);
+            if (_highlight != null)
+            {
+                _highlight.SetHighlighted(false);
+                _highlight = null;
+            }
+            _highlight = hit.collider.gameObject.GetComponent<HighlightEffect>();
+            if (_highlight != null)
+            {
+                _highlight.SetHighlighted(true);
+                rextualPanel.showPlantPartOnRawImage(hit.collider.gameObject);
+            }
+        }
+        else
+        {
+            if (_highlight != null)
+            {
+                _highlight.SetHighlighted(false);
+                _highlight = null;
+            }
+        }
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        GameObject hoveredObject = eventData.pointerEnter;
+        if (hoveredObject.name == "正常高粱")
+        {
+            Debug.Log("我退出正常了");
+        }
+        else if (hoveredObject.name == "病株")
+        {
+            Debug.Log("我退出病株了");
+        }
+    }
+
+    private Vector2 CalculateUV(Vector2 localPos)
+    {
+        Rect rect = targetRawImage.rectTransform.rect;
+
+        // 处理不同锚点模式
+        Vector2 pivot = targetRawImage.rectTransform.pivot;
+        Vector2 offset = new Vector2(
+            localPos.x + rect.width * pivot.x,
+            localPos.y + rect.height * pivot.y
+        );
+
+        return new Vector2(
+            offset.x / rect.width,
+            offset.y / rect.height
+        );
+    }
+}
--- a/Assets/Scripts/RawImageScript_SC.cs.meta
+++ b/Assets/Scripts/RawImageScript_SC.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 01b62ba21085e1b4d9bb07e1113f23af
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml
+++ b/Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml
@ -4,15 +4,15 @@
  <Subject id="2002" deviceTypeId="20002" schemeName="酿酒高粱的形态特征及类型识别" deviceMap="单相表" isFault="0" schemeDes="" ToolOrMaterilOrDevice="放大镜,剪刀,解剖刀,镊子">
    <Process id="" processName="观察高粱特征" processDes="">
 		<Step id="" subProcessName="从老师处拿取工具" isPrecondition="FALSE" precondition="" tipTitle="" tips="">
-			<operation id="" subProcessStepName="填写拆装工作单" isPrecondition="" precondition="Office" triggerID="拆装工单按钮" tipTitle="请填写拆装工作单" score=""></operation>
+			<operation id="" subProcessStepName="从老师处拿取工具" isPrecondition="" precondition="Office" triggerID="NPC客户" tipTitle="请填写拆装工作单" score=""></operation>
 		</Step>
 		
 		<Step id="" subProcessName="观察成熟期正常特征" isPrecondition="FALSE" precondition="" tipTitle="" tips="请填写正确的拆装工作单">
-        <operation id="" subProcessStepName="填写拆装工作单" isPrecondition="" precondition="Office" triggerID="拆装工单按钮" tipTitle="请填写拆装工作单" score=""></operation>
+        <operation id="" subProcessStepName="观察成熟期正常特征" isPrecondition="" precondition="Office" triggerID="高粱_正常" tipTitle="请填写拆装工作单" score=""></operation>
      </Step>

      <Step id="" subProcessName="观察成熟期病株特征" isPrecondition="FALSE" precondition="" tipTitle="" tips="请前往工具间，选取工作服、绝缘鞋、安全帽、手套，到梳妆镜面前进行换装">
-        <operation id="" subProcessStepName="前往工具间" isPrecondition="" precondition="Office" triggerID="工具间按钮" tipTitle="前往工具间" score=""></operation>
+        <operation id="" subProcessStepName="观察成熟期病株特征" isPrecondition="" precondition="Office" triggerID="高粱_病株" tipTitle="前往工具间" score=""></operation>
      </Step>
 		
    </Process>
--- a/Sirenix.OdinInspector.Modules.UnityMathematics.csproj
+++ b/Sirenix.OdinInspector.Modules.UnityMathematics.csproj
@ -445,6 +445,10 @@
      <HintPath>Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Cells">
+      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="DOTweenPro">
      <HintPath>Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.dll</HintPath>
      <Private>False</Private>
@ -489,6 +493,14 @@
      <HintPath>Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Words">
+      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Aspose.Slides">
+      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>Assets\Scripts\Editor\ExcelDll\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>False</Private>
@ -505,6 +517,10 @@
      <HintPath>Assets\Scripts\Editor\ExcelDll\Excel.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Pdf">
+      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Newtonsoft.Json">
      <HintPath>Assets\Plugins\Newtonsoft.Json.dll</HintPath>
      <Private>False</Private>
@ -513,22 +529,6 @@
      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Aspose.Cells">
-      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Words">
-      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Slides">
-      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Pdf">
-      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="nunit.framework">
      <HintPath>Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll</HintPath>
      <Private>False</Private>
--- a/UniRx.csproj
+++ b/UniRx.csproj
@ -662,6 +662,10 @@
      <HintPath>Assets\Plugins\Demigiant\DOTween\DOTween.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Cells">
+      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="DOTweenPro">
      <HintPath>Assets\Plugins\Demigiant\DOTweenPro\DOTweenPro.dll</HintPath>
      <Private>False</Private>
@ -706,6 +710,14 @@
      <HintPath>Library\PackageCache\com.unity.visualscripting@1.9.2\Editor\VisualScripting.Core\EditorAssetResources\Unity.VisualScripting.TextureAssets.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Words">
+      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Aspose.Slides">
+      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>Assets\Scripts\Editor\ExcelDll\ICSharpCode.SharpZipLib.dll</HintPath>
      <Private>False</Private>
@ -722,6 +734,10 @@
      <HintPath>Assets\Scripts\Editor\ExcelDll\Excel.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Aspose.Pdf">
+      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Newtonsoft.Json">
      <HintPath>Assets\Plugins\Newtonsoft.Json.dll</HintPath>
      <Private>False</Private>
@ -730,22 +746,6 @@
      <HintPath>Assets\Plugins\Sirenix\Assemblies\Sirenix.Serialization.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Aspose.Cells">
-      <HintPath>Assets\Plugins\Aspose.Cells.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Words">
-      <HintPath>Assets\Plugins\Aspose.Words.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Slides">
-      <HintPath>Assets\Plugins\Aspose.Slides.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Aspose.Pdf">
-      <HintPath>Assets\Plugins\Aspose.Pdf.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="mscorlib">
      <HintPath>E:\Unity\2021.3.37f1c1\Editor\Data\UnityReferenceAssemblies\unity-4.8-api\mscorlib.dll</HintPath>
      <Private>False</Private>
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,35 +6,35 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a
+      value: 01070d5f560c5e0d5f0f5c7240735b4444164a2c2e7a7f3579784e63e4b06d61
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a
+      value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a
      flags: 0
    RecentlyUsedSceneGuid-2:
-      value: 5401015552000c5f5d0d0a7b12725d4443161c7c7c7023677f2c4e6bb5e3303a
+      value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a
      flags: 0
    RecentlyUsedSceneGuid-3:
      value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b
      flags: 0
    RecentlyUsedSceneGuid-4:
-      value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d
-      flags: 0
-    RecentlyUsedSceneGuid-5:
-      value: 020355555607505e0e0b097b4821594412161a7f2f2b24672b701c65b1e5353c
-      flags: 0
-    RecentlyUsedSceneGuid-6:
-      value: 51000c005c010c0f5b595b731372074444161e72787d2365797c1b64b6b4306f
-      flags: 0
-    RecentlyUsedSceneGuid-7:
-      value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e
-      flags: 0
-    RecentlyUsedSceneGuid-8:
      value: 020207045d025c580b565f2047225c44424e4d7d2a2a74317b7f1e6ae7b26260
      flags: 0
-    RecentlyUsedSceneGuid-9:
+    RecentlyUsedSceneGuid-5:
+      value: 5401015552000c5f5d0d0a7b12725d4443161c7c7c7023677f2c4e6bb5e3303a
+      flags: 0
+    RecentlyUsedSceneGuid-6:
+      value: 505457525c055d0d5b0d5c7344265c444e4e4d7c7c7a22322b7e4e32e7b7316d
+      flags: 0
+    RecentlyUsedSceneGuid-7:
      value: 0653525e54025c0a550f547040750b44424e1a2c7d782464757e1c62e3e56d6e
      flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 055302565656080e0f575d2346260644404e192c757c22357d794e65e3b9373e
+      flags: 0
+    RecentlyUsedSceneGuid-9:
+      value: 020355555607505e0e0b097b4821594412161a7f2f2b24672b701c65b1e5353c
+      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
      flags: 0
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@ -21,12 +21,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 30
-    width: 1920
-    height: 947
+    width: 2560
+    height: 1307
  m_MinSize: {x: 400, y: 200}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 62639
+  controlID: 284
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -35,11 +35,11 @@ MonoBehaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
+  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 4000, y: 4000}
  m_TitleContent:
    m_Text: Game
@ -47,10 +47,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 2560
-    y: 173
-    width: 908
-    height: 826
+    x: 0
+    y: 744
+    width: 1209
+    height: 615
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -62,7 +62,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1920, y: 1080}
+  m_TargetSize: {x: 1209, y: 594}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@ -71,16 +71,16 @@ MonoBehaviour:
  m_VSyncEnabled: 0
  m_Gizmos: 0
  m_Stats: 0
-  m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
  m_ZoomArea:
    m_HRangeLocked: 0
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -960
-    m_HBaseRangeMax: 960
-    m_VBaseRangeMin: -540
-    m_VBaseRangeMax: 540
+    m_HBaseRangeMin: -604.5
+    m_HBaseRangeMax: 604.5
+    m_VBaseRangeMin: -297
+    m_VBaseRangeMax: 297
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@ -98,23 +98,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 908
-      height: 805
-    m_Scale: {x: 0.47291666, y: 0.47291666}
-    m_Translation: {x: 454, y: 402.5}
+      width: 1209
+      height: 594
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 604.5, y: 297}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -960
-      y: -851.1013
-      width: 1920
-      height: 1702.2026
+      x: -604.5
+      y: -297
+      width: 1209
+      height: 594
    m_MinimalGUI: 1
-  m_defaultScale: 0.47291666
-  m_LastWindowPixelSize: {x: 908, y: 826}
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1209, y: 615}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@ -128,7 +128,7 @@ MonoBehaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
@ -139,12 +139,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 909
-    height: 947
+    width: 1210
+    height: 1307
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 62640
+  controlID: 285
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -155,15 +155,15 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: 
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 909
-    height: 100
+    width: 1210
+    height: 671
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 5}
@ -191,10 +191,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 2560
+    x: 0
    y: 73
-    width: 908
-    height: 79
+    width: 1209
+    height: 650
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -216,7 +216,7 @@ MonoBehaviour:
      collapsed: 0
      displayed: 1
      snapOffset: {x: -141, y: 149}
-      snapOffsetDelta: {x: 0, y: -96}
+      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 1
      id: unity-grid-and-snap-toolbar
      index: 1
@ -226,7 +226,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 0, y: 25}
+      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: unity-scene-view-toolbar
@ -270,9 +270,9 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 67.5, y: -105}
-      snapOffsetDelta: {x: 0, y: 26}
-      snapCorner: 2
+      snapOffset: {x: 67.5, y: 86}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
      id: Orientation
      index: 0
      layout: 4
@ -420,7 +420,7 @@ MonoBehaviour:
      index: 12
      layout: 4
    m_OverlaysVisible: 1
-  m_WindowGUID: 5d60ed620f07d6141ad987b7c684b8e2
+  m_WindowGUID: 0e8cf0004cb48a4438db5a36a44c1098
  m_Gizmos: 1
  m_OverrideSceneCullingMask: 6917529027641081856
  m_SceneIsLit: 1
@ -430,9 +430,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 6.2454505, y: 4.3844056, z: -107.77292}
+    m_Target: {x: 0, y: 0, z: 0}
    speed: 2
-    m_Value: {x: 6.2454505, y: 4.3844056, z: -107.77292}
+    m_Value: {x: 0, y: 0, z: 0}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -449,7 +449,7 @@ MonoBehaviour:
    showImageEffects: 1
    showParticleSystems: 1
    showVisualEffectGraphs: 1
-    m_FxEnabled: 0
+    m_FxEnabled: 1
  m_Grid:
    xGrid:
      m_Fade:
@ -461,9 +461,9 @@ MonoBehaviour:
      m_Size: {x: 0, y: 0}
    yGrid:
      m_Fade:
-        m_Target: 0
+        m_Target: 1
        speed: 2
-        m_Value: 0
+        m_Value: 1
      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
      m_Pivot: {x: 0, y: 0, z: 0}
      m_Size: {x: 1, y: 1}
@ -474,18 +474,18 @@ MonoBehaviour:
        m_Value: 0
      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
      m_Pivot: {x: 0, y: 0, z: 0}
-      m_Size: {x: 1, y: 1}
-    m_ShowGrid: 0
+      m_Size: {x: 0, y: 0}
+    m_ShowGrid: 1
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: 0.37121692, y: -0.43861514, z: 0.20565291, w: 0.7921639}
+    m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
    speed: 2
-    m_Value: {x: 0.37121657, y: -0.43861473, z: 0.20565271, w: 0.79216313}
+    m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
  m_Size:
-    m_Target: 1.6477803
+    m_Target: 10
    speed: 2
-    m_Value: 1.6477803
+    m_Value: 10
  m_Ortho:
    m_Target: 0
    speed: 2
@ -503,7 +503,7 @@ MonoBehaviour:
    m_FarClip: 10000
    m_DynamicClip: 1
    m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0.37121692, y: -0.43861514, z: 0.20565291, w: 0.7921639}
+  m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0}
  m_LastSceneViewOrtho: 0
  m_ReplacementShader: {fileID: 0}
  m_ReplacementString: 
@ -518,19 +518,19 @@ MonoBehaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
-  m_EditorHideFlags: 0
+  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: 
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 100
-    width: 909
-    height: 847
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
+    y: 671
+    width: 1210
+    height: 636
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 2}
  m_Panes:
  - {fileID: 2}
@ -551,10 +551,10 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 909
+    x: 1210
    y: 0
-    width: 353
-    height: 947
+    width: 411
+    height: 1307
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 8}
@ -582,10 +582,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 3469
+    x: 1210
    y: 73
-    width: 351
-    height: 926
+    width: 409
+    height: 1286
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -596,7 +596,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: f0edf8fffeedf8ff6c70fdff7070fdff7a70fdffa82fffff30fbfffff4ffffff
+      m_ExpandedIDs: 
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -612,14 +612,14 @@ MonoBehaviour:
        m_IsRenaming: 0
        m_OriginalEventType: 11
        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 0}
      m_SearchString: 
    m_ExpandedScenes: []
    m_CurrenRootInstanceID: 0
    m_LockTracker:
      m_IsLocked: 0
    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 24aaf9ae63d7d9e439d2d1437b34a079
+  m_WindowGUID: 8a91b7359d04b994997f4771eddca1db
 --- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -635,10 +635,10 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1262
+    x: 1621
    y: 0
-    width: 315
-    height: 947
+    width: 367
+    height: 1307
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
  m_ActualView: {fileID: 10}
@ -666,10 +666,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 3822
+    x: 1621
    y: 73
-    width: 313
-    height: 926
+    width: 365
+    height: 1286
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -686,22 +686,23 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - "Assets/HQB/Texture/tsq/\u917F\u9152\u9AD8\u7CB1\u683D\u57F9_slices (3)"
+    - Assets
    m_Globs: []
    m_OriginalText: 
    m_FilterByTypeIntersection: 0
  m_ViewMode: 0
-  m_StartGridSize: 16
-  m_LastFolders: []
+  m_StartGridSize: 64
+  m_LastFolders:
+  - Assets
  m_LastFoldersGridSize: -1
  m_LastProjectPath: "E:\\\u9676\u82CF\u59472025\u9879\u76EE\u6587\u4EF6\u5939\\HQB_GL\\CultivationOfBrewing-2"
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 3c670200
-    m_LastClickedID: 157500
-    m_ExpandedIDs: ffffffff000000004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e740000927400009474000096740000987400009a7400009c740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000be740000c4740000c6740000c8740000ca740000dc790000be1c02000a4504001046040012460400144604001e460400224604006e47040080470400824704008647040088470400
+    m_SelectedIDs: 8a740000
+    m_LastClickedID: 29834
+    m_ExpandedIDs: ffffffff000000008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c740000a2740000a4740000aa740000ae740000b0740000b2740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000ce740000d0740000d2740000d4740000d8740000dc740000de740000e2740000e8740000ea740000ec740000ee740000f2740000f4740000f674000002750000047500000675000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -726,10 +727,10 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 3016}
+    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff000000004e74000050740000527400005474000056740000587400005a7400005c7400005e74000060740000627400006474000066740000687400006a7400006c7400006e74000070740000727400007474000076740000787400007a7400007c7400007e74000080740000827400008474000086740000887400008a7400008c7400008e740000927400009474000096740000987400009a7400009c740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000be740000c4740000c6740000c8740000ca740000dc790000be1c02000a4504001046040012460400144604001e460400224604006e47040080470400824704008647040088470400
+    m_ExpandedIDs: ffffffff000000008a7400008c7400008e74000090740000927400009474000096740000987400009a7400009c7400009e740000a0740000a2740000a4740000a6740000a8740000aa740000ac740000ae740000b0740000b2740000b4740000b6740000b8740000ba740000bc740000be740000c0740000c2740000c4740000c6740000c8740000ca740000cc740000ce740000d0740000d2740000d4740000d6740000d8740000da740000dc740000de740000e0740000e2740000e4740000e6740000e8740000ea740000ec740000ee740000f0740000f2740000f4740000f6740000f8740000fa740000fc740000fe74000000750000027500000475000006750000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -745,7 +746,7 @@ MonoBehaviour:
      m_IsRenaming: 0
      m_OriginalEventType: 11
      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 9}
+      m_ClientGUIView: {fileID: 0}
    m_SearchString: 
    m_CreateAssetUtility:
      m_EndAction: {fileID: 0}
@ -756,7 +757,7 @@ MonoBehaviour:
  m_ListAreaState:
    m_SelectedInstanceIDs: 
    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
    m_ExpandedInstanceIDs: 
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@ -773,7 +774,7 @@ MonoBehaviour:
      m_IsRenaming: 0
      m_OriginalEventType: 11
      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 9}
+      m_ClientGUIView: {fileID: 0}
    m_CreateAssetUtility:
      m_EndAction: {fileID: 0}
      m_InstanceID: 0
@ -782,7 +783,7 @@ MonoBehaviour:
      m_ResourceFile: 
    m_NewAssetIndexInList: -1
    m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 16
+    m_GridSize: 64
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 115
 --- !u!114 &11
@ -800,12 +801,12 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1577
+    x: 1988
    y: 0
-    width: 343
-    height: 947
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 572
+    height: 1307
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 12}
  m_Panes:
  - {fileID: 12}
@ -831,10 +832,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 4137
+    x: 1988
    y: 73
-    width: 342
-    height: 926
+    width: 571
+    height: 1286
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -843,7 +844,7 @@ MonoBehaviour:
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
  m_PreviewResizer:
-    m_CachedPref: 245
+    m_CachedPref: -160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@ -43,8 +43,8 @@ MonoBehaviour:
    y: 572
    width: 961
    height: 192
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 18}
  m_Panes:
  - {fileID: 18}
@ -69,8 +69,8 @@ MonoBehaviour:
    y: 764
    width: 961
    height: 175
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 14}
  m_Panes:
  - {fileID: 14}
@ -101,7 +101,7 @@ MonoBehaviour:
  m_MinSize: {x: 100, y: 300}
  m_MaxSize: {x: 8096, y: 24288}
  vertical: 1
-  controlID: 88
+  controlID: 176
 --- !u!114 &5
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -121,8 +121,8 @@ MonoBehaviour:
    y: 0
    width: 285
    height: 939
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 15}
  m_Panes:
  - {fileID: 15}
@ -204,7 +204,7 @@ MonoBehaviour:
  m_MinSize: {x: 400, y: 300}
  m_MaxSize: {x: 32384, y: 24288}
  vertical: 0
-  controlID: 54
+  controlID: 185
 --- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -271,8 +271,8 @@ MonoBehaviour:
    y: 0
    width: 369
    height: 939
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 16}
  m_Panes:
  - {fileID: 16}
@ -297,8 +297,8 @@ MonoBehaviour:
    y: 0
    width: 961
    height: 572
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 19}
  m_Panes:
  - {fileID: 19}
@ -431,9 +431,9 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: d4780000
      m_LastClickedID: 0
-      m_ExpandedIDs: 46f6ffff34fbffff
+      m_ExpandedIDs: 34fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -539,7 +539,7 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/HQB/Scene
+    - Assets
    m_Globs: []
    m_OriginalText: 
    m_FilterByTypeIntersection: 0
@ -579,7 +579,7 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 1492}
+    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
    m_ExpandedIDs: ffffffff00000000287400003274000098740000d4780000d6780000d8780000da780000dc780000de780000e0780000e2780000e4780000e6780000e8780000ea780000ec780000ee780000f0780000f2780000f4780000f6780000f8780000fa780000fc780000fe78000000790000027900000479000006790000087900000a7900000c7900000e79000010790000127900001479000016790000187900001a7900001c7900001e79000020790000227900002479000026790000287900002a7900002c7900002e79000030790000327900003479000036790000
@ -711,8 +711,8 @@ MonoBehaviour:
      y: 21
      width: 959
      height: 150
-    m_Scale: {x: 0.4574923, y: 0.45749223}
-    m_Translation: {x: 479.5, y: 78.19816}
+    m_Scale: {x: 0.4574923, y: 0.45749226}
+    m_Translation: {x: 479.5, y: 78.198166}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
@ -722,7 +722,7 @@ MonoBehaviour:
      x: -1048.1051
      y: -170.92784
      width: 2096.2102
-      height: 327.87442
+      height: 327.8744
    m_MinimalGUI: 1
  m_defaultScale: 0.1388889
  m_LastWindowPixelSize: {x: 959, y: 171}
@ -990,9 +990,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 27.93394, y: 3.90361, z: -137.38055}
+    m_Target: {x: -3.6993601, y: 4.287322, z: -130.22125}
    speed: 2
-    m_Value: {x: 27.93394, y: 3.90361, z: -137.38055}
+    m_Value: {x: -3.6993601, y: 4.287322, z: -130.22125}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -1039,13 +1039,13 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: -0.22849435, y: -0.38294128, z: 0.098352484, w: -0.8896666}
+    m_Target: {x: 0.001309546, y: 0.97032595, z: -0.005237078, w: 0.24181966}
    speed: 2
-    m_Value: {x: -0.22834271, y: -0.38426888, z: 0.09869345, w: -0.88907623}
+    m_Value: {x: 0.0013095208, y: 0.97030735, z: -0.0052369772, w: 0.24181503}
  m_Size:
-    m_Target: 0.9990049
+    m_Target: 1.0909383
    speed: 2
-    m_Value: 0.9990049
+    m_Value: 1.0909383
  m_Ortho:
    m_Target: 0
    speed: 2