Merge remote-tracking branch 'origin/Huang' into main_ZYT

# Conflicts:
#	ProjectSettings/ProjectSettings.asset

Assets/DC/地形/辽宁大连普兰店.fbx.meta

@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 3800750bd2f2a674dbe30078eba89d2b
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/DC/地形/辽宁大连普兰店.prefab

@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &157792820486620190
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -163498549696734157, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
+    - target: {fileID: 919132149155446097, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u8FBD\u5B81\u5927\u8FDE\u666E\u5170\u5E97"
+      objectReference: {fileID: 0}
+    - target: {fileID: 4271049788240168503, guid: 3800750bd2f2a674dbe30078eba89d2b,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3800750bd2f2a674dbe30078eba89d2b, type: 3}

Assets/DC/地形/辽宁大连普兰店.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e1da49f6bd8a6014793264d45d206c70
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f8e322a100fa124cbc1e9334e99ded5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b2bb3d83fa1cfb942a39fead283ff49f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh-NavMesh Surface 1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40bce88a94b91794285b196d46f6bfad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh-NavMesh Surface 2.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fea4e9a53b432ea419e8cdca272e4b81
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh-NavMesh Surface 3.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e914931fb3507ab4890b8bc8880a777e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh-NavMesh Surface 4.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2f724cbc7b6eb6f459cc9b0db4f7887d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh-NavMesh Surface 5.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5af8192c32a8e4d4087fd209a95f5a73
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh-NavMesh Surface.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a6285bcc1fde52344bf2179c654067bb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Liaoning_Dalian_Pulandian_WandaGuangchang/NavMesh.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed2de7214d1e55c4bb9578074d4e6055
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Shanxi_Baoji_Meixian_TianlongShangcheng.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ca31670ad8ca8844b943a8a559e73b0a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_Alice/Scenes/Anhui_Manshan_XingyueGuangchang.unity

@@ -24160,6 +24160,11 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 1876704475166934505, guid: 773434a6cef260a4db3c2352a39711c2,
         type: 3}
+    - target: {fileID: 4151306007625191753, guid: d947a605836fcc447b28dad64f6aa1aa,
+        type: 3}
+      propertyPath: GuideArrowPre
+      value: 
+      objectReference: {fileID: 227914090}
     - target: {fileID: 4151306007625191753, guid: d947a605836fcc447b28dad64f6aa1aa,
         type: 3}
       propertyPath: gameStartDoor

Assets/_Alice/Scripts/Item/TaskBox.cs

@@ -240,6 +240,11 @@ public class TaskBox : MonoBehaviour
             {
                 spawnRange = new Vector3(1.7f, 1f, 1f);
                
+            }
+            if (GameLocal.Ins.place == Place.Liaoning_Dalian_Pulandian_WandaGuangchang)
+            {
+                spawnRange = new Vector3(2f, 1f, 2f);
+               
             }
             else
             {

ProjectSettings/EditorBuildSettings.asset

@@ -197,6 +197,9 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/_Alice/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity
     guid: d8a7add0386eeff489089f0411d70b5a
+  - enabled: 1
+    path: Assets/Liaoning_Dalian_Pulandian_WandaGuangchang.unity
+    guid: b2bb3d83fa1cfb942a39fead283ff49f
   m_configObjects:
     Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
       type: 2}