Merge remote-tracking branch 'origin/main' into Luo

# Conflicts: # Assets/_SnowWhite/Scenes/Wuhan_Jiangxia_LongwanBandao.unity.meta # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectSettings.asset
修改吉林长春北湖吾悦广场场景
2026-04-07 10:41:10 +08:00 · 2026-04-07 10:40:20 +08:00
19 changed files with 135464 additions and 86155 deletions
--- 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: bb6294c8c4d90294489d27c0e002a810
+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 &3166840044064828959
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -3901992563441801604, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
+    - target: {fileID: 919132149155446097, guid: bb6294c8c4d90294489d27c0e002a810, type: 3}
+      propertyPath: m_Name
+      value: "\u5409\u6797\u957F\u6625\u5317\u6E56\u543E\u60A6\u5E7F\u573A\u65B0"
+      objectReference: {fileID: 0}
+    - target: {fileID: 4495414801083549842, guid: bb6294c8c4d90294489d27c0e002a810, 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: bb6294c8c4d90294489d27c0e002a810, type: 3}
--- a/Assets/DC/地形/吉林长春北湖吾悦广场新.prefab.meta
+++ b/Assets/DC/地形/吉林长春北湖吾悦广场新.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd816fd14b3c49f44b584811227fb90b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_SnowWhite/Audios/1.12.mp3
+++ b/Assets/_SnowWhite/Audios/1.12.mp3
--- a/Assets/_SnowWhite/Audios/1.13.mp3
+++ b/Assets/_SnowWhite/Audios/1.13.mp3
--- a/Assets/_SnowWhite/Audios/1.15.mp3
+++ b/Assets/_SnowWhite/Audios/1.15.mp3
--- a/Assets/_SnowWhite/Audios/1.3.mp3
+++ b/Assets/_SnowWhite/Audios/1.3.mp3
--- a/Assets/_SnowWhite/Prefabs/ForestEvent/WildBoar/WildBoar.prefab
+++ b/Assets/_SnowWhite/Prefabs/ForestEvent/WildBoar/WildBoar.prefab
@ -973,7 +973,7 @@ MonoBehaviour:
  itemFlyToHandDuration: 4
  itemStartScale: {x: 1, y: 1, z: 1}
  itemEndScale: {x: 0, y: 0, z: 0}
-  groundY: -0.8
+  groundY: 0
  useGroundDetection: 0
  groundLayer:
    serializedVersion: 2
--- a/Assets/_SnowWhite/Scenes/GongSi1Lou.unity
+++ b/Assets/_SnowWhite/Scenes/GongSi1Lou.unity
@ -74342,7 +74342,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 459
 --- !u!1 &370592148
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/_SnowWhite/Scenes/Guangdong_Shaoguan_Lechang_ZhigongwenhuGuangchang.unity
+++ b/Assets/_SnowWhite/Scenes/Guangdong_Shaoguan_Lechang_ZhigongwenhuGuangchang.unity
@ -74447,7 +74447,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 485
 --- !u!1 &370592148
 GameObject:
  m_ObjectHideFlags: 0
@ -82634,7 +82634,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 191
 --- !u!1 &505877109
 GameObject:
  m_ObjectHideFlags: 0
@ -172552,7 +172552,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 523
 --- !u!1 &982043429
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/_SnowWhite/Scenes/Guangdong_Shenzhen_Guangming_Wanda.unity
+++ b/Assets/_SnowWhite/Scenes/Guangdong_Shenzhen_Guangming_Wanda.unity
@ -51894,7 +51894,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 210
 --- !u!1 &254718011
 GameObject:
  m_ObjectHideFlags: 0
@ -51993,7 +51993,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 218
 --- !u!1 &262754522
 GameObject:
  m_ObjectHideFlags: 0
@ -74342,7 +74342,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 312
 --- !u!1 &370592148
 GameObject:
  m_ObjectHideFlags: 0
@ -172369,7 +172369,7 @@ MonoBehaviour:
  soundPlayedEventActive: 0
  soundPlayedCustomEvent: 
  willCleanUpDelegatesAfterStop: 1
-  frames: 178
+  frames: 204
 --- !u!1 &982043429
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/_SnowWhite/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity
+++ b/Assets/_SnowWhite/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity
--- a/Assets/_SnowWhite/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity.meta
+++ b/Assets/_SnowWhite/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e344fa0bb9b232949b314ca40fcaf8fe
+guid: b3b1be81b70fb6448b29a93c2cfb6f53
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/_SnowWhite/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
+++ b/Assets/_SnowWhite/Scenes/Zhejiang_Shaoxing_Shengzhou_WuyueGuangchang.unity
@ -5543,6 +5543,37 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+--- !u!1 &27454242
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 27454243}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &27454243
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 27454242}
+  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!1 &31549780
 GameObject:
  m_ObjectHideFlags: 0
@ -379540,7 +379571,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1915035811
 Transform:
  m_ObjectHideFlags: 0
@ -606626,3 +606657,4 @@ SceneRoots:
  - {fileID: 964738810}
  - {fileID: 1689605413}
  - {fileID: 895106607}
+  - {fileID: 27454243}
--- a/Assets/_SnowWhite/Scripts/Base/GameManager.cs
+++ b/Assets/_SnowWhite/Scripts/Base/GameManager.cs
@ -103,6 +103,15 @@ public class GameManager : MonoBehaviour
        
        // 等待小精灵初始化完成后再开始过场
        StartCoroutine(WaitForSpiritAndStartCutscene());
+         if (GameLocal.Ins.place == Place.Guangdong_Shaoguan_Lechang_ZhigongwenhuGuangchang)
+        {
+            MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
+            {
+                // 直接弹出结束页面，场景消失，退出游戏
+                Debug .Log ("退出游戏");
+                Application.Quit();
+            }, 60f * 2f); // 2分钟
+        }
    }

    /// <summary>
--- a/Assets/_SnowWhite/Scripts/ForestEvent/ForestHuntEvent.cs
+++ b/Assets/_SnowWhite/Scripts/ForestEvent/ForestHuntEvent.cs
@ -66,10 +66,10 @@ public class ForestHuntEvent : CutsceneBase
    [Header("小精灵配置")]
    [TextArea(3, 5)]
    [NonSerialized]
-    public string spiritIntroText = "白雪公主，邪恶的女巫派来了猎人要取你的性命，猎人同情你的遭遇决定放过你，但是他也要跟女巫交差，我们需要猎杀一头野猪，拿野猪的心肝代替你的，这样才能逃过女巫的眼睛。准备战斗吧！";  // 1.12介绍文本
+    public string spiritIntroText = "白雪公主，邪恶的女巫派来了猎人要取你的性命，猎人同情你的遭遇决定放过你，但是他也要跟女巫交差，我们需要捕捉一头野猪，拿野猪的心肝代替你的，这样才能逃过女巫的眼睛。准备战斗吧！";  // 1.12介绍文本
    [TextArea(3, 5)]
    [NonSerialized]
-    public string spiritIntroText2 = "白雪公主，请拿起地面上的弓箭，准备射杀凶猛的野猪，野猪即会躲避你的箭矢也会冲向你进行攻击，你需要多次击中它才能顺序的击杀成功，期待你的表现，加油！";       // 1.13介绍文本
+    public string spiritIntroText2 = "白雪公主，请拿起地面上的弓箭，准备捕捉凶猛的野猪，野猪即会躲避你的箭矢也会冲向你进行攻击，你需要多次击中它才能顺序的捕捉成功，期待你的表现，加油！";       // 1.13介绍文本
    [NonSerialized]
    public string spiritIntroText3 = "左手是弓箭，右手按住扳机键可以拉弓搭箭，松开扳机键即可把箭射出去，注意准心瞄准到野猪身上呢！";       // 1.13介绍文本
    [TextArea(2, 3)]
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -5,9 +5,15 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
+  - enabled: 0
+    path: Assets/_SnowWhite/Scenes/Jilin_Changchun_Beihu_WuyueGuangchang.unity
+    guid: b3b1be81b70fb6448b29a93c2cfb6f53
  - enabled: 1
-    path: Assets/_SnowWhite/Scenes/Wuhan_Jiangxia_LongwanBandao.unity
-    guid: 5bf06bfd696f94e4092bfeb3080f8905
+    path: Assets/_SnowWhite/Scenes/Guangdong_Shaoguan_Lechang_ZhigongwenhuGuangchang.unity
+    guid: 984b86b8efe10a9418b54a4e6114fcd9
+  - enabled: 0
+    path: Assets/_SnowWhite/Scenes/Guangdong_Shenzhen_Guangming_Wanda.unity
+    guid: 47326828aead64544ba8010543814783
  m_configObjects:
    Unity.XR.PXR.Settings: {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2,
      type: 2}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -13,7 +13,7 @@ PlayerSettings:
  useOnDemandResources: 0
  accelerometerFrequency: 60
  companyName: pineappletech
-  productName: "\u767D\u96EA\u5947\u9047"
+  productName: "\u767D\u96EA\u5947\u9047_2min"
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
  m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@ -163,7 +163,7 @@ PlayerSettings:
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
-    Android: com.pineappletech.snowWhite.wuhanjiangxialongwanbandao
+    Android: com.pineappletech.snowWhite.ghuangdongshaoguanlechangzhigongwenhuajie2min
    Standalone: com.DefaultCompany.com.unity.template.ar
  buildNumber:
    Standalone: 0
Author	SHA1	Message	Date
ZYT	99a52814c9	Merge remote-tracking branch 'origin/main' into Luo # Conflicts: # Assets/_SnowWhite/Scenes/Wuhan_Jiangxia_LongwanBandao.unity.meta # ProjectSettings/EditorBuildSettings.asset # ProjectSettings/ProjectSettings.asset	2026-04-07 10:41:10 +08:00
ZYT	b2b7a26972	修改吉林长春北湖吾悦广场场景	2026-04-07 10:40:20 +08:00