合并SAIPOVersion

Assets/Prefabs/角色/小孩.prefab

@@ -442,7 +442,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8768629961683683037, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0009602383
+      value: 0.00095999986
       objectReference: {fileID: 0}
     - target: {fileID: -8768629961683683037, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -490,7 +490,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -6734166163963399142, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.02864492
+      value: -0.028644443
       objectReference: {fileID: 0}
     - target: {fileID: -6734166163963399142, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -506,7 +506,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -6001402528758460064, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.00000047683716
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -6001402528758460064, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -574,7 +574,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -5583197367595257359, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.x
-      value: 0
+      value: 0.000015258789
       objectReference: {fileID: 0}
     - target: {fileID: -5583197367595257359, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
@@ -610,7 +610,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -4385646031045499151, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.0008551851
+      value: -0.0008554235
       objectReference: {fileID: 0}
     - target: {fileID: -4385646031045499151, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -626,7 +626,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -4264577982327312459, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.024820268
+      value: -0.02482003
       objectReference: {fileID: 0}
     - target: {fileID: -4264577982327312459, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -678,7 +678,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -2539634155857041622, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.00000048428774
+      value: -0.000000007450581
       objectReference: {fileID: 0}
     - target: {fileID: -2539634155857041622, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -694,7 +694,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -2160634030733310723, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.00000044703484
+      value: 0.000000923872
       objectReference: {fileID: 0}
     - target: {fileID: -2160634030733310723, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -710,7 +710,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -1059228187761910039, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.0029606223
+      value: -0.002960503
       objectReference: {fileID: 0}
     - target: {fileID: -1059228187761910039, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -806,7 +806,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2207641786743455394, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.00000047683716
+      value: 0.00000023841858
       objectReference: {fileID: 0}
     - target: {fileID: 2207641786743455394, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -894,7 +894,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4812338330836884733, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0000009536743
+      value: 0.0000011920929
       objectReference: {fileID: 0}
     - target: {fileID: 4812338330836884733, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -910,7 +910,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5072364404068036212, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.0004800409
+      value: -0.00048051775
       objectReference: {fileID: 0}
     - target: {fileID: 5072364404068036212, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -926,7 +926,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5209907848668345870, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0004399866
+      value: 0.00044046342
       objectReference: {fileID: 0}
     - target: {fileID: 5209907848668345870, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -958,7 +958,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5475140650991618958, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.039560854
+      value: -0.039560378
       objectReference: {fileID: 0}
     - target: {fileID: 5475140650991618958, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.y
@@ -970,7 +970,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6082399734885695883, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0008600205
+      value: 0.00086049736
       objectReference: {fileID: 0}
     - target: {fileID: 6082399734885695883, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -998,7 +998,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7045094786651869979, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.00000035762787
+      value: 0.00000059604645
       objectReference: {fileID: 0}
     - target: {fileID: 7045094786651869979, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -1014,7 +1014,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7316714418794174679, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0020947903
+      value: 0.0020950288
       objectReference: {fileID: 0}
     - target: {fileID: 7316714418794174679, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -1026,7 +1026,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7963621343228913669, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0000058338046
+      value: 0.000005595386
       objectReference: {fileID: 0}
     - target: {fileID: 7963621343228913669, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -1042,7 +1042,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: 0.0014649332
+      value: 0.0014650524
       objectReference: {fileID: 0}
     - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x
@@ -1050,7 +1050,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8876826567850745775, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.y
-      value: 0.48853534
+      value: 0.48853546
       objectReference: {fileID: 0}
     - target: {fileID: 9036679573997064456, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.x
@@ -1058,7 +1058,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9036679573997064456, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Center.y
-      value: -0.0000006109476
+      value: -0.0000007301569
       objectReference: {fileID: 0}
     - target: {fileID: 9036679573997064456, guid: e8a77a03bb862394e97b860c6020d4c8, type: 3}
       propertyPath: m_Bounds.m_Extent.x

Assets/Scenes/各种系统测试与陈列.unity

@@ -4990,68 +4990,53 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &1550886585
-RectTransform:
+--- !u!4 &1545643696
+Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1550886584}
+  m_GameObject: {fileID: 1545643695}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -0.19999981, y: -0.87, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1355607313}
-  m_RootOrder: 0
+  m_Father: {fileID: 1789875270}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.38231927, y: 0.4296921}
-  m_AnchorMax: {x: 0.62600005, y: 0.5493461}
-  m_AnchoredPosition: {x: 0, y: -0.0000019073486}
-  m_SizeDelta: {x: 117.21, y: 30.108}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1550886586
+--- !u!114 &1545643697
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1550886584}
+  m_GameObject: {fileID: 1545643695}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: d58ce9ce23ba37f42a04fad82e8f1222, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 14
-    m_MaxSize: 150
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 
---- !u!222 &1550886587
-CanvasRenderer:
+  VolumeProfile: {fileID: 11400000, guid: 276382b4749182849a2306c94b19d810, type: 2}
+  Cycle: 3.65
+  rate: 1.31
+--- !u!114 &1545643698
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1550886584}
-  m_CullTransparentMesh: 1
---- !u!1 &1601657820
+  m_GameObject: {fileID: 1545643695}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isGlobal: 1
+  priority: 0
+  blendDistance: 0
+  weight: 1
+  sharedProfile: {fileID: 11400000, guid: 276382b4749182849a2306c94b19d810, type: 2}
+--- !u!1 &1550886584
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -5059,21 +5044,23 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1601657821}
-  m_Layer: 0
-  m_Name: "---\u89D2\u8272---"
+  - component: {fileID: 1550886585}
+  - component: {fileID: 1550886587}
+  - component: {fileID: 1550886586}
+  m_Layer: 5
+  m_Name: "\u6469\u5C14\u65AF"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1601657821
+--- !u!4 &1545643696
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1601657820}
+  m_GameObject: {fileID: 1545643695}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.24902964, y: -0.043382347, z: -0.09978611}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -5615,6 +5602,36 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836410031}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 24.64331, y: 43.94052}
+      - {x: 10.269989, y: 49.483902}
+      - {x: -0.712226, y: 49.987118}
+      - {x: 0.84522915, y: 37.882572}
+      - {x: 19.217058, y: 34.300007}
+      - {x: 23.640572, y: 43.299664}
+--- !u!1 &1839520244
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8233114533063075528, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3}
+  m_PrefabInstance: {fileID: 8233114534945036262}
+  m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1839520245}

Assets/Scenes/序章-家中.unity

@@ -2302,6 +2302,194 @@ VideoPlayer:
   m_FrameReadyEventEnabled: 0
   m_VideoShaders: []
 --- !u!1 &751638227
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 744467542}
+  - component: {fileID: 744467543}
+  - component: {fileID: 744467544}
+  m_Layer: 5
+  m_Name: "CG\uFF1A\u6682\u7528-\u6218\u53CB"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &744467542
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 744467541}
+  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_Children: []
+  m_Father: {fileID: 1771706914}
+  m_RootOrder: 1
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &744467543
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 744467541}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab6d265b5e187da4bbc927caf02b681e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CGName: "\u6682\u7528-\u6218\u53CB"
+  texture: {fileID: 2800000, guid: cef0e0ab272206648a43e294c577aa2c, type: 3}
+  time: 3
+  onEnded: {fileID: 728085632}
+--- !u!328 &744467544
+VideoPlayer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 744467541}
+  m_Enabled: 1
+  m_VideoClip: {fileID: 32900000, guid: 9721c6ab411fa7143b3ccd74e9994c1a, type: 3}
+  m_TargetCameraAlpha: 1
+  m_TargetCamera3DLayout: 0
+  m_TargetCamera: {fileID: 0}
+  m_TargetTexture: {fileID: 0}
+  m_TimeReference: 0
+  m_TargetMaterialRenderer: {fileID: 0}
+  m_TargetMaterialProperty: _MainTex
+  m_RenderMode: 2
+  m_AspectRatio: 2
+  m_DataSource: 0
+  m_PlaybackSpeed: 1
+  m_AudioOutputMode: 2
+  m_TargetAudioSources:
+  - {fileID: 0}
+  m_DirectAudioVolumes:
+  - 1
+  m_Url: 
+  m_EnabledAudioTracks: 01
+  m_DirectAudioMutes: 00
+  m_ControlledAudioTrackCount: 1
+  m_PlayOnAwake: 1
+  m_SkipOnDrop: 1
+  m_Looping: 0
+  m_WaitForFirstFrame: 1
+  m_FrameReadyEventEnabled: 0
+  m_VideoShaders: []
+--- !u!1 &751638227
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 728085631}
+  - component: {fileID: 728085632}
+  m_Layer: 0
+  m_Name: "\u5F53\u5F00\u95E8CG\u7ED3\u675F\u540E"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &728085631
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 728085630}
+  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_Children: []
+  m_Father: {fileID: 71136650}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &728085632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 728085630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4b074b5d370b3324faa79c0a3dd76762, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &742864119 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6148935033436152201, guid: b034a6d27e737a9438c2164815880846, type: 3}
+  m_PrefabInstance: {fileID: 6148935033767695742}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &744467541
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 744467542}
+  - component: {fileID: 744467543}
+  m_Layer: 5
+  m_Name: "CG\uFF1A\u6682\u7528-\u6218\u53CB"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &744467542
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 744467541}
+  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_Children: []
+  m_Father: {fileID: 1771706914}
+  m_RootOrder: 1
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &744467543
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 744467541}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab6d265b5e187da4bbc927caf02b681e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CGName: "\u6682\u7528-\u6218\u53CB"
+  texture: {fileID: 2800000, guid: cef0e0ab272206648a43e294c577aa2c, type: 3}
+  time: 3
+  onEnded: {fileID: 728085632}
+--- !u!1 &751638227
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4533,7 +4721,8 @@ MonoBehaviour:
     height: 859
   selectedBlocks:
   - {fileID: 1132274498}
-  selectedCommands: []
+  selectedCommands:
+  - {fileID: 1132274501}
   variables: []
   description: 
   stepPause: 0

Assets/Scenes/第一关.unity

@@ -1202,6 +1202,7 @@ RectTransform:
   - {fileID: 1846175060}
   - {fileID: 90261333}
   - {fileID: 2035829732}
+  - {fileID: 1966298236}
   m_Father: {fileID: 1102619305}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5039,6 +5040,81 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4324cb24768857b4aa1e1d692e6c3797, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &1966298235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1966298236}
+  - component: {fileID: 1966298238}
+  - component: {fileID: 1966298237}
+  m_Layer: 5
+  m_Name: "\u5C4F\u5E55\u6E32\u67D3Shader"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1966298236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1966298235}
+  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_Children: []
+  m_Father: {fileID: 526267221}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1966298237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1966298235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 2100000, guid: 3f5b92531fcdfc648b72fc8f20f17488, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.16470589}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1966298238
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1966298235}
+  m_CullTransparentMesh: 1
 --- !u!1001 &2035829731
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5246,8 +5322,8 @@ MonoBehaviour:
   m_LightType: 4
   m_BlendStyleIndex: 0
   m_FalloffIntensity: 0.52
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
+  m_Color: {r: 0.9150943, g: 0.9039948, b: 0.7208526, a: 1}
+  m_Intensity: 1.12
   m_LightVolumeOpacity: 0
   m_ApplyToSortingLayers: 00000000
   m_LightCookieSprite: {fileID: 0}

Assets/Shader/FOG.meta

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

Assets/Shader/FOG/FOG.shadergraph.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8099e26c54d24444589f0c3100136e33
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Shader/FOG/Fog.mat

@@ -0,0 +1,59 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Fog
+  m_Shader: {fileID: -6465566751694194690, guid: 8099e26c54d24444589f0c3100136e33, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - Vector1_0c3466d140004979b5c59f2064174174: 1.01
+    - Vector1_26b44ae3d0064f478d426380ca113497: 0.57
+    - Vector1_d6463bb05060418c8d894954f404e971: 0.58
+    - _EnableExternalAlpha: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []

Assets/Shader/FOG/Fog.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3f5b92531fcdfc648b72fc8f20f17488
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Shader/回忆/Dream.mat

@@ -76,8 +76,9 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - Vector1_0c3466d140004979b5c59f2064174174: 1.55
     - Vector1_26b44ae3d0064f478d426380ca113497: 0.58
-    - Vector1_d6463bb05060418c8d894954f404e971: 58.25
+    - Vector1_d6463bb05060418c8d894954f404e971: 0.1
     - _EnableExternalAlpha: 0
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}

Assets/URP/FirstSceneShader.asset

@@ -0,0 +1,63 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7958839919753394863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae139bbe26a155746b4c6da46384c092, type: 3}
+  m_Name: NewMPRendererFeature
+  m_EditorClassIdentifier: 
+  m_Active: 1
+  settings:
+    renderPassEvent: 400
+    mMat: {fileID: 2100000, guid: 3f5b92531fcdfc648b72fc8f20f17488, type: 2}
+    destination: 0
+    textureId: _ScreenTexture
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
+  m_Name: FirstSceneShader
+  m_EditorClassIdentifier: 
+  m_RendererFeatures:
+  - {fileID: -7958839919753394863}
+  m_RendererFeatureMap: 5185e6be42858c91
+  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
+  shaders:
+    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
+    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+    screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3}
+    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    tileDepthInfoPS: {fileID: 0}
+    tileDeferredPS: {fileID: 0}
+    stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
+    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+    materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
+  m_OpaqueLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_TransparentLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_DefaultStencilState:
+    overrideStencilState: 0
+    stencilReference: 0
+    stencilCompareFunction: 8
+    passOperation: 2
+    failOperation: 0
+    zFailOperation: 0
+  m_ShadowTransparentReceive: 1
+  m_RenderingMode: 0
+  m_AccurateGbufferNormals: 0

Assets/URP/FirstSceneShader.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0078391456ea34746b5dbab95428f19b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/URP/UniversalRenderPipelineAsset.asset

@@ -20,6 +20,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 2545aabb181dab143ace612971515be5, type: 2}
   - {fileID: 11400000, guid: 5899612711f6d7848a54375526fb0b76, type: 2}
   - {fileID: 11400000, guid: 565c6a023ef014444924136953f2b3e7, type: 2}
+  - {fileID: 11400000, guid: 0078391456ea34746b5dbab95428f19b, type: 2}
   m_DefaultRendererIndex: 0
   m_RequireDepthTexture: 0
   m_RequireOpaqueTexture: 0

Assets/图/动画/renwu.controller

@@ -17,11 +17,12 @@ AnimatorStateMachine:
     m_Position: {x: -10, y: 60, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
-  m_EntryTransitions: []
+  m_EntryTransitions:
+  - {fileID: 351989570621910821}
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: -110, y: -30, z: 0}
-  m_EntryPosition: {x: -60, y: 180, z: 0}
+  m_EntryPosition: {x: -40, y: 190, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: 1259281646917324526}
@@ -47,6 +48,20 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1109 &351989570621910821
+AnimatorTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3926615483802031973}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 1
 --- !u!1102 &1259281646917324526
 AnimatorState:
   serializedVersion: 5

Assets/游戏内动画资源/AM/走.anim

@@ -10230,7 +10230,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: 0.050330877
+        value: 1.9645065
         inSlope: 0
         outSlope: 0
         tangentMode: 136

UserSettings/EditorUserSettings.asset

@@ -24,25 +24,25 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-8:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-9:
       value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
       flags: 0
+    RecentlyUsedScenePath-7:
+      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
+      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
+      flags: 0
+    RecentlyUsedScenePath-9:
+      value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
+      flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba95e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b1968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
       value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd88908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650