Merge branch 'Saipo' of https://e.coding.net/gensokyogroup/saima/SAIMA into Roman

# Conflicts: # Assets/勍/场景/0813中期提交.unity # Assets/勍/场景/教程场景试做.unity # UserSettings/EditorUserSettings.asset # UserSettings/Layouts/default-2021.dwlt
2022-08-28 19:16:19 +08:00 · 2022-08-28 19:16:19 +08:00 · 7adaf193ea
commit 7adaf193ea
parent e8ee42b03a d5099b0c7d
5 changed files with 48 additions and 36 deletions
--- a/Assets/勍/场景/0813中期提交.unity
+++ b/Assets/勍/场景/0813中期提交.unity
@ -6542,6 +6542,18 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 360
      objectReference: {fileID: 0}
+    - target: {fileID: 8916953045395074343, guid: 780558eb47117aa4cb2066e837036ea8, type: 3}
+      propertyPath: m_SortingLayer
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8916953045395074343, guid: 780558eb47117aa4cb2066e837036ea8, type: 3}
+      propertyPath: m_SortingOrder
+      value: -17
+      objectReference: {fileID: 0}
+    - target: {fileID: 8916953045395074343, guid: 780558eb47117aa4cb2066e837036ea8, type: 3}
+      propertyPath: m_SortingLayerID
+      value: 1187321199
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 780558eb47117aa4cb2066e837036ea8, type: 3}
 --- !u!4 &1108982395 stripped
--- a/Assets/勍/场景/教程场景试做.unity
+++ b/Assets/勍/场景/教程场景试做.unity
@ -521,7 +521,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 169862783192910048, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 169862783192910050, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3}
      propertyPath: m_SortingLayer
@ -621,7 +621,7 @@ PrefabInstance:
      objectReference: {fileID: 1757123325}
    - target: {fileID: 169862783192910053, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3}
      propertyPath: InitialModule.startSize.scalar
-      value: 1.29
+      value: 1.46
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 84ef038ddc168544eb42b297f7acd3a5, type: 3}
--- a/Assets/勍/预制体/障碍物/LowObstacle.prefab
+++ b/Assets/勍/预制体/障碍物/LowObstacle.prefab
@ -81,7 +81,7 @@ SpriteRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  - {fileID: 2100000, guid: 6fb9b13f22d56284fab036b68cfb14c8, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
--- a/Assets/勍/预制体/障碍物/highObstacle.prefab
+++ b/Assets/勍/预制体/障碍物/highObstacle.prefab
@ -81,7 +81,7 @@ SpriteRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  - {fileID: 2100000, guid: 6fb9b13f22d56284fab036b68cfb14c8, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@ -26,7 +26,7 @@ MonoBehaviour:
  m_MinSize: {x: 400, y: 200}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 23177
+  controlID: 319
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -143,7 +143,7 @@ MonoBehaviour:
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 23178
+  controlID: 320
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -163,8 +163,8 @@ MonoBehaviour:
    y: 0
    width: 599.2
    height: 398.4
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
  m_ActualView: {fileID: 5}
  m_Panes:
  - {fileID: 5}
@ -203,8 +203,8 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: -100, y: -25.600006}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: -100, y: -25.600006}
      snapCorner: 3
      id: Tool Settings
      index: 0
@ -214,9 +214,9 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: -141, y: -203.79999}
+      snapOffset: {x: -141, y: 149}
      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 1
      id: unity-grid-and-snap-toolbar
      index: 1
      layout: 1
@ -225,7 +225,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 0, y: 24.8}
+      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: unity-scene-view-toolbar
@ -269,7 +269,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 0, y: 24.8}
+      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: unity-transform-toolbar
@ -401,7 +401,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 0
-      snapOffset: {x: 0, y: 24.8}
+      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: Scene View/Particles
@ -417,9 +417,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 157.49402, y: 51.52021, z: -1.1973404}
+    m_Target: {x: -190.49776, y: -4.0283966, z: -0.008202577}
    speed: 2
-    m_Value: {x: 157.49402, y: 51.52021, z: -1.1973404}
+    m_Value: {x: -190.49776, y: -4.0283966, z: -0.008202577}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -470,9 +470,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 121.953285
+    m_Target: 9.733639
    speed: 2
-    m_Value: 121.953285
+    m_Value: 9.733639
  m_Ortho:
    m_Target: 1
    speed: 2
@ -516,8 +516,8 @@ MonoBehaviour:
    y: 398.4
    width: 599.2
    height: 324.4
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 2}
  m_Panes:
  - {fileID: 2}
@ -542,8 +542,8 @@ MonoBehaviour:
    y: 0
    width: 230.39996
    height: 722.8
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
  m_ActualView: {fileID: 8}
  m_Panes:
  - {fileID: 8}
@ -582,7 +582,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 2adcfefffaddfeff88dffeff82e0feff9ee5feffaee7feff56e8feff26e9feff28eafeff5aecfeff06edfeffbaf0feffc2f0fefff82dffffd63cffff7854fffffe56ffffc45dffffd65fffff106bffff0a6cffffea71ffffeaacffff0efbffff127700001e7700004a7800001c79000038790000a6790000b01d010094c7010080cf010072de0100d4e0010042ee0100f8f40100fe1302007e2d0200462f020006780200627902008e7a0200
+      m_ExpandedIDs: e8faffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -686,10 +686,10 @@ MonoBehaviour:
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 647d0000
-    m_LastClickedID: 32100
-    m_ExpandedIDs: 00000000167d0000187d00001a7d00001c7d00001e7d0000207d0000227d0000247d0000267d0000287d00002a7d0000
+    scrollPos: {x: 0, y: 138.20001}
+    m_SelectedIDs: 8e7c0000
+    m_LastClickedID: 31886
+    m_ExpandedIDs: 00000000547c0000567c0000587c00005a7c00005c7c00005e7c0000607c0000627c0000647c0000667c0000687c00006a7c0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -717,7 +717,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000167d0000187d00001a7d00001c7d00001e7d0000207d0000227d0000247d0000267d0000287d00002a7d0000
+    m_ExpandedIDs: 00000000547c0000567c0000587c00005a7c00005c7c00005e7c0000607c0000627c0000647c0000667c0000687c00006a7c0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -742,9 +742,9 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 388a0200
-    m_LastClickedInstanceID: 166456
-    m_HadKeyboardFocusLastEvent: 1
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 0
    m_ExpandedInstanceIDs: 9aa10100d03a0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@ -829,7 +829,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 647b0000
    m_LastClickedID: 31588
-    m_ExpandedIDs: 00000000167d0000187d00001a7d00001c7d00001e7d0000207d0000227d0000247d0000267d0000287d00002a7d0000
+    m_ExpandedIDs: 00000000547c0000567c0000587c00005a7c00005c7c00005e7c0000607c0000627c0000647c0000667c0000687c00006a7c0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -857,7 +857,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000167d0000187d00001a7d00001c7d00001e7d0000207d0000227d0000247d0000267d0000287d00002a7d0000
+    m_ExpandedIDs: 00000000547c0000567c0000587c00005a7c00005c7c00005e7c0000607c0000627c0000647c0000667c0000687c00006a7c0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -974,7 +974,7 @@ MonoBehaviour:
    m_CachedPref: -160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: 166456
+  m_LastInspectedObjectInstanceID: -1
  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0
@ -1015,7 +1015,7 @@ MonoBehaviour:
    m_CachedPref: 151
    m_ControlHash: 1412526313
    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: 166456
+  m_LastInspectedObjectInstanceID: -1
  m_LastVerticalScrollValue: 0
  m_GlobalObjectId: 
  m_InspectorMode: 0