diff --git a/Assets/DC/乌兰浩特欧亚地形9.30.prefab b/Assets/DC/乌兰浩特欧亚地形9.30.prefab index 50922bf0..19a8b576 100644 --- a/Assets/DC/乌兰浩特欧亚地形9.30.prefab +++ b/Assets/DC/乌兰浩特欧亚地形9.30.prefab @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 3133070423855331140} serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -37.836147, y: 0, z: -38.93358} + m_LocalPosition: {x: -37.87267, y: 0, z: -39.30687} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -61,6 +61,89 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: + - {fileID: -1077071695996795592, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &6359572468577475881 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2377120381545997947} + - component: {fileID: 3394665484643665370} + - component: {fileID: 1049384112787637981} + m_Layer: 0 + m_Name: Line002 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2377120381545997947 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6359572468577475881} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -37.87267, y: 0, z: -39.30687} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4032537127673060268} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3394665484643665370 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6359572468577475881} + m_Mesh: {fileID: 849032210722914114, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3} +--- !u!23 &1049384112787637981 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6359572468577475881} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: - {fileID: 6425743629740809062, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3} m_StaticBatchInfo: firstSubMesh: 0 @@ -108,94 +191,11 @@ Transform: m_GameObject: {fileID: 8968122079600492246} serializedVersion: 2 m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: -39.136147, y: 0.000000056891736, z: -33.02358} + m_LocalPosition: {x: -39.215538, y: -0.00007081032, z: -33.044495} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2377120381545997947} - {fileID: 7081584841205300155} - - {fileID: 4763609696213794489} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} ---- !u!1 &9125783748249110751 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4763609696213794489} - - component: {fileID: 8918220521796264135} - - component: {fileID: 5271914494475447783} - m_Layer: 0 - m_Name: "\u5BF9\u8C61002" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4763609696213794489 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9125783748249110751} - serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -37.836147, y: 0, z: -38.93358} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4032537127673060268} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &8918220521796264135 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9125783748249110751} - m_Mesh: {fileID: 4017482625668419684, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3} ---- !u!23 &5271914494475447783 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9125783748249110751} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: -1077071695996795592, guid: 02ce7b261d015ab49ba97a42b6305f41, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang.unity b/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang.unity index dbd02c96..0bfcd898 100644 --- a/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang.unity +++ b/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang.unity @@ -1890,79 +1890,6 @@ MonoBehaviour: curTaskTime: 0 isWin: 0 isEnd: 0 ---- !u!1001 &198840705 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalPosition.x - value: -39.136147 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.000000056891736 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalPosition.z - value: -33.02358 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalRotation.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -180 - objectReference: {fileID: 0} - - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8968122079600492246, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_Name - value: "\u4E4C\u5170\u6D69\u7279\u6B27\u4E9A\u5730\u5F629.30" - objectReference: {fileID: 0} - - target: {fileID: 8968122079600492246, guid: d835c23e846f4754aa4ebe184ccd75a8, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d835c23e846f4754aa4ebe184ccd75a8, type: 3} --- !u!1 &240862677 GameObject: m_ObjectHideFlags: 0 @@ -5249,7 +5176,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.x - value: 2.77 + value: -0.78 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -5259,7 +5186,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.z - value: 11.94 + value: 11.69 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -6028,8 +5955,8 @@ Transform: m_GameObject: {fileID: 478776999} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.09, y: 0, z: 14.27} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_LocalPosition: {x: -0.09, y: -0, z: 14.6198} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.53006303} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} @@ -11386,7 +11313,7 @@ Transform: m_GameObject: {fileID: 950611025} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.99, y: 0.071, z: -7.76} + m_LocalPosition: {x: -7.99, y: 0.071, z: -11.37} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -15921,7 +15848,7 @@ Transform: m_GameObject: {fileID: 1314912466} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.91, y: 0.28033283, z: -8.39} + m_LocalPosition: {x: -7.91, y: 0.28033283, z: -12} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -19521,6 +19448,51 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.6 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.28 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7075926 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.004412584 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.0044062654 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7065931 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0.001 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.715 + objectReference: {fileID: 0} + - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -89.919 + objectReference: {fileID: 0} - target: {fileID: 6114747558210478331, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -19596,6 +19568,16 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.68 + objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.59 + objectReference: {fileID: 0} - target: {fileID: 7885725076255202891, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags @@ -23858,7 +23840,7 @@ Transform: m_GameObject: {fileID: 1805181727} serializedVersion: 2 m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 11.51} + m_LocalPosition: {x: 0, y: 0, z: 14.61} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_ConstrainProportionsScale: 1 m_Children: @@ -24520,6 +24502,84 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1001 &1861609560 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalPosition.x + value: -39.215538 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.00007081032 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalPosition.z + value: -33.044495 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 4032537127673060268, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6359572468577475881, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8968122079600492246, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_Name + value: "\u4E4C\u5170\u6D69\u7279\u6B27\u4E9A\u5730\u5F629.30" + objectReference: {fileID: 0} + - target: {fileID: 8968122079600492246, guid: d835c23e846f4754aa4ebe184ccd75a8, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d835c23e846f4754aa4ebe184ccd75a8, type: 3} --- !u!1 &1862130543 GameObject: m_ObjectHideFlags: 0 @@ -235562,4 +235622,4 @@ SceneRoots: - {fileID: 1152711581} - {fileID: 867168164} - {fileID: 928594070} - - {fileID: 198840705} + - {fileID: 1861609560} diff --git a/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang/NavMesh.asset b/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang/NavMesh.asset index 5ca33bca..53d7ff39 100644 Binary files a/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang/NavMesh.asset and b/Assets/_Alice/Scenes/Wulanhaote_Ouya_Shangchang/NavMesh.asset differ diff --git a/Assets/sucai/乌兰浩特欧亚地形9.30.FBX b/Assets/sucai/乌兰浩特欧亚地形9.30.FBX index a8adc8bd..e7087bc5 100644 Binary files a/Assets/sucai/乌兰浩特欧亚地形9.30.FBX and b/Assets/sucai/乌兰浩特欧亚地形9.30.FBX differ