tongbu2

Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master
# Conflicts: # UserSettings/EditorUserSettings.asset
2025-05-21 18:06:39 +08:00 · 2025-05-21 18:01:29 +08:00 · 2025-05-21 18:01:06 +08:00 · 2025-05-21 18:00:12 +08:00
8 changed files with 851 additions and 89 deletions
--- a/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
+++ b/Assets/HQB/Scene/10002_2002_03_OfficeScene.unity
@ -279,6 +279,223 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
  m_PrefabInstance: {fileID: 267617284}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &511699527 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3057514198336764871, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 136924459}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &511699531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 511699527}
+  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: 1
+  effectGroup: 1
+  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.23492157, g: 1, b: 0, 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.4
+  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: 1
+  hitFxInitialIntensity: 0
+  hitFxMode: 0
+  hitFxFadeOutDuration: 0.25
+  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+  hitFxRadius: 0.5
+--- !u!64 &511699532
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 511699527}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 978963988987963875, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+--- !u!64 &511699533
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 511699527}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 978963988987963875, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+--- !u!114 &511699534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 511699527}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c11d41cbc059c4d46a9e102cb8b90f6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!64 &531521516
 MeshCollider:
  m_ObjectHideFlags: 0
@ -341,7 +558,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &536866439
 Transform:
  m_ObjectHideFlags: 0
@ -665,6 +882,223 @@ MonoBehaviour:
  target: {fileID: 267617285}
  minDistance: 2
  isClose: 0
+--- !u!1 &846500697 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -1660739062635597432, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 136924459}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &846500701
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846500697}
+  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: 1
+  effectGroup: 1
+  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.23492157, g: 1, b: 0, 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.4
+  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: 1
+  hitFxInitialIntensity: 0
+  hitFxMode: 0
+  hitFxFadeOutDuration: 0.25
+  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+  hitFxRadius: 0.5
+--- !u!64 &846500702
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846500697}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4004621660992953091, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+--- !u!64 &846500703
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846500697}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4004621660992953091, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+--- !u!114 &846500704
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 846500697}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c11d41cbc059c4d46a9e102cb8b90f6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!64 &907607040
 MeshCollider:
  m_ObjectHideFlags: 0
@ -840,6 +1274,209 @@ MeshRenderer:
  m_CorrespondingSourceObject: {fileID: -9207319362877345106, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3}
  m_PrefabInstance: {fileID: 1774722050}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1244487600 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2884319168972385861, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+  m_PrefabInstance: {fileID: 136924459}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1244487604
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1244487600}
+  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: 1
+  effectGroup: 1
+  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.23492157, g: 1, b: 0, 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.4
+  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: 1
+  hitFxInitialIntensity: 0
+  hitFxMode: 0
+  hitFxFadeOutDuration: 0.25
+  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+  hitFxRadius: 0.5
+--- !u!64 &1244487605
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1244487600}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -4459642466956643653, guid: 51c3521496de1854697d5682cc43afe5, type: 3}
+--- !u!114 &1244487606
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1244487600}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c11d41cbc059c4d46a9e102cb8b90f6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!64 &1414877079
 MeshCollider:
  m_ObjectHideFlags: 0
@ -1396,22 +2033,6 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 3057514198336764871, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
  m_PrefabInstance: {fileID: 1882503364}
  m_PrefabAsset: {fileID: 0}
-<<<<<<< HEAD
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1902030985}
-  - component: {fileID: 1902030984}
-  - component: {fileID: 1902030982}
-  - component: {fileID: 1902030986}
-  m_Layer: 0
-  m_Name: Camera_Normal
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1902030982
-=======
 --- !u!1 &1882503367 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: -1660739062635597432, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
@ -1423,7 +2044,6 @@ GameObject:
  m_PrefabInstance: {fileID: 1882503364}
  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1882503369
->>>>>>> 5edd75841aa2d4dc0ed7bb3430aa850a8fd1c9b0
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -1439,43 +2059,9 @@ MonoBehaviour:
  profileSync: 0
  camerasLayerMask:
    serializedVersion: 2
-<<<<<<< HEAD
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 0
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
--- !u!20 &1902030984
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1902030981}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-=======
    m_Bits: 4294967295
-  effectGroup: 0
+  effectGroup: 1
  effectGroupLayer:
->>>>>>> 5edd75841aa2d4dc0ed7bb3430aa850a8fd1c9b0
    serializedVersion: 2
    m_Bits: 4294967295
  effectNameFilter: 
@ -1509,7 +2095,7 @@ Camera:
  overlayTextureScale: 1
  overlayVisibility: 0
  outline: 1
-  outlineColor: {r: 0, g: 0, b: 0, a: 1}
+  outlineColor: {r: 0.23492157, g: 1, b: 0, a: 1}
  outlineColorStyle: 0
  outlineGradient:
    serializedVersion: 2
@ -1541,7 +2127,7 @@ Camera:
    m_NumColorKeys: 2
    m_NumAlphaKeys: 2
  outlineGradientInLocalSpace: 0
-  outlineWidth: 0.45
+  outlineWidth: 0.4
  outlineBlurPasses: 2
  outlineQuality: 3
  outlineEdgeMode: 0
@ -1646,7 +2232,7 @@ MonoBehaviour:
  camerasLayerMask:
    serializedVersion: 2
    m_Bits: 4294967295
-  effectGroup: 0
+  effectGroup: 1
  effectGroupLayer:
    serializedVersion: 2
    m_Bits: 4294967295
@ -1681,7 +2267,7 @@ MonoBehaviour:
  overlayTextureScale: 1
  overlayVisibility: 0
  outline: 1
-  outlineColor: {r: 0, g: 0, b: 0, a: 1}
+  outlineColor: {r: 0.23492157, g: 1, b: 0, a: 1}
  outlineColorStyle: 0
  outlineGradient:
    serializedVersion: 2
@ -1713,7 +2299,7 @@ MonoBehaviour:
    m_NumColorKeys: 2
    m_NumAlphaKeys: 2
  outlineGradientInLocalSpace: 0
-  outlineWidth: 0.45
+  outlineWidth: 0.4
  outlineBlurPasses: 2
  outlineQuality: 3
  outlineEdgeMode: 0
@ -1818,7 +2404,7 @@ MonoBehaviour:
  camerasLayerMask:
    serializedVersion: 2
    m_Bits: 4294967295
-  effectGroup: 0
+  effectGroup: 1
  effectGroupLayer:
    serializedVersion: 2
    m_Bits: 4294967295
@ -1853,7 +2439,7 @@ MonoBehaviour:
  overlayTextureScale: 1
  overlayVisibility: 0
  outline: 1
-  outlineColor: {r: 0, g: 0, b: 0, a: 1}
+  outlineColor: {r: 0.23492157, g: 1, b: 0, a: 1}
  outlineColorStyle: 0
  outlineGradient:
    serializedVersion: 2
@ -1885,7 +2471,7 @@ MonoBehaviour:
    m_NumColorKeys: 2
    m_NumAlphaKeys: 2
  outlineGradientInLocalSpace: 0
-  outlineWidth: 0.45
+  outlineWidth: 0.4
  outlineBlurPasses: 2
  outlineQuality: 3
  outlineEdgeMode: 0
@ -1973,6 +2559,84 @@ MonoBehaviour:
  hitFxFadeOutDuration: 0.25
  hitFxColor: {r: 1, g: 1, b: 1, a: 1}
  hitFxRadius: 0.5
+--- !u!64 &1882503372
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882503366}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 978963988987963875, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+--- !u!64 &1882503373
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882503367}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4004621660992953091, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+--- !u!64 &1882503374
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882503368}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -4459642466956643653, guid: 0fc9aae39f3b8fd45959b9f2e382a854, type: 3}
+--- !u!114 &1882503375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882503366}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c11d41cbc059c4d46a9e102cb8b90f6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1882503376
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882503367}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c11d41cbc059c4d46a9e102cb8b90f6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1882503377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1882503368}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c11d41cbc059c4d46a9e102cb8b90f6a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1902030981
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab
+++ b/Assets/Resources/UI/UI_Panel/UI_GraphicRextualPanel.prefab
@ -87,6 +87,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  rextualPanel: {fileID: 4007482462058298327}
+  targetRawImage: {fileID: 6573143605191137909}
 --- !u!1 &83478456576562280
 GameObject:
  m_ObjectHideFlags: 0
@ -576,6 +577,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  rextualPanel: {fileID: 4007482462058298327}
+  targetRawImage: {fileID: 2396367554618596310}
 --- !u!1 &7233212331157936706
 GameObject:
  m_ObjectHideFlags: 0
@ -843,7 +845,6 @@ GameObject:
  - component: {fileID: 1635298534101469036}
  - component: {fileID: 4317526872028082977}
  - component: {fileID: 53977748493667749}
-  - component: {fileID: 1552560335981496535}
  m_Layer: 5
  m_Name: Image
  m_TagString: Untagged
@ -913,16 +914,3 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
--- !u!114 &1552560335981496535
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7670305815933267634}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a5549af0ab4860f4982ec854145a825c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  rextualPanel: {fileID: 0}
--- a/Assets/Scripts/CameraOrbit.cs
+++ b/Assets/Scripts/CameraOrbit.cs
@ -43,6 +43,8 @@ public class CameraOrbit : MonoBehaviour

        if (Enable && this.target != null && isMove)
        {
+            //FirstPersonController firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
+            //firstPersonController.playerCanMove = Input.GetMouseButton(1);
            if (Input.GetMouseButton(1))
            {
                this.start = false;
--- a/Assets/Scripts/HQB/SorghomHighlight.cs
+++ b/Assets/Scripts/HQB/SorghomHighlight.cs
@ -0,0 +1,26 @@
+using HighlightPlus;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SorghomHighlight : MonoBehaviour
+{
+    protected HighlightEffect _highlightEffect;
+
+    void Awake()
+    {
+        _highlightEffect = GetComponent<HighlightEffect>();
+    }
+
+    public void OnCollisionEnter(Collision collision)
+    {
+        Debug.Log("Collision Enter");
+        _highlightEffect.SetHighlighted(true);
+    }
+
+    public void OnCollisionExit(Collision collision)
+    {
+        Debug.Log("Collision Exit");
+        _highlightEffect.SetHighlighted(false);
+    }
+}
--- a/Assets/Scripts/HQB/SorghomHighlight.cs.meta
+++ b/Assets/Scripts/HQB/SorghomHighlight.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c11d41cbc059c4d46a9e102cb8b90f6a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs
@ -37,4 +37,5 @@ public class UI_GraphicRextualPanel : BasePanel
                break;
        }
    }
+
 }
--- a/Assets/Scripts/RawImageScript.cs
+++ b/Assets/Scripts/RawImageScript.cs
@ -1,27 +1,80 @@
+using HighlightPlus;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;

-public class RawImageScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+public class RawImageScript : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, IPointerMoveHandler
 {
    //正常植株和病株对比面板
    public UI_GraphicRextualPanel 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 == "正常高粱")
        {
-            Debug.Log("我进正常了");
-            rextualPanel.ToptextMeshProUGUI.text = "1";
-            rextualPanel.ContentTextMeshProUGUI.text = "11111";
+            Debug.Log("我进正常高粱了");
+            renderCamera = GameObject.Find("Camera_Normal").GetComponent<Camera>();
+            layerMask = 1 << LayerMask.NameToLayer("Split_Normal");
+            // 步骤3：生成射线
        }
-        else if(hoveredObject.name == "病株")
+        else if (hoveredObject.name == "病株")
        {
            Debug.Log("我进病株了");
-            rextualPanel.ToptextMeshProUGUI.text = "2";
-            rextualPanel.ContentTextMeshProUGUI.text = "22222";
+            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);
+            }
+        }
+        else
+        {
+            if (_highlight != null)
+            {
+                _highlight.SetHighlighted(false);
+                _highlight = null;
+            }
        }
    }

@ -37,4 +90,21 @@ public class RawImageScript : MonoBehaviour, IPointerEnterHandler, IPointerExitH
            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/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,22 +6,22 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 01070d5f560c5e0d5f0f5c7240735b4444164a2c2e7a7f3579784e63e4b06d61
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
      flags: 0
    RecentlyUsedSceneGuid-2:
-      value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a
+      value: 01070d5f560c5e0d5f0f5c7240735b4444164a2c2e7a7f3579784e63e4b06d61
      flags: 0
    RecentlyUsedSceneGuid-3:
-      value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a
+      value: 54090c025006080809565e7249740e444015492f297f7565287d1b65b7b2323a
      flags: 0
    RecentlyUsedSceneGuid-4:
-      value: 0653525e54025c0a550f547040750b44424e1a2c7d782464757e1c62e3e56d6e
+      value: 0550025e01010c0c0f5d54704175074444154073752d7733757d4a30b2e2366a
      flags: 0
    RecentlyUsedSceneGuid-5:
-      value: 5401015552000c5f5d0d0a7b12725d4443161c7c7c7023677f2c4e6bb5e3303a
+      value: 0653525e54025c0a550f547040750b44424e1a2c7d782464757e1c62e3e56d6e
      flags: 0
    RecentlyUsedSceneGuid-6:
      value: 5b52575304530d5e585e5926147108444415417c2e707132752b4e60e0e6673b
Author	SHA1	Message	Date
huqibin	909cab50b2	tongbu2	2025-05-21 18:06:39 +08:00
huqibin	cf655438e8	Merge branch 'HQB_master' of http://172.16.1.12/taosuqi/CultivationOfBrewing-2 into HQB_master # Conflicts: # UserSettings/EditorUserSettings.asset	2025-05-21 18:01:29 +08:00
huqibin	19acda5c36	tongbu	2025-05-21 18:01:06 +08:00
huqibin	565d317e66	分图	2025-05-21 18:00:12 +08:00