diff --git a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs index 1cad2f84d..056095132 100644 --- a/Assets/MyGame/Scripts/Manager/CreateFishManager.cs +++ b/Assets/MyGame/Scripts/Manager/CreateFishManager.cs @@ -418,7 +418,7 @@ public class CreateFishManager : MonoSingleton //list[Random.Range(0, c.Count)].isCreate = 2; foreach (var item in list) { - if (item.fishNumber == 13029.ToString()) + if (item.fishNumber == 13033.ToString()) { item.isCreate = 2; } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 55d27e3a5..f0d0a2a3f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -30,17 +30,17 @@ EditorUserSettings: value: 06020c5e0307500a0f5b0e7449705a4440151d7f2f2d25322e794836e7b16360 flags: 0 RecentlyUsedSceneGuid-6: - value: 075552555c035e0e085f597542735c44104e4f7b7f7177692e781f65b5e4646c - flags: 0 - RecentlyUsedSceneGuid-7: value: 530357525001515f5f0b097749270f4440161e2b7d712235287b4d37b6b1616b flags: 0 - RecentlyUsedSceneGuid-8: + RecentlyUsedSceneGuid-7: value: 52005152040d0a0c5c585e70147b5c44454e192e287977337d714d32e7b7676b flags: 0 - RecentlyUsedSceneGuid-9: + RecentlyUsedSceneGuid-8: value: 0607520756050c5a090f582144275e44151549297d7a7f66782d4836b2b4323b flags: 0 + RecentlyUsedSceneGuid-9: + value: 075552555c035e0e085f597542735c44104e4f7b7f7177692e781f65b5e4646c + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 144fc5efd..921feb6ed 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 2544 height: 1381 m_ShowMode: 4 - m_Title: Scene + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 49 + controlID: 248 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 50 + controlID: 62 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -168,11 +168,11 @@ MonoBehaviour: x: 0 y: 0 width: 2063 - height: 568 + height: 598 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 51 + controlID: 63 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,7 +192,7 @@ MonoBehaviour: x: 0 y: 0 width: 332 - height: 568 + height: 598 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 16} @@ -217,8 +217,8 @@ MonoBehaviour: serializedVersion: 2 x: 332 y: 0 - width: 973 - height: 568 + width: 368 + height: 598 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} @@ -242,10 +242,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1305 + x: 700 y: 0 - width: 758 - height: 568 + width: 1363 + height: 598 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 27} @@ -272,13 +272,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 568 + y: 598 width: 2063 - height: 763 + height: 733 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 202 + controlID: 106 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -298,7 +298,7 @@ MonoBehaviour: x: 0 y: 0 width: 642 - height: 763 + height: 733 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} @@ -308,7 +308,7 @@ MonoBehaviour: - {fileID: 21} - {fileID: 22} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 2 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -327,7 +327,7 @@ MonoBehaviour: x: 642 y: 0 width: 461 - height: 763 + height: 733 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 23} @@ -353,7 +353,7 @@ MonoBehaviour: x: 1103 y: 0 width: 960 - height: 763 + height: 733 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 24} @@ -412,7 +412,7 @@ MonoBehaviour: x: 8 y: 81 width: 331 - height: 547 + height: 577 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -426,23 +426,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5091ffff - m_LastClickedID: -28336 - m_ExpandedIDs: 5491ffff9a99ffffce9dfffff05e0100 + m_SelectedIDs: 248b0000 + m_LastClickedID: 0 + m_ExpandedIDs: 2a6cfffff68bffff068cffff168cffff2e8cffff0cfbffff5ac100007cf90300bef90300 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Coin + m_OriginalName: Coin m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -29696 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -473,10 +473,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 465 - y: 73 - width: 942 - height: 590 + x: 340 + y: 81 + width: 971 + height: 547 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -494,7 +494,7 @@ MonoBehaviour: - {fileID: 1107599295331701163, guid: ecbe945a0a4c53c41bb947387a2bafa6, type: 2} - {fileID: 1107709254077376921, guid: 918d4fef7030da04fb05730e9d1bb2b0, type: 2} - {fileID: 1107709254077376921, guid: e0e82f1a4270fcc42a5e02c099176fa3, type: 2} - - {fileID: -6228214779110207407, guid: 74a28b7d187dc2e438b18cc5bd5b92f0, type: 2} + - {fileID: 1107709254077376921, guid: fe9437d12f43b434b9c165b98ae3551d, type: 2} m_ValueSerializationHelper: - e00: 0.45927763 e01: 0 @@ -576,14 +576,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 1 + - e00: 0.9129922 e01: 0 e02: 0 - e03: 0 + e03: 127.487274 e10: 0 - e11: 1 + e11: 0.9129922 e12: 0 - e13: 0 + e13: 85.03546 e20: 0 e21: 0 e22: 1 @@ -593,10 +593,10 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 74a28b7d187dc2e438b18cc5bd5b92f0, + m_AnimatorController: {fileID: 9100000, guid: fe9437d12f43b434b9c165b98ae3551d, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -6228214779110207407, guid: 74a28b7d187dc2e438b18cc5bd5b92f0, + - m_Target: {fileID: 1107709254077376921, guid: fe9437d12f43b434b9c165b98ae3551d, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -633,8 +633,8 @@ MonoBehaviour: serializedVersion: 2 x: 340 y: 81 - width: 971 - height: 547 + width: 366 + height: 577 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -980,9 +980,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -8.312012, y: -0.19329214, z: -11.846038} + m_Target: {x: 5.488319, y: 4.714727, z: 55.443623} speed: 2 - m_Value: {x: -8.312012, y: -0.19329214, z: -11.846038} + m_Value: {x: 5.488319, y: 4.714727, z: 55.443623} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1028,13 +1028,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.037235267, y: 0.9200351, z: -0.090276375, w: -0.3794753} + m_Target: {x: 0.1285996, y: 0.2211512, z: -0.029432513, w: 0.9662797} speed: 2 - m_Value: {x: -0.03780439, y: 0.9198976, z: -0.091656215, w: -0.37941858} + m_Value: {x: 0.12859906, y: 0.22115028, z: -0.02943239, w: 0.96627563} m_Size: - m_Target: 10 + m_Target: 66.0695 speed: 2 - m_Value: 0.8660254 + m_Value: 66.0695 m_Ortho: m_Target: 0 speed: 2 @@ -1081,9 +1081,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 649 + y: 679 width: 641 - height: 742 + height: 712 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1152,7 +1152,7 @@ MonoBehaviour: serializedVersion: 2 x: 8 y: 649 - width: 338 + width: 641 height: 742 m_SerializedDataModeController: m_DataMode: 0 @@ -1191,7 +1191,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 523} m_SelectedIDs: 30b90200 m_LastClickedID: 178480 - m_ExpandedIDs: 00000000385a01003a5a01003c5a01003e5a0100405a0100425a0100445a0100465a0100485a01004a5a01004c5a01004e5a0100505a0100525a0100545a0100565a0100585a01005a5a01005c5a01005e5a0100605a0100625a0100645a0100665a0100 + m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1217,9 +1217,9 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 76350100 - m_LastClickedID: 79222 - m_ExpandedIDs: ffffffff00000000385a01003a5a01003c5a01003e5a0100405a0100425a0100445a0100465a0100485a01004a5a01004c5a01004e5a0100505a0100525a0100545a0100565a0100585a01005a5a01005c5a01005e5a0100605a0100625a0100645a0100665a0100 + m_SelectedIDs: f08bffff + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1244,8 +1244,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 76350100 - m_LastClickedInstanceID: 79222 + m_SelectedInstanceIDs: f08bffff + m_LastClickedInstanceID: -29712 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000467d0000c67e00009874000024c5fdff647400009274000016a500003aa500002ed3020028d3020078e003007e76000088760000247a0000e67e0000487b0000 m_RenameOverlay: @@ -1480,9 +1480,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 650 - y: 649 + y: 679 width: 459 - height: 742 + height: 712 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1518,10 +1518,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 301} - m_SelectedIDs: b85d0100 - m_LastClickedID: 89528 - m_ExpandedIDs: 00000000385a01003a5a01003c5a01003e5a0100405a0100425a0100445a0100465a0100485a01004a5a01004c5a01004e5a0100505a0100525a0100545a0100565a0100585a01005a5a01005c5a01005e5a0100605a0100625a0100645a0100665a0100 + scrollPos: {x: 0, y: 302} + m_SelectedIDs: 965e0100 + m_LastClickedID: 89750 + m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1549,7 +1549,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000385a01003a5a01003c5a01003e5a0100405a0100425a0100445a0100465a0100485a01004a5a01004c5a01004e5a0100505a0100525a0100545a0100565a0100585a01005a5a01005c5a01005e5a0100605a0100625a0100645a0100665a0100 + m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1627,9 +1627,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1111 - y: 649 + y: 679 width: 958 - height: 742 + height: 712 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1651,7 +1651,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/MyGame m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1659,16 +1659,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets + - Assets/MyGame m_LastFoldersGridSize: 96 m_LastProjectPath: D:\Unity\UnityProjects\Buyu_Script m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 385a0100 - m_LastClickedID: 88632 - m_ExpandedIDs: 00000000385a01003a5a01003c5a01003e5a0100405a0100425a0100445a0100465a0100485a01004a5a01004c5a01004e5a0100505a0100525a0100545a0100565a0100585a01005a5a01005c5a01005e5a0100605a0100625a0100645a0100665a0100 + scrollPos: {x: 0, y: 258} + m_SelectedIDs: 505b0100 + m_LastClickedID: 88912 + m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100c25e0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1696,7 +1696,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000385a01003a5a01003c5a01003e5a0100405a0100425a0100445a0100465a0100485a01004a5a01004c5a01004e5a0100505a0100525a0100545a0100565a0100585a01005a5a01005c5a01005e5a0100605a0100625a0100645a0100665a0100 + m_ExpandedIDs: 000000004c5b01004e5b0100505b0100525b0100545b0100565b0100585b01005a5b01005c5b01005e5b0100605b0100625b0100645b0100665b0100685b01006a5b01006c5b01006e5b0100705b0100725b0100745b0100765b0100785b01007a5b0100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1723,7 +1723,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c0b000000eab00006ce3f5ff98250100ce220100663101008a21010016d0000072d000003eca000046ca00007c74020082740200e026020028950200 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1748,7 +1748,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 76} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 195 @@ -1856,10 +1856,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1313 + x: 708 y: 81 - width: 756 - height: 547 + width: 1361 + height: 577 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1896,7 +1896,7 @@ MonoBehaviour: pluginStates: - '{}' - '{}' - scale: 30 + scale: 46 fitToScreenEnabled: 1 rotationDegree: 270 highlightSafeAreaEnabled: 0