提交

2025-09-26 18:26:23 +00:00 · 2024-01-30 19:22:27 +08:00
parent 09db51f67b
commit a0c687b1ed
114 changed files with 18393 additions and 13605 deletions
--- a/JNFrame/UserSettings/EditorUserSettings.asset
+++ b/JNFrame/UserSettings/EditorUserSettings.asset
@@ -6,10 +6,10 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 5409020704005a585b5a5b7545710a44434e1b782a707168297a1e67b1e1656b
+      value: 5a03005f0301085d0f5d082043200b444e4e1c7b2d7a7f352c714532b0e6653b
      flags: 0
    RecentlyUsedSceneGuid-1:
-      value: 5a03005f0301085d0f5d082043200b444e4e1c7b2d7a7f352c714532b0e6653b
+      value: 5409020704005a585b5a5b7545710a44434e1b782a707168297a1e67b1e1656b
      flags: 0
    RecentlyUsedSceneGuid-2:
      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
--- a/JNFrame/UserSettings/Layouts/default-2021.dwlt
+++ b/JNFrame/UserSettings/Layouts/default-2021.dwlt
@@ -17,9 +17,9 @@ MonoBehaviour:
    x: 0
    y: 43
    width: 1920
-    height: 1037
+    height: 989
  m_ShowMode: 4
-  m_Title: "\u63A7\u5236\u53F0"
+  m_Title: "\u9879\u76EE"
  m_RootView: {fileID: 7}
  m_MinSize: {x: 875, y: 371}
  m_MaxSize: {x: 10000, y: 10000}
@@ -34,20 +34,20 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: SimulatorWindow
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1068
+    x: 820
    y: 0
-    width: 398
-    height: 584
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+    width: 709
+    height: 438
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 14}
  m_Panes:
-  - {fileID: 17}
+  - {fileID: 14}
  m_Selected: 0
  m_LastSelected: 0
 --- !u!114 &3
@@ -70,11 +70,11 @@ MonoBehaviour:
    x: 0
    y: 30
    width: 1920
-    height: 987
+    height: 939
  m_MinSize: {x: 400, y: 200}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 53
+  controlID: 121
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -90,15 +90,15 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1466
+    x: 1529
    y: 0
-    width: 454
-    height: 987
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+    width: 391
+    height: 939
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 16}
  m_Panes:
-  - {fileID: 14}
+  - {fileID: 16}
  m_Selected: 0
  m_LastSelected: 0
 --- !u!114 &5
@@ -118,13 +118,13 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 280
-    height: 584
+    width: 286
+    height: 438
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 17}
  m_Panes:
-  - {fileID: 15}
+  - {fileID: 17}
  m_Selected: 0
  m_LastSelected: 0
 --- !u!114 &6
@@ -137,23 +137,23 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ConsoleWindow
+  m_Name: ProjectBrowser
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 584
-    width: 1466
-    height: 403
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 18}
+    y: 438
+    width: 1529
+    height: 501
+  m_MinSize: {x: 231, y: 271}
+  m_MaxSize: {x: 10001, y: 10021}
+  m_ActualView: {fileID: 15}
  m_Panes:
-  - {fileID: 13}
-  - {fileID: 18}
-  m_Selected: 1
-  m_LastSelected: 0
+  - {fileID: 15}
+  - {fileID: 19}
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &7
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -175,7 +175,7 @@ MonoBehaviour:
    x: 0
    y: 0
    width: 1920
-    height: 1037
+    height: 989
  m_MinSize: {x: 875, y: 300}
  m_MaxSize: {x: 10000, y: 10000}
  m_UseTopView: 1
@@ -220,7 +220,7 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 1017
+    y: 969
    width: 1920
    height: 20
  m_MinSize: {x: 0, y: 0}
@@ -244,12 +244,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1466
-    height: 987
+    width: 1529
+    height: 939
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 1
-  controlID: 58
+  controlID: 17
 --- !u!114 &11
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -270,12 +270,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1466
-    height: 584
+    width: 1529
+    height: 438
  m_MinSize: {x: 300, y: 100}
  m_MaxSize: {x: 24288, y: 8096}
  vertical: 0
-  controlID: 40
+  controlID: 89
 --- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
@@ -291,18 +291,108 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 280
+    x: 286
    y: 0
-    width: 788
-    height: 584
+    width: 534
+    height: 438
  m_MinSize: {x: 200, y: 200}
  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 18}
  m_Panes:
-  - {fileID: 16}
+  - {fileID: 18}
+  - {fileID: 13}
  m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &13
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12111, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 455, y: 354}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: "\u8D44\u6E90\u5546\u5E97"
+    m_Image: {fileID: -8693916549880196297, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 286
+    y: 73
+    width: 532
+    height: 417
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+--- !u!114 &14
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 13974, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: "\u6A21\u62DF\u5668"
+    m_Image: {fileID: 8720083202187608617, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 820
+    y: 73
+    width: 707
+    height: 417
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SerializedViewNames:
+  - UnityEditor.GameView
+  m_SerializedViewValues:
+  - D:\myproject\JisolGame\JNFrame\Library\PlayModeViewStates\f769712669b21d54eaaba224ae09f44d
+  m_PlayModeViewName: Device Simulator
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 1}
+  m_TargetSize: {x: 1334, y: 750}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 2
+  m_UseMipMap: 0
+  m_SimulatorState:
+    controlPanelVisible: 0
+    controlPanelWidth: 0
+    controlPanelFoldoutKeys:
+    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
+    controlPanelFoldoutValues: 00
+    pluginNames:
+    - UnityEditor.DeviceSimulation.ApplicationSettingsPlugin
+    pluginStates:
+    - '{}'
+    scale: 41
+    fitToScreenEnabled: 0
+    rotationDegree: 270
+    highlightSafeAreaEnabled: 0
+    friendlyName: Apple iPhone 7
+    networkReachability: 1
+    systemLanguage: 10
+--- !u!114 &15
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -323,9 +413,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 657
-    width: 1465
-    height: 382
+    y: 511
+    width: 1528
+    height: 480
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -342,23 +432,23 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Scenes
+    - Assets/Packages/System.Runtime.CompilerServices.Unsafe.4.5.2/lib/netstandard2.0
    m_Globs: []
    m_OriginalText: 
    m_FilterByTypeIntersection: 0
  m_ViewMode: 1
  m_StartGridSize: 64
  m_LastFolders:
-  - Assets/Scenes
+  - Assets/Packages/System.Runtime.CompilerServices.Unsafe.4.5.2/lib/netstandard2.0
  m_LastFoldersGridSize: -1
-  m_LastProjectPath: D:\Jisol\JisolGame\JNFrame
+  m_LastProjectPath: D:\myproject\JisolGame\JNFrame
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 5}
-    m_SelectedIDs: 50950000
-    m_LastClickedID: 38224
-    m_ExpandedIDs: 00000000be650000
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 14670000
+    m_LastClickedID: 26388
+    m_ExpandedIDs: 00000000d4650000d6650000d8650000da650000e2650000086600005866000074660000986600009e660000b66600000a67000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -386,7 +476,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000be650000
+    m_ExpandedIDs: 00000000d4650000d6650000d8650000da650000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@@ -411,8 +501,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 70950000
-    m_LastClickedInstanceID: 38256
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: c6230000
    m_RenameOverlay:
@@ -441,8 +531,8 @@ MonoBehaviour:
    m_ScrollPosition: {x: 0, y: 0}
    m_GridSize: 64
  m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 207
--- !u!114 &14
+  m_DirectoriesAreaWidth: 422
+--- !u!114 &16
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -462,10 +552,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1466
+    x: 1529
    y: 73
-    width: 453
-    height: 966
+    width: 390
+    height: 918
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -484,7 +574,7 @@ MonoBehaviour:
  m_LockTracker:
    m_IsLocked: 0
  m_PreviewWindow: {fileID: 0}
--- !u!114 &15
+--- !u!114 &17
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -506,8 +596,8 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 73
-    width: 279
-    height: 563
+    width: 285
+    height: 417
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -518,7 +608,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 36fbffff
+      m_ExpandedIDs: d8ecffff66edffff32fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@@ -542,7 +632,7 @@ MonoBehaviour:
      m_IsLocked: 0
    m_CurrentSortingName: TransformSorting
  m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &16
+--- !u!114 &18
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -562,10 +652,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 280
+    x: 286
    y: 73
-    width: 786
-    height: 563
+    width: 532
+    height: 417
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@@ -619,7 +709,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: unity-transform-toolbar
@@ -796,14 +886,14 @@ MonoBehaviour:
  m_OverrideSceneCullingMask: 6917529027641081856
  m_SceneIsLit: 1
  m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
  m_isRotationLocked: 0
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 194.21915, y: 105.892365, z: -5.964622}
+    m_Target: {x: -14.320641, y: 32.652897, z: -41.25907}
    speed: 2
-    m_Value: {x: 194.21915, y: 105.892365, z: -5.964622}
+    m_Value: {x: -14.320641, y: 32.652897, z: -41.25907}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@@ -832,17 +922,17 @@ MonoBehaviour:
      m_Size: {x: 0, y: 0}
    yGrid:
      m_Fade:
-        m_Target: 0
+        m_Target: 1
        speed: 2
-        m_Value: 0
+        m_Value: 1
      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
      m_Pivot: {x: 0, y: 0, z: 0}
      m_Size: {x: 1, y: 1}
    zGrid:
      m_Fade:
-        m_Target: 1
+        m_Target: 0
        speed: 2
-        m_Value: 1
+        m_Value: 0
      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
      m_Pivot: {x: 0, y: 0, z: 0}
      m_Size: {x: 1, y: 1}
@@ -850,17 +940,17 @@ MonoBehaviour:
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: 0.3272152, y: 0.19069573, z: -0.06682244, w: 0.9230909}
    speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: 0.32721576, y: 0.19069606, z: -0.06682256, w: 0.9230925}
  m_Size:
-    m_Target: 343.03143
+    m_Target: 3.997277
    speed: 2
-    m_Value: 343.03143
+    m_Value: 3.997277
  m_Ortho:
-    m_Target: 1
+    m_Target: 0
    speed: 2
-    m_Value: 1
+    m_Value: 0
  m_CameraSettings:
    m_Speed: 1
    m_SpeedNormalized: 0.5
@@ -874,107 +964,14 @@ MonoBehaviour:
    m_FarClip: 10000
    m_DynamicClip: 1
    m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: 0.29629257, y: -0.6436854, z: 0.29967546, w: 0.63880587}
  m_LastSceneViewOrtho: 0
  m_ReplacementShader: {fileID: 0}
  m_ReplacementString: 
  m_SceneVisActive: 1
  m_LastLockedObject: {fileID: 0}
  m_ViewIsLockedToObject: 0
--- !u!114 &17
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1068
-    y: 73
-    width: 396
-    height: 563
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 396, y: 542}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -198
-    m_HBaseRangeMax: 198
-    m_VBaseRangeMin: -271
-    m_VBaseRangeMax: 271
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 396
-      height: 542
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 198, y: 271}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -198
-      y: -271
-      width: 396
-      height: 542
-    m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 396, y: 563}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
--- !u!114 &18
+--- !u!114 &19
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@@ -995,9 +992,9 @@ MonoBehaviour:
  m_Pos:
    serializedVersion: 2
    x: 0
-    y: 657
-    width: 1465
-    height: 382
+    y: 511
+    width: 1528
+    height: 480
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default