diff --git a/Assets/000_assets/material/M_SquareFrame 1.mat b/Assets/000_assets/material/M_SquareFrame 1.mat index 912fe658..3b0759d0 100644 --- a/Assets/000_assets/material/M_SquareFrame 1.mat +++ b/Assets/000_assets/material/M_SquareFrame 1.mat @@ -213,7 +213,7 @@ Material: - _Dst: 10 - _DstBlend: 0 - _DstBlendAlpha: 0 - - _EdgeValue: 0.45743567 + - _EdgeValue: 0.57729244 - _EnvironmentReflections: 1 - _FNLfanxiangkaiguan: 0 - _Face: 1 @@ -258,7 +258,7 @@ Material: - _Mask_scale: 1 - _Metallic: 0 - _OcclusionStrength: 1 - - _Opacity: 0.54256433 + - _Opacity: 0.42270756 - _Parallax: 0.005 - _Pass: 0 - _QueueOffset: 0 diff --git a/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta b/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta new file mode 100644 index 00000000..9e552100 --- /dev/null +++ b/Assets/Le Tai's Asset/TranslucentImage/URP support.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e45363610a59a4543a9793b3bf2be4aa +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta b/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta new file mode 100644 index 00000000..550f254c --- /dev/null +++ b/Assets/Plugins/Easy Save 3/Editor/ES3Asmdefs.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: de41a70ead12af544a4e99a925b269d2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta new file mode 100644 index 00000000..1eadf09a --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f597f19f656ba56eae4f6a3a7cc528f4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta new file mode 100644 index 00000000..f073d2ab --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e08dc33330d11e9d4a1b246c52e4f6 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta new file mode 100644 index 00000000..130722af --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed09910c0094cb27be8f3ca264680da3 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta new file mode 100644 index 00000000..f9b8ed82 --- /dev/null +++ b/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc355dd4cf1e6173beaeb22c2858cbe1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 8eeeb63b..320cf2ad 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -14,18 +14,18 @@ OcclusionCullingSettings: RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 + m_Fog: 1 + m_FogColor: {r: 0.43137255, g: 0.41568628, b: 0.69411767, a: 1} + m_FogMode: 1 m_FogDensity: 0.01 m_LinearFogStart: 0 - m_LinearFogEnd: 300 + m_LinearFogEnd: 500 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 0 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SubtractiveShadowColor: {r: 0.2, g: 0.2627451, b: 0.42352942, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: bc956c2a94277984ab315b9e44015434, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -18114,7 +18114,7 @@ PrefabInstance: - target: {fileID: 5365034608843891105, guid: 3d0f2c82e1126e44382d4dc21bc57ee2, type: 3} propertyPath: m_LocalPosition.y - value: -10 + value: -100 objectReference: {fileID: 0} - target: {fileID: 5365034608843891105, guid: 3d0f2c82e1126e44382d4dc21bc57ee2, type: 3} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index c56720be..be8afc84 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,13 +21,13 @@ EditorUserSettings: value: 00575700000c5d590e0b0f23127a07444e16192f7e2e70652e2d4d64b6b16c68 flags: 0 RecentlyUsedSceneGuid-5: - value: 0006570300050d0a550b087144275c4412164f7f7d7970327c7e1961b1b4616f + value: 5754550253035b0b550b582114220d44424f487b7d717f36297d1f35b0b3306c flags: 0 RecentlyUsedSceneGuid-6: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 0006570300050d0a550b087144275c4412164f7f7d7970327c7e1961b1b4616f flags: 0 RecentlyUsedSceneGuid-7: - value: 5754550253035b0b550b582114220d44424f487b7d717f36297d1f35b0b3306c + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 4a421e3c..ca64c531 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 92 + controlID: 114 draggingID: 0 --- !u!114 &6 MonoBehaviour: @@ -145,7 +145,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 21 + controlID: 46 draggingID: 0 --- !u!114 &7 MonoBehaviour: @@ -171,7 +171,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 22 + controlID: 47 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -192,8 +192,8 @@ MonoBehaviour: y: 0 width: 266.66666 height: 549.3333 - 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: 13} m_Panes: - {fileID: 13} @@ -277,16 +277,16 @@ MonoBehaviour: y: 0 width: 509.33325 height: 819.3333 - m_MinSize: {x: 276, y: 121} + m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 24} + m_ActualView: {fileID: 22} m_Panes: - {fileID: 22} - {fileID: 23} - {fileID: 24} - {fileID: 25} - m_Selected: 2 - m_LastSelected: 1 + m_Selected: 0 + m_LastSelected: 3 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -429,21 +429,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 3e61ffff7098ffffa49affffac9affff64cfffff68cfffff6ecfffff78cfffffc0d1ffffc8d1ffffe2d1ffffe6d1ffffecd1fffff4d1ffff4adbffffaae4ffff8ae5ffffcee6ffff70e8ffff9ee9fffffeeaffff96ecffffc6edffff88f1fffffcf2ffff26f6ffff2af6ffff38faffff + m_ExpandedIDs: f00cffff120effffb818ffff7820fffffe23ffff52e3ffffacecffff3ceeffff22efffff28f0ffff1cf1ffff8af3ffff98f6ffffb6f8ffff02fbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: EventSystem - m_OriginalName: EventSystem + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 66492 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -875,9 +875,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.043971, y: 23.034315, z: 667.83765} + m_Target: {x: -97.45251, y: 46.35717, z: -13.679149} speed: 2 - m_Value: {x: 1.043971, y: 23.034315, z: 667.83765} + m_Value: {x: -97.45251, y: 46.35717, z: -13.679149} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -923,13 +923,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.0008298305, y: 0.99751383, z: 0.07113428, w: 0.0124592325} + m_Target: {x: 0.00040663834, y: 0.9952412, z: -0.09866063, w: 0.003462294} speed: 2 - m_Value: {x: -0.0008421776, y: 0.9973176, z: 0.07212273, w: 0.01245684} + m_Value: {x: 0.00040658726, y: 0.9951162, z: -0.098648235, w: 0.003461859} m_Size: - m_Target: 9.49472 + m_Target: 301.40482 speed: 2 - m_Value: 9.49472 + m_Value: 301.40482 m_Ortho: m_Target: 0 speed: 2 @@ -5660,7 +5660,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/StreamingAssets + - Assets/Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -5668,16 +5668,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/StreamingAssets + - Assets/Scenes m_LastFoldersGridSize: 96 m_LastProjectPath: D:\Projects\ichni Official m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 399} - m_SelectedIDs: ec9b0000 - m_LastClickedID: 39916 - m_ExpandedIDs: 00000000529b0000549b0000569b0000589b00005a9b00005c9b00005e9b0000609b0000629b0000669b0000689b00006a9b00006c9b0000a6a4000000ca9a3b + scrollPos: {x: 0, y: 323} + m_SelectedIDs: 809b0000 + m_LastClickedID: 39808 + m_ExpandedIDs: 00000000069b0000089b00000a9b00000c9b00000e9b0000109b0000129b0000149b0000169b0000189b00001a9b00001c9b0000e09b000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -5705,7 +5705,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000529b0000549b0000569b0000589b00005a9b00005c9b00005e9b0000609b0000629b0000649b0000669b0000689b00006a9b00006c9b0000 + m_ExpandedIDs: 00000000069b0000089b00000a9b00000c9b00000e9b0000109b0000129b0000149b0000169b0000189b00001a9b00001c9b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: