Browse Source

7.29场景修改

banlong 1 year ago
parent
commit
d27999d469

+ 146 - 19
Assets/BuyAssets/POLYPACK Nature Pack/Prefabs/VFX/Firefly.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 4033482423523386227}
   - component: {fileID: 4033482423523386224}
   m_Layer: 9
-  m_Name: Fly Spheres
+  m_Name: Firefly
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: 0.10339526, y: 0.85172945, z: -0.18353963, w: 0.4797703}
   m_LocalPosition: {x: 34, y: -7.5, z: -16.7}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -39,19 +40,19 @@ ParticleSystem:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4033482423523386225}
-  serializedVersion: 6
+  serializedVersion: 8
   lengthInSec: 5
   simulationSpeed: 1
   stopAction: 0
   cullingMode: 0
   ringBufferMode: 0
   ringBufferLoopRange: {x: 0, y: 1}
+  emitterVelocityMode: 0
   looping: 1
   prewarm: 0
   playOnAwake: 1
   useUnscaledTime: 0
   autoRandomSeed: 1
-  useRigidbodyForVelocity: 1
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -601,6 +602,7 @@ ParticleSystem:
         m_RotationOrder: 4
     randomizeRotationDirection: 0
     maxNumParticles: 1000
+    customEmitterVelocity: {x: 0, y: 0, z: 0}
     size3D: 0
     rotation3D: 0
     gravityModifier:
@@ -865,7 +867,7 @@ ParticleSystem:
     rateOverTime:
       serializedVersion: 2
       minMaxState: 0
-      scalar: 1000
+      scalar: 500
       minScalar: 10
       maxCurve:
         serializedVersion: 2
@@ -1360,6 +1362,7 @@ ParticleSystem:
         m_NumColorKeys: 2
         m_NumAlphaKeys: 2
   UVModule:
+    serializedVersion: 2
     enabled: 0
     mode: 0
     timeMode: 0
@@ -1477,7 +1480,7 @@ ParticleSystem:
     rowIndex: 0
     cycles: 1
     uvChannelMask: -1
-    randomRow: 1
+    rowMode: 1
     sprites:
     - sprite: {fileID: 0}
     flipU: 0
@@ -2124,6 +2127,62 @@ ParticleSystem:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
+  LifetimeByEmitterSpeedModule:
+    enabled: 0
+    m_Curve:
+      serializedVersion: 2
+      minMaxState: 1
+      scalar: 1
+      minScalar: 1
+      maxCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: -0.8
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 0.2
+          inSlope: -0.8
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      minCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+    m_Range: {x: 0, y: 1}
   ForceModule:
     enabled: 1
     x:
@@ -2369,8 +2428,61 @@ ParticleSystem:
     inWorldSpace: 1
     randomizePerFrame: 0
   ExternalForcesModule:
+    serializedVersion: 2
     enabled: 0
-    multiplier: 1
+    multiplierCurve:
+      serializedVersion: 2
+      minMaxState: 0
+      scalar: 1
+      minScalar: 1
+      maxCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
+      minCurve:
+        serializedVersion: 2
+        m_Curve:
+        - serializedVersion: 3
+          time: 0
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        - serializedVersion: 3
+          time: 1
+          value: 1
+          inSlope: 0
+          outSlope: 0
+          tangentMode: 0
+          weightedMode: 0
+          inWeight: 0.33333334
+          outWeight: 0.33333334
+        m_PreInfinity: 2
+        m_PostInfinity: 2
+        m_RotationOrder: 4
     influenceFilter: 0
     influenceMask:
       serializedVersion: 2
@@ -3591,19 +3703,20 @@ ParticleSystem:
     range: {x: 0, y: 1}
   CollisionModule:
     enabled: 0
-    serializedVersion: 3
+    serializedVersion: 4
     type: 0
     collisionMode: 0
     colliderForce: 0
     multiplyColliderForceByParticleSize: 0
     multiplyColliderForceByParticleSpeed: 0
     multiplyColliderForceByCollisionAngle: 1
-    plane0: {fileID: 0}
-    plane1: {fileID: 0}
-    plane2: {fileID: 0}
-    plane3: {fileID: 0}
-    plane4: {fileID: 0}
-    plane5: {fileID: 0}
+    m_Planes:
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
     m_Dampen:
       serializedVersion: 2
       minMaxState: 0
@@ -3777,17 +3890,20 @@ ParticleSystem:
     interiorCollisions: 0
   TriggerModule:
     enabled: 0
-    collisionShape0: {fileID: 0}
-    collisionShape1: {fileID: 0}
-    collisionShape2: {fileID: 0}
-    collisionShape3: {fileID: 0}
-    collisionShape4: {fileID: 0}
-    collisionShape5: {fileID: 0}
+    serializedVersion: 2
     inside: 1
     outside: 0
     enter: 0
     exit: 0
+    colliderQueryMode: 0
     radiusScale: 1
+    primitives:
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
   SubModule:
     serializedVersion: 2
     enabled: 0
@@ -4738,9 +4854,12 @@ ParticleSystemRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4752,6 +4871,7 @@ ParticleSystemRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
@@ -4765,6 +4885,7 @@ ParticleSystemRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_RenderMode: 0
+  m_MeshDistribution: 0
   m_SortMode: 0
   m_MinParticleSize: 0
   m_MaxParticleSize: 1
@@ -4781,9 +4902,15 @@ ParticleSystemRenderer:
   m_EnableGPUInstancing: 1
   m_ApplyActiveColorSpace: 1
   m_AllowRoll: 1
+  m_FreeformStretching: 0
+  m_RotateWithStretchDirection: 1
   m_VertexStreams: 000304
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
+  m_MeshWeighting: 1
+  m_MeshWeighting1: 1
+  m_MeshWeighting2: 1
+  m_MeshWeighting3: 1
   m_MaskInteraction: 0

+ 1 - 1
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_4.prefab

@@ -61,7 +61,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a47a09759be48824ead0bb2548fbf2f0, type: 2}
+  - {fileID: 2100000, guid: 20d51fe616dbb9f4da3cb4e3b692a659, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

+ 1 - 1
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_5.prefab

@@ -61,7 +61,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a47a09759be48824ead0bb2548fbf2f0, type: 2}
+  - {fileID: 2100000, guid: 20d51fe616dbb9f4da3cb4e3b692a659, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

+ 1 - 1
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_6.prefab

@@ -61,7 +61,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a47a09759be48824ead0bb2548fbf2f0, type: 2}
+  - {fileID: 2100000, guid: 20d51fe616dbb9f4da3cb4e3b692a659, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

+ 1 - 1
Assets/BuyAssets/Palmov Island/Low Poly Cartoon Environment Pack/Prefabs/Clouds/cloud_8.prefab

@@ -61,7 +61,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: a47a09759be48824ead0bb2548fbf2f0, type: 2}
+  - {fileID: 2100000, guid: 20d51fe616dbb9f4da3cb4e3b692a659, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

+ 3 - 3
Assets/Prefabs/Unit/Tower1.prefab

@@ -238,7 +238,7 @@ PrefabInstance:
     - target: {fileID: 1505199887716567231, guid: 4442893a72b86bf45884bd6ce6273472,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.2588191
+      value: 0.8314697
       objectReference: {fileID: 0}
     - target: {fileID: 1505199887716567231, guid: 4442893a72b86bf45884bd6ce6273472,
         type: 3}
@@ -248,7 +248,7 @@ PrefabInstance:
     - target: {fileID: 1505199887716567231, guid: 4442893a72b86bf45884bd6ce6273472,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.9659258
+      value: 0.5555702
       objectReference: {fileID: 0}
     - target: {fileID: 1505199887716567231, guid: 4442893a72b86bf45884bd6ce6273472,
         type: 3}
@@ -263,7 +263,7 @@ PrefabInstance:
     - target: {fileID: 1505199887716567231, guid: 4442893a72b86bf45884bd6ce6273472,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 150
+      value: 67.5
       objectReference: {fileID: 0}
     - target: {fileID: 1505199887716567231, guid: 4442893a72b86bf45884bd6ce6273472,
         type: 3}

+ 4 - 4
Assets/Prefabs/Unit/Tower1_posun.prefab

@@ -4991,7 +4991,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2678307129247865491}
-  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: -0.531631, y: -0.46622792, z: -0.46622792, w: 0.531631}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -38778,7 +38778,7 @@ PrefabInstance:
     - target: {fileID: 8454663880362614937, guid: 76195c23c373b0147b43514d10380d31,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.2588191
+      value: 0.8314697
       objectReference: {fileID: 0}
     - target: {fileID: 8454663880362614937, guid: 76195c23c373b0147b43514d10380d31,
         type: 3}
@@ -38788,7 +38788,7 @@ PrefabInstance:
     - target: {fileID: 8454663880362614937, guid: 76195c23c373b0147b43514d10380d31,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.9659258
+      value: 0.5555702
       objectReference: {fileID: 0}
     - target: {fileID: 8454663880362614937, guid: 76195c23c373b0147b43514d10380d31,
         type: 3}
@@ -38803,7 +38803,7 @@ PrefabInstance:
     - target: {fileID: 8454663880362614937, guid: 76195c23c373b0147b43514d10380d31,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 150
+      value: 67.5
       objectReference: {fileID: 0}
     - target: {fileID: 8454663880362614937, guid: 76195c23c373b0147b43514d10380d31,
         type: 3}

+ 3 - 3
Assets/Prefabs/Unit/Tower1_suipian.prefab

@@ -243,7 +243,7 @@ PrefabInstance:
     - target: {fileID: 6466934881750768359, guid: 1cfa77e9205c42b419e4ef147e6e05b6,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.2588191
+      value: 0.8314697
       objectReference: {fileID: 0}
     - target: {fileID: 6466934881750768359, guid: 1cfa77e9205c42b419e4ef147e6e05b6,
         type: 3}
@@ -253,7 +253,7 @@ PrefabInstance:
     - target: {fileID: 6466934881750768359, guid: 1cfa77e9205c42b419e4ef147e6e05b6,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.9659258
+      value: 0.5555702
       objectReference: {fileID: 0}
     - target: {fileID: 6466934881750768359, guid: 1cfa77e9205c42b419e4ef147e6e05b6,
         type: 3}
@@ -268,7 +268,7 @@ PrefabInstance:
     - target: {fileID: 6466934881750768359, guid: 1cfa77e9205c42b419e4ef147e6e05b6,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 150
+      value: 67.5
       objectReference: {fileID: 0}
     - target: {fileID: 6466934881750768359, guid: 1cfa77e9205c42b419e4ef147e6e05b6,
         type: 3}

File diff suppressed because it is too large
+ 205 - 105
Assets/Scenes/MapTiktok.unity


BIN
Assets/Tiktok.asset


+ 1 - 1
Assets/Tiktok.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0b7bd5f7c0ae4b347a735ac4f351d06f
+guid: f0585fcef523da346b3733f934354c74
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 15600000

Some files were not shown because too many files changed in this diff