diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/524f8e06-7b95-4714-930e-06c9c6cb2d11.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/524f8e06-7b95-4714-930e-06c9c6cb2d11.vsidx deleted file mode 100644 index 1363a45..0000000 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/524f8e06-7b95-4714-930e-06c9c6cb2d11.vsidx and /dev/null differ diff --git a/.vs/CultivationOfBrewing-2/FileContentIndex/e6a2fd9b-e925-4972-ac02-fcd1cab862c3.vsidx b/.vs/CultivationOfBrewing-2/FileContentIndex/e6a2fd9b-e925-4972-ac02-fcd1cab862c3.vsidx deleted file mode 100644 index a1482cc..0000000 Binary files a/.vs/CultivationOfBrewing-2/FileContentIndex/e6a2fd9b-e925-4972-ac02-fcd1cab862c3.vsidx and /dev/null differ diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index dd4a353..d6a007d 100644 Binary files a/.vs/CultivationOfBrewing-2/v17/.suo and b/.vs/CultivationOfBrewing-2/v17/.suo differ diff --git a/Assets/Resources/UI/UI_Panel/UI_MainTitlePanel.prefab b/Assets/Resources/UI/UI_Panel/UI_MainTitlePanel.prefab index 854acf8..713bd58 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MainTitlePanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MainTitlePanel.prefab @@ -34,11 +34,11 @@ RectTransform: m_Father: {fileID: 311466497083345041} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -25, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 60, y: 0} m_SizeDelta: {x: 54, y: 25} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &912765200 CanvasRenderer: m_ObjectHideFlags: 0 @@ -94,8 +94,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 4.47 @@ -183,11 +183,11 @@ RectTransform: m_Father: {fileID: 3513157747320874929} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 1155, y: -23.6} - m_SizeDelta: {x: 104.4, y: 100} - m_Pivot: {x: 0, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -422, y: 0} + m_SizeDelta: {x: 104.400024, y: 100} + m_Pivot: {x: 1, y: 0.99999976} --- !u!114 &6953649185375396951 MonoBehaviour: m_ObjectHideFlags: 0 @@ -203,10 +203,10 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 23 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 50 + m_Spacing: 20 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -325,10 +325,10 @@ RectTransform: m_Father: {fileID: 4681341788091741045} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 1920, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3513157747320874931 CanvasRenderer: @@ -616,11 +616,11 @@ RectTransform: m_Father: {fileID: 1498009257616304544} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -30, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 60, y: 0} m_SizeDelta: {x: 54, y: 40} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &5236717780144355163 CanvasRenderer: m_ObjectHideFlags: 0 @@ -676,8 +676,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 18 + m_fontSizeBase: 18 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 4.47 diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index 0d6ff8c..0d74cf4 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -1484,7 +1484,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 60, y: 60} + m_SizeDelta: {x: 96, y: 112} m_Pivot: {x: 0, y: 0} --- !u!222 &3653194641441587864 CanvasRenderer: @@ -1514,7 +1514,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8ef4e22707143a04e832828dfdc4bde4, type: 3} + m_Sprite: {fileID: 21300000, guid: 398ff7e71306dc64c8e9f11e91595cd5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1553,10 +1553,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: a1f6f638b95a3a24ca0a6ab7f7dfa168, type: 3} - m_PressedSprite: {fileID: 21300000, guid: a1f6f638b95a3a24ca0a6ab7f7dfa168, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: 2b1ba6ba8188d2841a54afb3c7d38c8b, type: 3} + m_PressedSprite: {fileID: 21300000, guid: 2b1ba6ba8188d2841a54afb3c7d38c8b, type: 3} m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 21300000, guid: 916e6bb16397f3a45a993e3c38541a80, type: 3} + m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index c9e3f32..7656df6 100644 --- 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: 6999 + controlID: 22604 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -48,9 +48,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2560 - y: 413 + y: 871 width: 924 - height: 586 + height: 128 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -99,22 +99,22 @@ MonoBehaviour: x: 0 y: 21 width: 924 - height: 565 - m_Scale: {x: 0.48125, y: 0.48125} - m_Translation: {x: 462, y: 282.5} + height: 107 + m_Scale: {x: 0.09907407, y: 0.09907407} + m_Translation: {x: 462, y: 53.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -960 - y: -587.013 - width: 1920 - height: 1174.026 + x: -4663.1777 + y: -540 + width: 9326.355 + height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.48125 - m_LastWindowPixelSize: {x: 924, y: 586} + m_defaultScale: 0.09907407 + m_LastWindowPixelSize: {x: 924, y: 128} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 7000 + controlID: 22605 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,9 +163,9 @@ MonoBehaviour: x: 0 y: 0 width: 925 - height: 340 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + height: 798 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -194,7 +194,7 @@ MonoBehaviour: x: 2560 y: 73 width: 924 - height: 319 + height: 777 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -270,7 +270,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 0} + snapOffset: {x: 67.5, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -425,14 +425,14 @@ MonoBehaviour: m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 10.164643, y: 5.575864, z: -138.93802} + m_Target: {x: 1399.9038, y: 785.4314, z: 7.022814} speed: 2 - m_Value: {x: 10.164643, y: 5.575864, z: -138.93802} + m_Value: {x: 1399.9038, y: 785.4314, z: 7.022814} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -444,7 +444,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 1 + showSkybox: 0 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -461,17 +461,17 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: 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} zGrid: 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} @@ -479,17 +479,17 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.12607521, y: 0.1290758, z: -0.016550634, w: 0.98346096} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: 0.12607364, y: 0.1290742, z: -0.01655043, w: 0.98344874} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.55886596 + m_Target: 399.17206 speed: 2 - m_Value: 0.55886596 + m_Value: 399.17206 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -503,7 +503,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.10953424, y: -0.7745397, z: 0.13974193, w: 0.60709965} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -526,11 +526,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 340 + y: 798 width: 925 - height: 607 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + height: 149 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -555,8 +555,8 @@ MonoBehaviour: y: 0 width: 268 height: 947 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 8} m_Panes: - {fileID: 8} @@ -594,20 +594,20 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 10820000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: a209feff5213feff9e1bfefff81cfefffa1cfeff7827feffbc5bfeff1a5cfeff165dfeff185dfeff9e68feff2081feff2281feffb284feff4e8efeff508efeffb6c3feffc0c3feff50ecfeff4aeefeff22effeffc6f3feff262effff3c2effff6c2effff762effff802effff882effff8e2effff2a30ffffb630ffffc430ffffbc38ffffc658ffff1ce9ffff7ae9fffface9ffffb0eeffffd2f5ffff30fbfffff4ffffff + m_ExpandedIDs: 5041feffce42feffca48ffff1049ffff1a49ffff2449ffff2c49ffff3249ffffb049ffff064bffff924bffff964bffffa04bffff30fbfffff4ffffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: "\u519C\u6751\u5C4B\u5B50" - m_OriginalName: "\u519C\u6751\u5C4B\u5B50" + m_Name: userName + m_OriginalName: userName m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -94894 + m_UserData: 120988 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -686,7 +686,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes/Common + - Assets/Resources/UI/UI_Panel m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -701,7 +701,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 3c670200 m_LastClickedID: 157500 - m_ExpandedIDs: + m_ExpandedIDs: ffffffff00000000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e7400005074000052740000547400002278000032780000b0850000c4850000e0850000f88500001286000066d30100ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -726,10 +726,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 780} - m_SelectedIDs: 10820000 - m_LastClickedID: 33296 - m_ExpandedIDs: ffffffff0000000076770000a0770000a2770000a6770000ae770000b0770000b2770000fe8100000e82000010820000168200001e82000020820000448400000885000054d20000ced50000e6d50000aed90000b0d90000b2d90000cad9000080db0000bade0000bcde00003aab0100ffffff7f + scrollPos: {x: 0, y: 1244} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: ffffffff00000000227400002474000026740000287400002a7400002c7400002e74000030740000327400003474000036740000387400003a7400003c7400003e74000040740000427400004474000046740000487400004a7400004c7400004e7400005074000052740000547400002278000032780000b0850000c4850000e0850000f88500001286000066d30100ffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -754,8 +754,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 10820000 - m_LastClickedInstanceID: 33296 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -804,8 +804,8 @@ MonoBehaviour: y: 0 width: 384 height: 947 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -843,7 +843,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 358 + m_CachedPref: 221 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1