This commit is contained in:
2023-01-20 11:47:14 +01:00
4 changed files with 149 additions and 0 deletions

55
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,55 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}

18
Assets/Scripts/uj.cs Normal file
View File

@@ -0,0 +1,18 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class uj : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}

11
Assets/Scripts/uj.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: eaba8d7c523212e4a8a40fcef8e9eb9e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -119,7 +119,15 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200} m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192} m_MaxSize: {x: 24288, y: 16192}
vertical: 0 vertical: 0
<<<<<<< HEAD
controlID: 70 controlID: 70
=======
<<<<<<< HEAD
controlID: 98
=======
controlID: 509
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -144,7 +152,15 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192} m_MaxSize: {x: 16192, y: 16192}
vertical: 1 vertical: 1
<<<<<<< HEAD
controlID: 16 controlID: 16
=======
<<<<<<< HEAD
controlID: 99
=======
controlID: 514
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -169,7 +185,15 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100} m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096} m_MaxSize: {x: 16192, y: 8096}
vertical: 0 vertical: 0
<<<<<<< HEAD
controlID: 17 controlID: 17
=======
<<<<<<< HEAD
controlID: 100
=======
controlID: 515
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
--- !u!114 &8 --- !u!114 &8
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@@ -400,9 +424,19 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 186c0000 m_SelectedIDs: 186c0000
m_LastClickedID: 27672 m_LastClickedID: 27672
m_ExpandedIDs: 2afbffff m_ExpandedIDs: 2afbffff
=======
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 28fbffff
=======
m_ExpandedIDs: 20fbffff
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -446,10 +480,17 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
<<<<<<< HEAD
x: 253 x: 253
y: 73 y: 73
width: 1098 width: 1098
height: 553 height: 553
=======
x: 218
y: 73
width: 739
height: 364
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas: m_OverlayCanvas:
m_LastAppliedPresetName: Default m_LastAppliedPresetName: Default
@@ -840,9 +881,21 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 7e770000 m_SelectedIDs: 7e770000
m_LastClickedID: 30590 m_LastClickedID: 30590
m_ExpandedIDs: 0000000056770000587700005a770000 m_ExpandedIDs: 0000000056770000587700005a770000
=======
<<<<<<< HEAD
m_SelectedIDs: 6e770000
m_LastClickedID: 30574
m_ExpandedIDs: 000000005677000000ca9a3bffffff7f
=======
m_SelectedIDs: 84770000
m_LastClickedID: 30596
m_ExpandedIDs: 000000005c7700005e77000060770000
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -870,7 +923,15 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 0000000056770000587700005a770000 m_ExpandedIDs: 0000000056770000587700005a770000
=======
<<<<<<< HEAD
m_ExpandedIDs: 0000000056770000
=======
m_ExpandedIDs: 000000005c7700005e77000060770000
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
>>>>>>> f35c2ba851edc622d97bbbd16568aeec27b5ab6a
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@@ -922,7 +983,11 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_NewAssetIndexInList: -1 m_NewAssetIndexInList: -1
<<<<<<< HEAD
m_ScrollPosition: {x: 0, y: 69.5}
=======
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
>>>>>>> 000358024ddf5d04abef7c45cd4444d1c7150ca2
m_GridSize: 71 m_GridSize: 71
m_SkipHiddenPackages: 0 m_SkipHiddenPackages: 0
m_DirectoriesAreaWidth: 164 m_DirectoriesAreaWidth: 164