Commit 921bc0b3 authored by fengchao's avatar fengchao
Browse files

Merge branch 'feat-unity-ios' into 'develop'

fix(code):更新ios代码

See merge request unity-cross/UnityDemo!8
parents 7c7d31b4 fd446668
...@@ -1979,7 +1979,7 @@ MonoBehaviour: ...@@ -1979,7 +1979,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1076467003} m_GameObject: {fileID: 1076467003}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 789ca815eac2f468b94840a621f0b2e3, type: 3} m_Script: {fileID: 11500000, guid: db8ae1edca0a54e5f94548a5091c8cdb, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!4 &1076467005 --- !u!4 &1076467005
......
...@@ -29,7 +29,7 @@ public static class NativeLogger ...@@ -29,7 +29,7 @@ public static class NativeLogger
#elif UNITY_IOS #elif UNITY_IOS
// 在 iOS 设备上,调用自定义的 NSLog 封装 // 在 iOS 设备上,调用自定义的 NSLog 封装
// (需要在 Xcode 项目中添加一个 .mm 文件来实现 _logToConsole) // (需要在 Xcode 项目中添加一个 .mm 文件来实现 _logToConsole)
_logToConsole($"[I] [{tag}] {message}"); //_logToConsole($"[I] [{tag}] {message}");
#endif #endif
} }
......
...@@ -24,7 +24,7 @@ MonoBehaviour: ...@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 454 controlID: 1329
draggingID: 0 draggingID: 0
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -46,10 +46,10 @@ MonoBehaviour: ...@@ -46,10 +46,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 312 x: 296
y: 93 y: 93
width: 956 width: 903
height: 415 height: 356.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -532,7 +532,7 @@ MonoBehaviour: ...@@ -532,7 +532,7 @@ MonoBehaviour:
floating: 0 floating: 0
collapsed: 0 collapsed: 0
displayed: 1 displayed: 1
snapOffset: {x: 48, y: 10} snapOffset: {x: 48, y: 48}
snapOffsetDelta: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0}
snapCorner: 0 snapCorner: 0
id: UnityEditor.SceneViewCameraOverlay id: UnityEditor.SceneViewCameraOverlay
...@@ -577,9 +577,9 @@ MonoBehaviour: ...@@ -577,9 +577,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 895.5244, y: 503.87256, z: -13.946046} m_Target: {x: -198.00322, y: 218.21521, z: 0}
speed: 2 speed: 2
m_Value: {x: 895.5244, y: 503.87256, z: -13.946046} m_Value: {x: -198.00322, y: 218.21521, z: 0}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -629,9 +629,9 @@ MonoBehaviour: ...@@ -629,9 +629,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 1404.6097 m_Target: 400
speed: 2 speed: 2
m_Value: 1404.6097 m_Value: 400
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -675,12 +675,12 @@ MonoBehaviour: ...@@ -675,12 +675,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1270 width: 1201
height: 925 height: 925
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
controlID: 455 controlID: 1330
draggingID: 0 draggingID: 0
--- !u!114 &4 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
...@@ -701,12 +701,12 @@ MonoBehaviour: ...@@ -701,12 +701,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1270 width: 1201
height: 436 height: 377.5
m_MinSize: {x: 200, y: 50} m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 456 controlID: 1331
draggingID: 0 draggingID: 0
--- !u!114 &5 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
...@@ -725,8 +725,8 @@ MonoBehaviour: ...@@ -725,8 +725,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 312 width: 296
height: 436 height: 377.5
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 6} m_ActualView: {fileID: 6}
...@@ -756,8 +756,8 @@ MonoBehaviour: ...@@ -756,8 +756,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 93 y: 93
width: 311 width: 295
height: 415 height: 356.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -771,23 +771,23 @@ MonoBehaviour: ...@@ -771,23 +771,23 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 12680000 m_SelectedIDs: 8e7e0000
m_LastClickedID: 26642 m_LastClickedID: 32398
m_ExpandedIDs: 26fbffff4c670000 m_ExpandedIDs: 26e4ffff10eaffff5aeaffff1cecffff70edffff14f2ffff5ef2ffff40f4ffffbef8ffff26fbffffa6740000f47c0000267d00005e7d0000ee7d0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: Canvas
m_OriginalName: m_OriginalName: Canvas
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 32398
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 5}
m_SearchString: m_SearchString:
...@@ -812,10 +812,10 @@ MonoBehaviour: ...@@ -812,10 +812,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 312 x: 296
y: 0 y: 0
width: 958 width: 905
height: 436 height: 377.5
m_MinSize: {x: 202, y: 221} m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021} m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 2} m_ActualView: {fileID: 2}
...@@ -844,10 +844,10 @@ MonoBehaviour: ...@@ -844,10 +844,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 312 x: 333
y: 93 y: 83
width: 956 width: 1013.5
height: 415 height: 516
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -900,24 +900,24 @@ MonoBehaviour: ...@@ -900,24 +900,24 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 1 m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ProjectBrowser m_Name: ConsoleWindow
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 436 y: 377.5
width: 1270 width: 1201
height: 489 height: 547.5
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 101, y: 121}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 10} m_ActualView: {fileID: 11}
m_Panes: m_Panes:
- {fileID: 10} - {fileID: 10}
- {fileID: 11} - {fileID: 11}
- {fileID: 12} - {fileID: 12}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -939,9 +939,9 @@ MonoBehaviour: ...@@ -939,9 +939,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 529 y: 470.5
width: 1269 width: 1200
height: 468 height: 526.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -963,7 +963,7 @@ MonoBehaviour: ...@@ -963,7 +963,7 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Plugins/Ios - Assets/Scenes
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ImportLogFlags: 0 m_ImportLogFlags: 0
...@@ -971,16 +971,16 @@ MonoBehaviour: ...@@ -971,16 +971,16 @@ MonoBehaviour:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Plugins/Ios - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 94660000 m_SelectedIDs: c4660000
m_LastClickedID: 26260 m_LastClickedID: 26308
m_ExpandedIDs: 000000008266000084660000866600008866000000ca9a3b m_ExpandedIDs: 00000000ac660000ae660000b0660000b2660000b466000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1008,7 +1008,7 @@ MonoBehaviour: ...@@ -1008,7 +1008,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000008266000084660000866600008866000000ca9a3b m_ExpandedIDs: 00000000ac660000ae660000b0660000b2660000b466000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1033,9 +1033,9 @@ MonoBehaviour: ...@@ -1033,9 +1033,9 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: 12680000 m_SelectedInstanceIDs: d6660000
m_LastClickedInstanceID: 26642 m_LastClickedInstanceID: 26326
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000b25c0000245a000000000000 m_ExpandedInstanceIDs: c6230000b25c0000245a000000000000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
...@@ -1085,9 +1085,9 @@ MonoBehaviour: ...@@ -1085,9 +1085,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 529 y: 470.5
width: 1269 width: 1200
height: 468 height: 526.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1118,7 +1118,7 @@ MonoBehaviour: ...@@ -1118,7 +1118,7 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 1
y: 620 y: 620
width: 1347.5 width: 1347.5
height: 367 height: 367
...@@ -1148,9 +1148,9 @@ MonoBehaviour: ...@@ -1148,9 +1148,9 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1270 x: 1201
y: 0 y: 0
width: 440 width: 509
height: 925 height: 925
m_MinSize: {x: 276, y: 71} m_MinSize: {x: 276, y: 71}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4001, y: 4021}
...@@ -1179,9 +1179,9 @@ MonoBehaviour: ...@@ -1179,9 +1179,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1270 x: 1201
y: 93 y: 93
width: 439 width: 508
height: 904 height: 904
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
......
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &1 --- !u!114 &1
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: 12004, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_PixelRect:
serializedVersion: 2
x: 621
y: 230
width: 641
height: 602
m_ShowMode: 0
m_Title: Build Settings
m_RootView: {fileID: 4}
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
m_Maximized: 0
--- !u!114 &2
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -39,67 +15,16 @@ MonoBehaviour: ...@@ -39,67 +15,16 @@ MonoBehaviour:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: -1 x: -1
y: 53 y: 63
width: 1920 width: 1710
height: 975 height: 975
m_ShowMode: 4 m_ShowMode: 4
m_Title: Project m_Title: "\u9879\u76EE"
m_RootView: {fileID: 5} m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_Maximized: 1 m_Maximized: 1
--- !u!114 &3 --- !u!114 &2
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: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: BuildPlayerWindow
m_EditorClassIdentifier:
m_Children: []
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 641
height: 602
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &4
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: 12010, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_Children:
- {fileID: 3}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 641
height: 602
m_MinSize: {x: 640, y: 601}
m_MaxSize: {x: 4000, y: 4021}
vertical: 0
controlID: 4705
draggingID: 0
--- !u!114 &5
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -112,14 +37,14 @@ MonoBehaviour: ...@@ -112,14 +37,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 6} - {fileID: 3}
- {fileID: 8} - {fileID: 5}
- {fileID: 7} - {fileID: 4}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1710
height: 975 height: 975
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
...@@ -127,7 +52,7 @@ MonoBehaviour: ...@@ -127,7 +52,7 @@ MonoBehaviour:
m_TopViewHeight: 30 m_TopViewHeight: 30
m_UseBottomView: 1 m_UseBottomView: 1
m_BottomViewHeight: 20 m_BottomViewHeight: 20
--- !u!114 &6 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -144,12 +69,12 @@ MonoBehaviour: ...@@ -144,12 +69,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1710
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName: m_LastLoadedLayoutName:
--- !u!114 &7 --- !u!114 &4
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -166,11 +91,11 @@ MonoBehaviour: ...@@ -166,11 +91,11 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 955 y: 955
width: 1920 width: 1710
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
--- !u!114 &8 --- !u!114 &5
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -183,20 +108,20 @@ MonoBehaviour: ...@@ -183,20 +108,20 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 9} - {fileID: 6}
- {fileID: 14} - {fileID: 11}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1920 width: 1710
height: 925 height: 925
m_MinSize: {x: 300, y: 100} m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
controlID: 47 controlID: 37
draggingID: 0 draggingID: 0
--- !u!114 &9 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -209,20 +134,20 @@ MonoBehaviour: ...@@ -209,20 +134,20 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 7}
- {fileID: 10} - {fileID: 10}
- {fileID: 13}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1348.5 width: 1201
height: 925 height: 925
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
controlID: 48 controlID: 38
draggingID: 0 draggingID: 0
--- !u!114 &10 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -235,20 +160,20 @@ MonoBehaviour: ...@@ -235,20 +160,20 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: m_Children:
- {fileID: 11} - {fileID: 8}
- {fileID: 12} - {fileID: 9}
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1348.5 width: 1201
height: 514 height: 457.5
m_MinSize: {x: 200, y: 50} m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
controlID: 39 controlID: 39
draggingID: 0 draggingID: 0
--- !u!114 &11 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -265,16 +190,16 @@ MonoBehaviour: ...@@ -265,16 +190,16 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 333 width: 296
height: 514 height: 457.5
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 17} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 17} - {fileID: 13}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &12 --- !u!114 &9
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -289,19 +214,19 @@ MonoBehaviour: ...@@ -289,19 +214,19 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 333 x: 296
y: 0 y: 0
width: 1015.5 width: 905
height: 514 height: 457.5
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 18} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 18} - {fileID: 14}
- {fileID: 16} - {fileID: 12}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &13 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -317,19 +242,19 @@ MonoBehaviour: ...@@ -317,19 +242,19 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 514 y: 457.5
width: 1348.5 width: 1201
height: 411 height: 467.5
m_MinSize: {x: 231, y: 271} m_MinSize: {x: 231, y: 271}
m_MaxSize: {x: 10001, y: 10021} m_MaxSize: {x: 10001, y: 10021}
m_ActualView: {fileID: 19} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 19} - {fileID: 15}
- {fileID: 20} - {fileID: 16}
- {fileID: 21} - {fileID: 17}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &14 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -344,74 +269,18 @@ MonoBehaviour: ...@@ -344,74 +269,18 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1348.5 x: 1201
y: 0 y: 0
width: 571.5 width: 509
height: 925 height: 925
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 22} m_ActualView: {fileID: 18}
m_Panes: m_Panes:
- {fileID: 22} - {fileID: 18}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &15 --- !u!114 &12
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: 12043, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 640, y: 580}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Build Settings
m_Image: {fileID: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 621
y: 230
width: 641
height: 581
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
m_SupportedDataModes:
isAutomatic: 1
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
m_SaveData: []
m_OverlaysVisible: 1
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs:
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_SearchString:
--- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -426,7 +295,7 @@ MonoBehaviour: ...@@ -426,7 +295,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Simulator m_Text: "\u6A21\u62DF\u5668"
m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 3038311277492192215, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
...@@ -477,7 +346,7 @@ MonoBehaviour: ...@@ -477,7 +346,7 @@ MonoBehaviour:
screenIndex: 0 screenIndex: 0
networkReachability: 1 networkReachability: 1
systemLanguage: 10 systemLanguage: 10
--- !u!114 &17 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -492,15 +361,15 @@ MonoBehaviour: ...@@ -492,15 +361,15 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Hierarchy m_Text: "\u5C42\u7EA7"
m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: -1 x: -1
y: 83 y: 93
width: 332 width: 295
height: 493 height: 436.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -514,25 +383,25 @@ MonoBehaviour: ...@@ -514,25 +383,25 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs: 186a0000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: c45dffff105effffce5fffff4c66ffff9866ffff7868ffff5875ffffa475ffff6e77ffffb87cffff047dfffff07effff8889ffffd489ffffbe8bffffee91ffff3a92ffff2694ffff8ef4ffffdaf4ffff88f6ffff2afbffffea620000ae840000b88e0000e28e0000fe8e0000108f0000508f0000988f0000b0930000da930000089400009094000092a1000058a20000 m_ExpandedIDs: 4ef2ffffacf2ffff0af3ffff74f3fffff2f3ffff26fbffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: PlatformCallback
m_OriginalName: m_OriginalName: PlatformCallback
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 25970
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 11} m_ClientGUIView: {fileID: 8}
m_SearchString: m_SearchString:
m_ExpandedScenes: [] m_ExpandedScenes: []
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
...@@ -540,7 +409,7 @@ MonoBehaviour: ...@@ -540,7 +409,7 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: 4c969a2b90040154d917609493e03593 m_WindowGUID: 4c969a2b90040154d917609493e03593
--- !u!114 &18 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -555,15 +424,15 @@ MonoBehaviour: ...@@ -555,15 +424,15 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Scene m_Text: "\u573A\u666F"
m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 332 x: 295
y: 83 y: 93
width: 1013.5 width: 903
height: 493 height: 436.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1091,9 +960,9 @@ MonoBehaviour: ...@@ -1091,9 +960,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 101.899216, y: 302.4853, z: -5.3658557} m_Target: {x: 978.68414, y: 490.59204, z: -10.483236}
speed: 2 speed: 2
m_Value: {x: 101.899216, y: 302.4853, z: -5.3658557} m_Value: {x: 978.68414, y: 490.59204, z: -10.483236}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -1143,9 +1012,9 @@ MonoBehaviour: ...@@ -1143,9 +1012,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 663.0747 m_Target: 10
speed: 2 speed: 2
m_Value: 663.0747 m_Value: 10
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -1170,7 +1039,7 @@ MonoBehaviour: ...@@ -1170,7 +1039,7 @@ MonoBehaviour:
m_SceneVisActive: 1 m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0} m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0 m_ViewIsLockedToObject: 0
--- !u!114 &19 --- !u!114 &15
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1185,15 +1054,15 @@ MonoBehaviour: ...@@ -1185,15 +1054,15 @@ MonoBehaviour:
m_MinSize: {x: 230, y: 250} m_MinSize: {x: 230, y: 250}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
m_TitleContent: m_TitleContent:
m_Text: Project m_Text: "\u9879\u76EE"
m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: -1 x: -1
y: 597 y: 550.5
width: 1347.5 width: 1200
height: 390 height: 446.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1215,7 +1084,7 @@ MonoBehaviour: ...@@ -1215,7 +1084,7 @@ MonoBehaviour:
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Plugins/Android/libs - Assets/Scenes
m_Globs: [] m_Globs: []
m_OriginalText: m_OriginalText:
m_ImportLogFlags: 0 m_ImportLogFlags: 0
...@@ -1223,16 +1092,16 @@ MonoBehaviour: ...@@ -1223,16 +1092,16 @@ MonoBehaviour:
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Plugins/Android/libs - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: /Users/gr/Documents/UnityProject/Unity20251010Test m_LastProjectPath: /Users/fengchao/Desktop/UnityDemo
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 329c0000 m_SelectedIDs: be660000
m_LastClickedID: 39986 m_LastClickedID: 26302
m_ExpandedIDs: 000000002a5d00002c5d0000325d00009e8500002e9c0000 m_ExpandedIDs: 00000000a6660000a8660000aa660000ac660000ae66000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1248,7 +1117,7 @@ MonoBehaviour: ...@@ -1248,7 +1117,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 13} m_ClientGUIView: {fileID: 10}
m_SearchString: m_SearchString:
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
...@@ -1260,7 +1129,7 @@ MonoBehaviour: ...@@ -1260,7 +1129,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000002a5d00002c5d0000 m_ExpandedIDs: 00000000a6660000a8660000aa660000ac660000ae660000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -1304,7 +1173,7 @@ MonoBehaviour: ...@@ -1304,7 +1173,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 10}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -1316,7 +1185,7 @@ MonoBehaviour: ...@@ -1316,7 +1185,7 @@ MonoBehaviour:
m_GridSize: 64 m_GridSize: 64
m_SkipHiddenPackages: 0 m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 207 m_DirectoriesAreaWidth: 207
--- !u!114 &20 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1331,15 +1200,15 @@ MonoBehaviour: ...@@ -1331,15 +1200,15 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Console m_Text: "\u63A7\u5236\u53F0"
m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1 x: -1
y: 620 y: 607.5
width: 1347.5 width: 1200
height: 367 height: 389.5
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
m_PreferredDataMode: 0 m_PreferredDataMode: 0
...@@ -1350,7 +1219,7 @@ MonoBehaviour: ...@@ -1350,7 +1219,7 @@ MonoBehaviour:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
m_SaveData: [] m_SaveData: []
m_OverlaysVisible: 1 m_OverlaysVisible: 1
--- !u!114 &21 --- !u!114 &17
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1385,7 +1254,7 @@ MonoBehaviour: ...@@ -1385,7 +1254,7 @@ MonoBehaviour:
m_SaveData: [] m_SaveData: []
m_OverlaysVisible: 1 m_OverlaysVisible: 1
mForceToReOpen: 0 mForceToReOpen: 0
--- !u!114 &22 --- !u!114 &18
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -1400,14 +1269,14 @@ MonoBehaviour: ...@@ -1400,14 +1269,14 @@ MonoBehaviour:
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
m_TitleContent: m_TitleContent:
m_Text: Inspector m_Text: "\u68C0\u67E5\u5668"
m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1347.5 x: 1200
y: 83 y: 93
width: 570.5 width: 508
height: 904 height: 904
m_SerializedDataModeController: m_SerializedDataModeController:
m_DataMode: 0 m_DataMode: 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment