添加甘肃定西安定万达广场场景

2026-03-04 10:09:39 +08:00
parent 341306d262
commit 6457fb50e5
18 changed files with 221448 additions and 13 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -51,5 +51,5 @@
        "temp/": true,
        "Temp/": true
    },
-    "dotnet.defaultSolution": "ToyStory.sln"
+    "dotnet.defaultSolution": "AliceBall.sln"
 }
--- a/Assets/DC/地形/定西市安定区万达广场.fbx
+++ b/Assets/DC/地形/定西市安定区万达广场.fbx
--- a/Assets/DC/地形/定西市安定区万达广场.fbx.meta
+++ b/Assets/DC/地形/定西市安定区万达广场.fbx.meta
@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 2dbe514b5bae671408e0e54be60abea8
+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: 
--- a/Assets/DC/地形/定西市安定区万达广场.prefab
+++ b/Assets/DC/地形/定西市安定区万达广场.prefab
@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1566118010466913162
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -3901992563441801604, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
+    - target: {fileID: 919132149155446097, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+      propertyPath: m_Name
+      value: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A"
+      objectReference: {fileID: 0}
+    - target: {fileID: 4495414801083549842, guid: 2dbe514b5bae671408e0e54be60abea8, 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: 2dbe514b5bae671408e0e54be60abea8, type: 3}
--- a/Assets/DC/地形/定西市安定区万达广场.prefab.meta
+++ b/Assets/DC/地形/定西市安定区万达广场.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 36309957c69afc04e9364afa0f87215a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.meta
+++ b/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02740cc0275c4e94bb845adba2263cdd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
+++ b/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
--- a/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity.meta
+++ b/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bc24f92dfdfb9df4589c7ed4d4618bff
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang/NavMesh.asset
+++ b/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang/NavMesh.asset
--- a/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang/NavMesh.asset.meta
+++ b/Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang/NavMesh.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd8781ae9b2a06b4ba268d20bcc862e6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 23800000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Alice/Scripts/Base/GameLocal.cs
+++ b/Assets/_Alice/Scripts/Base/GameLocal.cs
@ -119,6 +119,7 @@ public enum Place
    Liaoning_Huludao_Jianchang_XinglongDajiating = 78,
    Ningxia_Yinchuan_Xingqing_XinhuaBaihuo_Shiwai = 79,
    Ningxia_Wuzhong_Litong_YiwuShangmaocheng = 80,
+    Gansu_Dingxi_Anding_WandaGuangchang=81,
 }

 public class GameLocal : MonoBehaviour
--- a/Assets/_Alice/Scripts/Enemy/Enemy.cs
+++ b/Assets/_Alice/Scripts/Enemy/Enemy.cs
@ -44,7 +44,7 @@ public class Enemy : MonoBehaviour
    
    public void Init()
    {
-        maxHp = 20;  
+        maxHp = 30;  
        timeHit = 10;
        curTimeHit = 10;
        hp = maxHp;
@ -286,8 +286,8 @@ public class Enemy : MonoBehaviour
    private void UpdateHpUI()
    {
        // 计算整格（每格4血）和是否还有余数
-        int fullCount = hp / 2; // 每格4血
-        int remainder = hp % 2; // 余数
+        int fullCount = hp / 3; // 每格4血
+        int remainder = hp % 3; // 余数
        
        for (int i = 0; i < hpImage.Length; i++)
        {
@ -301,7 +301,7 @@ public class Enemy : MonoBehaviour
            {
                // 部分填充（根据余数计算填充量）
                hpImage[i].enabled = true;
-                hpImage[i].fillAmount = remainder / 2f; // 余数/4得到填充比例
+                hpImage[i].fillAmount = remainder / 3f; // 余数/4得到填充比例
            }
            else
            {
--- a/Assets/_Alice/Scripts/Item/TaskBox.cs
+++ b/Assets/_Alice/Scripts/Item/TaskBox.cs
@ -290,6 +290,11 @@ public class TaskBox : MonoBehaviour
            {
                spawnRange = new Vector3(1.5f, 1f, 3f);
            }
+            if (GameLocal.Ins.place == Place.Gansu_Dingxi_Anding_WandaGuangchang
+               )
+            {
+                spawnRange = new Vector3(4f, 1f, 2f);
+            }
            // 计算一个随机位置
            Vector3 randomOffset = new Vector3(
                    Random.Range(-spawnRange.x, spawnRange.x),
--- a/Assets/_Alice/Scripts/Task/GemTask/BubblesGemTask.cs
+++ b/Assets/_Alice/Scripts/Task/GemTask/BubblesGemTask.cs
@ -13,8 +13,8 @@ public class BubblesGemTask : Task
    public override void StartTask()
    {
        base.StartTask();
-        winTaskTime = Random.Range(40, 57);
-        endTaskTime = 60;
+        winTaskTime = Random.Range(60, 89);
+        endTaskTime = 90;
        GameManager.Ins.playerRightHand._isOpenLine = false;
    }

--- a/Assets/_Alice/Scripts/Task/GemTask/CarrotGemTask.cs
+++ b/Assets/_Alice/Scripts/Task/GemTask/CarrotGemTask.cs
@ -13,8 +13,8 @@ public class CarrotGemTask : Task
    public override void StartTask()
    {
        base.StartTask();
-        winTaskTime = Random.Range(40, 61);
-        endTaskTime = 60;
+        winTaskTime = Random.Range(60, 91);
+        endTaskTime = 90;
        GameManager.Ins.playerRightHand._isOpenLine = false;
    }
    
--- a/Assets/_Alice/Scripts/Task/GemTask/SeekGemTask.cs
+++ b/Assets/_Alice/Scripts/Task/GemTask/SeekGemTask.cs
@ -13,8 +13,8 @@ public class SeekGemTask : Task
    public override void StartTask()
    {
        base.StartTask();
-        winTaskTime = Random.Range(40, 61);
-        endTaskTime = 60;
+        winTaskTime = Random.Range(60, 91);
+        endTaskTime = 90;
          // winTaskTime = 5;
          // endTaskTime =7;
    }
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -227,7 +227,7 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/_Alice/Scenes/Liaoning_Panjin_Xinglongtai_Shuiyoucheng.unity
    guid: f2ae05d217824b54b95b093994cdb1f5
-  - enabled: 1
+  - enabled: 0
    path: Assets/_Alice/Scenes/Shanxi_Yulin_Shenmu_Liuta_Yuyuecheng.unity
    guid: 34d7963c5e7918d4597f1359555a811a
  - enabled: 0
@ -242,6 +242,12 @@ EditorBuildSettings:
  - enabled: 0
    path: Assets/_Alice/Scenes/Ningxia_Wuzhong_Litong_YiwuShangmaocheng.unity
    guid: 8329f1e8cfc244f42909d9a766528182
+  - enabled: 0
+    path: Assets/_Alice/Scenes/Jilin_Jilin_Chuangying_Zhongdongxinshenghuo.unity
+    guid: 8aa6d2a44ebf7b54b9daad27cbdd6b9e
+  - enabled: 1
+    path: Assets/_Alice/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
+    guid: bc24f92dfdfb9df4589c7ed4d4618bff
  m_configObjects:
    Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
      type: 2}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -163,7 +163,7 @@ PlayerSettings:
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
-    Android: com.pineappletech.aliceball.shanxiyulinshenmuliutayuyuecheng
+    Android: com.pineappletech.aliceball.gansudingxiandingwandaguangchang
    Standalone: com.DefaultCompany.com.unity.template.ar
  buildNumber:
    Standalone: 0