From f7a5145341007d970b990730dac632ec5413be39 Mon Sep 17 00:00:00 2001 From: bzx <496597135@qq.com> Date: Sat, 27 Dec 2025 12:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=93=B6=E5=B7=9D=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=EF=BC=8C=E6=B7=BB=E5=8A=A0ai=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/AI/Bip001.prefab | 12 +- ...inchuan_Jinfeng_XinhualianGuangchang.unity | 304 +++++++++++++++--- .../NavMesh.asset | Bin 6532 -> 8324 bytes Assets/_Alice/Scripts/Base/GameLocal.cs | 1 + Assets/_Alice/Scripts/Base/GameManager.cs | 23 +- Assets/_Alice/Scripts/Task/TaskManager.cs | 30 +- ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/ProjectSettings.asset | 8 +- 8 files changed, 304 insertions(+), 78 deletions(-) diff --git a/Assets/AI/Bip001.prefab b/Assets/AI/Bip001.prefab index 6b5e659e..9daab4ab 100644 --- a/Assets/AI/Bip001.prefab +++ b/Assets/AI/Bip001.prefab @@ -25,16 +25,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2415936993540540791} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1252382800004615965} + m_Father: {fileID: 5801577511601998222} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 474.5, y: 287.5} + m_AnchoredPosition: {x: 410.5, y: 297.5} m_SizeDelta: {x: 114.4, y: 82.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7530112681842935744 @@ -129,7 +129,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -226.97414, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -167,7 +167,6 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1886413755794540654} - - {fileID: 8174201374751382120} - {fileID: 5801577511601998222} m_Father: {fileID: 2361883826336231568} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -403,7 +402,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8174201374751382120} m_Father: {fileID: 1252382800004615965} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} diff --git a/Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity b/Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity index e8b65f37..c77b283c 100644 --- a/Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity +++ b/Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity @@ -4692,6 +4692,7 @@ MonoBehaviour: - {fileID: 399455311} enemyPos: {fileID: 1152711581} startDoorPos: {fileID: 928594070} + aiPos: {fileID: 416456530} self: {fileID: 0} Version: 1.0.1 place: 45 @@ -5155,6 +5156,111 @@ Transform: type: 3} m_PrefabInstance: {fileID: 403702661} m_PrefabAsset: {fileID: 0} +--- !u!1 &416456526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 416456530} + - component: {fileID: 416456529} + - component: {fileID: 416456528} + - component: {fileID: 416456527} + m_Layer: 0 + m_Name: AiPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &416456527 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416456526} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &416456528 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416456526} + 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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &416456529 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416456526} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &416456530 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 416456526} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 5.38, y: 0, z: 1.26} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1001 &418719604 PrefabInstance: m_ObjectHideFlags: 0 @@ -5191,7 +5297,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.x - value: 14.9 + value: 5.29 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -5201,7 +5307,7 @@ PrefabInstance: - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} propertyPath: m_LocalPosition.z - value: 19.702 + value: 1.03 objectReference: {fileID: 0} - target: {fileID: 6411360651812594144, guid: 27c23682457b46c47846db7ac424a726, type: 3} @@ -5970,7 +6076,7 @@ Transform: m_GameObject: {fileID: 478776999} serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 14.9177, y: -0, z: 19.7354} + m_LocalPosition: {x: 5.56, y: -0, z: 1.09} m_LocalScale: {x: 0.3229924, y: 0.6, z: 0.34647524} m_ConstrainProportionsScale: 1 m_Children: [] @@ -6545,6 +6651,111 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &541338278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 541338282} + - component: {fileID: 541338281} + - component: {fileID: 541338280} + - component: {fileID: 541338279} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!65 &541338279 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541338278} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &541338280 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541338278} + 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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &541338281 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541338278} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &541338282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 541338278} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &563175150 PrefabInstance: m_ObjectHideFlags: 0 @@ -8334,7 +8545,7 @@ PrefabInstance: - target: {fileID: 139473518146088638, guid: 28896b43f3298de4f9232501612faccd, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.01 objectReference: {fileID: 0} - target: {fileID: 139473518146088638, guid: 28896b43f3298de4f9232501612faccd, type: 3} @@ -8384,7 +8595,7 @@ PrefabInstance: - target: {fileID: 766828828027499524, guid: 28896b43f3298de4f9232501612faccd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1134632844535753734, guid: 28896b43f3298de4f9232501612faccd, type: 3} @@ -11213,13 +11424,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 928594066} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15.55, y: 0, z: 13.9} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 3.58, y: 0, z: 1.31} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1001 &940227517 PrefabInstance: m_ObjectHideFlags: 0 @@ -11416,7 +11627,7 @@ Transform: m_GameObject: {fileID: 950611025} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -18.87, y: 0.07099998, z: -11.67} + m_LocalPosition: {x: -9.41, y: 0.07099998, z: 7.2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: @@ -14578,13 +14789,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1152711577} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 15.97, y: 1, z: 20.03} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 6.48, y: 1, z: 1.94} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1154837750 GameObject: m_ObjectHideFlags: 0 @@ -15751,17 +15962,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1254836192} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: -0.005, y: 0.005, z: 0.005} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1889683931} m_Father: {fileID: 2063580697} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -3.03, y: 4.28} + m_AnchoredPosition: {x: -2.78, y: 2.37} m_SizeDelta: {x: 43.1567, y: 62.0444} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1254836194 @@ -15951,7 +16162,7 @@ Transform: m_GameObject: {fileID: 1314912466} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -19.52, y: 0.2803328, z: -11.48} + m_LocalPosition: {x: -10.06, y: 0.2803328, z: 7.39} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: @@ -19419,17 +19630,17 @@ PrefabInstance: - target: {fileID: 452152370746887354, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 498855282886837032, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 970666334978053172, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: -4.44 + value: -4.81 objectReference: {fileID: 0} - target: {fileID: 970666334978053172, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19439,7 +19650,7 @@ PrefabInstance: - target: {fileID: 970666334978053172, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: -1.55 + value: 1.1 objectReference: {fileID: 0} - target: {fileID: 1218231925593514379, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19469,7 +19680,7 @@ PrefabInstance: - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: -6.49 + value: -5.86 objectReference: {fileID: 0} - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19479,7 +19690,7 @@ PrefabInstance: - target: {fileID: 2576127346843547120, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: -3.68 + value: 1.1 objectReference: {fileID: 0} - target: {fileID: 2862628159654608868, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19529,7 +19740,7 @@ PrefabInstance: - target: {fileID: 3904620083863538941, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4077603674053301953, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19549,12 +19760,12 @@ PrefabInstance: - target: {fileID: 4739361030178029374, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: 4.01 + value: 3.31 objectReference: {fileID: 0} - target: {fileID: 4739361030178029374, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: -2.54 + value: -2.9 objectReference: {fileID: 0} - target: {fileID: 4741766977610483380, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19564,7 +19775,7 @@ PrefabInstance: - target: {fileID: 5139288187440743267, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: -4.18 + value: -4.55 objectReference: {fileID: 0} - target: {fileID: 5139288187440743267, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19574,7 +19785,7 @@ PrefabInstance: - target: {fileID: 5139288187440743267, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: -1.16 + value: 1.49 objectReference: {fileID: 0} - target: {fileID: 5243483263737972273, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19589,7 +19800,7 @@ PrefabInstance: - target: {fileID: 5581611941283807560, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5659452672358173411, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19609,7 +19820,7 @@ PrefabInstance: - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: -5.32 + value: -5.62 objectReference: {fileID: 0} - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19619,7 +19830,7 @@ PrefabInstance: - target: {fileID: 5924088207177022078, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: -2.33 + value: -0.93 objectReference: {fileID: 0} - target: {fileID: 6114747558210478331, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19629,7 +19840,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: 13.02 + value: 5.85 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19639,7 +19850,7 @@ PrefabInstance: - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: 19.88 + value: 0.91 objectReference: {fileID: 0} - target: {fileID: 6621853210474395341, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19684,7 +19895,7 @@ PrefabInstance: - target: {fileID: 7205417328389008084, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7246999434898325738, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19699,12 +19910,17 @@ PrefabInstance: - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: 0.53 + value: 0.08 + objectReference: {fileID: 0} + - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.03 objectReference: {fileID: 0} - target: {fileID: 7582541781839329619, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: 0.65 + value: -2.02 objectReference: {fileID: 0} - target: {fileID: 7885725076255202891, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19719,7 +19935,7 @@ PrefabInstance: - target: {fileID: 7968014529671101314, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_StaticEditorFlags - value: 2147483647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8011789171291406206, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19734,7 +19950,7 @@ PrefabInstance: - target: {fileID: 9101032712780986530, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.x - value: -4.67 + value: -5.04 objectReference: {fileID: 0} - target: {fileID: 9101032712780986530, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -19744,7 +19960,7 @@ PrefabInstance: - target: {fileID: 9101032712780986530, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} propertyPath: m_LocalPosition.z - value: -1.2 + value: 1.45 objectReference: {fileID: 0} - target: {fileID: 9133649855753487763, guid: 7350bae1a92e3a642b078895b43f47f1, type: 3} @@ -24027,7 +24243,7 @@ Transform: m_GameObject: {fileID: 1805181727} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 16.74, y: 0, z: 19.09} + m_LocalPosition: {x: 7.45, y: 0, z: -2.37} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_ConstrainProportionsScale: 1 m_Children: @@ -26898,8 +27114,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2063580696} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 12.76, y: -0.15, z: 23.01} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.613, y: 0, z: -1.926} m_LocalScale: {x: 0.28674302, y: 0.28674302, z: 0.28674302} m_ConstrainProportionsScale: 1 m_Children: @@ -26910,7 +27126,7 @@ Transform: - {fileID: 2578744698916540409} - {fileID: 1254836193} m_Father: {fileID: 471696836} - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2084682775 GameObject: m_ObjectHideFlags: 0 @@ -235737,5 +235953,7 @@ SceneRoots: - {fileID: 1152711581} - {fileID: 867168164} - {fileID: 928594070} + - {fileID: 416456530} - {fileID: 1714885311} - {fileID: 652203252} + - {fileID: 541338282} diff --git a/Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang/NavMesh.asset b/Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang/NavMesh.asset index 1849b6b9c70e3bd7d05ae85901fa03c217d1a144..908257890dcd8b4e4260c06bc009bbcb69025b18 100644 GIT binary patch delta 1943 zcmb7EO-NKx6h3d}%{b%C_^&g9{iuYCq(urrmfQy;)Fx@6po<7vwyBK-qr6c^QY#Rr zf>DZ+Ah1Qaa5ZBJK@g0A(JD})U8@!@!piJ?=gyrO3xY1ZchApv&OPVcb8f0D<;)$m zj;|bBj#`2AR`g8zQ?w!-h=pTbBKpAJpmQl+!#maiuXJauWq2){Q1{=rzIvC>ZOlvu z9DC`cqXA!?_O=OiV?1(>`PKHe&wtT#(}8t^0Zn9)hj1K`Cz)P~oeJ4ZKBX&kgjP7F z6K)F&%Ht3$|0?)vDD1ESUB#aXk4ZA&b$7j12L}kR7!sKHLQmYQQJeX@ zYG>Q$yxD4C%#`>9rZ1in8W<$7nYYDuE$b$Vj_PX1*?3>UAeX&Uq}$u(Rb8#+z!<^7 z7{MXv@&fyloN8fNyrXJ1`N&W8TAI`{Fh(DAsgi1_Rs$GJ497Bndgd#rPGlbbYi&s% z;!CM!50$LLl~LigVGnP0EDcalPC!6^>fI29DIzy3+N3rs9UxNq;dpMNvcGnyB|0!o z2L$I6Y((&0q0#Feu1PNIb-vp%uIh{{ca4%SWX2EC=!cu5)eIU}=wOfJfPVH#j{n2s z8oX?eig=~Ae%bxxVmxdvt9Fcx0K{>SqYnB&TLOS1WMH%0Cp!?Jux4q99?~vPa*0pT zk0Ot$yDZ3C)I%e{yOg4R222_OjmaHrz!W=7iF5Fig#-2&5B@gma3JhQnV&20sFv1G zuzp^$F1H6>^JCOFL^GTbvGX2=>I^J?8QR?(i_Ob`b}|b^#I0h79Ib~B7lwz6NqVt- zRvxa>%TOsZ)7>@6GZb=qFNPK9o$ZJWJ?O!Kh{%bOtP8m^^_W&THj@k5O!Pt~Se$ei z<0YAyo))}$Nq{#m%w|69JbUTkLm%-Fhn>|8FLzx=mEK4_pt^}&ogIp46?y@gnZYtN zZaT>MV~()wB>xHvSm-@$g_*!AuOw*r$A|-oiee!E+f5!m3<_heo#;5>K%110u6`*j zc8Us^If8{njdJL}<_99#Ol`ht#jd_4Kvo*5A6$T>Jn4 delta 207 zcmZp1Y%!i7$0)f`ew8>Q(); @@ -178,10 +178,8 @@ public class GameManager : MonoBehaviour CreatePlayer(); //PlaySound2DRPC("1.25"); PlayBGM(0); - CreateGameStartDoor(GameLocal.Ins.startDoorPos.position); - - - + CreateGameStartDoor(GameLocal.Ins.startDoorPos,false); + InitializeGuideArrow(); } public void PlayBGM(int id) @@ -243,9 +241,11 @@ public class GameManager : MonoBehaviour MasterAudio.PlaySound3DAtTransform(sound, soundTran); } - public void CreateGameStartDoor(Vector3 pos) + public void CreateGameStartDoor(Transform pos,bool isEnd) { - var door= Instantiate(gameStartDoor, pos, Quaternion.identity); + var curPos = isEnd ? pos.position.ReflectVectorXOZ() + new Vector3(0, 0, 2) : pos.position; + var door= Instantiate(gameStartDoor, curPos, Quaternion.identity); + // 延迟开始指引，确保玩家和门都已初始化 CoroutineTaskManager.Instance.WaitSecondTodo(() => { @@ -257,7 +257,10 @@ public class GameManager : MonoBehaviour { door.transform.eulerAngles = new Vector3(0, 90, 0); } - + else if (GameLocal.Ins.place == Place.Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang) + { + door.transform.eulerAngles = pos.eulerAngles; + } else { door.transform.eulerAngles = new Vector3(0, 180, 0); @@ -355,7 +358,7 @@ public class GameManager : MonoBehaviour playerRightHand.ChangeHand(); taskManager.OverTask(); isStartGame = false; - CreateGameStartDoor(GameLocal.Ins.self.transform.position.ReflectVectorXOZ()+new Vector3(0,0,2)); + CreateGameStartDoor(GameLocal.Ins.self.transform,true); } public void StartDance() diff --git a/Assets/_Alice/Scripts/Task/TaskManager.cs b/Assets/_Alice/Scripts/Task/TaskManager.cs index e2b29fc1..e43791c7 100644 --- a/Assets/_Alice/Scripts/Task/TaskManager.cs +++ b/Assets/_Alice/Scripts/Task/TaskManager.cs @@ -34,7 +34,7 @@ public class TaskManager : MonoBehaviour public void StartTask() { - ResetCompletionState(); // ״̬ + ResetCompletionState(); // �������״̬ tasks[curTaskId].StartTask(); taskHope.SetActive(true); //taskHope.transform.position = new Vector3(3f, 0, 3f); @@ -67,50 +67,50 @@ public class TaskManager : MonoBehaviour public void CompleteTask() { - // ֹظ + // ��ֹ�ظ����� if (isCompletingTask) { - Debug.LogWarning($" {curTaskId} Уظ"); + Debug.LogWarning($"���� {curTaskId} ��������У������ظ�����"); return; } - // ǰѾɣֱӷ + // �����ǰ�����Ѿ���ɣ�ֱ�ӷ��� if (lastCompletedTaskId == curTaskId) { - Debug.LogWarning($" {curTaskId} Ѿɣظ"); + Debug.LogWarning($"���� {curTaskId} �Ѿ���ɣ������ظ�����"); return; } if (curTaskId >= tasks.Count) { - Debug.LogWarning($" {curTaskId} {tasks.Count}ɲ"); + Debug.LogWarning($"�������� {curTaskId} ������������ {tasks.Count}��������ɲ���"); return; } - // ñ־λֹظ + // ���ñ�־λ����ֹ�ظ����� isCompletingTask = true; try { - // ¼һɵID + // ��¼��һ����ɵ�����ID lastCompletedTaskId = curTaskId; tasks[curTaskId].CompleteTask(); curTaskId++; - // ٴμֹԽ + // �ٴμ���ֹԽ�� if (curTaskId >= tasks.Count) { - Debug.Log("ɣ"); + Debug.Log("������������ɣ�"); return; } taskHope.SetActive(false); - Debug.Log($"ǰΪ: {curTaskId}"); + Debug.Log($"��ǰ������������Ϊ: {curTaskId}"); } finally { - // ȷ־λ + // ȷ����־λ������ isCompletingTask = false; } } @@ -131,14 +131,16 @@ public class TaskManager : MonoBehaviour public void CreateBox(Vector3 pos,Vector3 eulerAngles,int curId,TaskBoxType boxType) { - // ݵصжǷҪ߶ Vector3 adjustedPos = pos; if (GameLocal.Ins.place == Place.Jiangsu_Xvzhou_Guolou_Oulebao||GameLocal.Ins.place == Place.Jiangsu_Xvzhou_Guolou_Oulebao_2) { - // ڸõص㽫߶Ϊ0.3 adjustedPos = new Vector3(pos.x, 0.5f, pos.z); } + else if (GameLocal.Ins.place==Place.Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang&& boxType==TaskBoxType.TaskEndBox) + { + adjustedPos=new Vector3(task3Tu.transform.position.x,GameLocal.Ins.self.transform.position.y-0.5f,task3Tu.transform.position.z); + } GameObject box = Instantiate(boxPre, adjustedPos, Quaternion.identity); box.transform.eulerAngles = eulerAngles; diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f6152500..eba57ace 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -137,7 +137,7 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Alice/Scenes/Shanxi_Baoji_Meixian_TianlongShangcheng.unity guid: 6bb6d0bff81986644a5a8b91b58b3b33 - - enabled: 1 + - enabled: 0 path: Assets/_Alice/Scenes/Hunan_Changde_Lixian_WandaGuangchang.unity guid: ddf788839d600fd41831249008671cef - enabled: 0 @@ -161,7 +161,7 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Alice/Scenes/GongSi1LouShiwai.unity guid: fc1fccbc1d9a40a43ba3e05540147656 - - enabled: 0 + - enabled: 1 path: Assets/_Alice/Scenes/Ningxia_Yinchuan_Jinfeng_XinhualianGuangchang.unity guid: 63b47db0877f0c24bad6c9f81dec192e - enabled: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 90a3f880..49a0b638 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,8 +141,10 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 1.0.2 - preloadedAssets: [] + bundleVersion: 1.0.3 + preloadedAssets: + - {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} + - {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -163,7 +165,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Android: com.pineappletech.aliceball.hunanchangdelixianwandaguangchang + Android: com.pineappletech.aliceball.ningxiayinchuanjinfengxinhualianguangchang Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0