changes on mac

belikji · May 22, 2023 · 6b07420 · 6b07420
1 parent b1e2952
commit 6b07420
Show file tree

Hide file tree

Showing 258 changed files with 100,125 additions and 849 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -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
+    }
+}
diff --git a/Assets/.DS_Store b/Assets/.DS_Store
diff --git a/Assets/Materials.meta → Assets/Animated Loading Icons/Materials.meta b/Assets/Materials.meta → Assets/Animated Loading Icons/Materials.meta
diff --git a/Assets/Materials/Test.mat → ...Animated Loading Icons/Materials/Test.mat b/Assets/Materials/Test.mat → ...Animated Loading Icons/Materials/Test.mat
diff --git a/Assets/Materials/Test.mat.meta → ...ted Loading Icons/Materials/Test.mat.meta b/Assets/Materials/Test.mat.meta → ...ted Loading Icons/Materials/Test.mat.meta
diff --git a/Assets/Materials/VRM.mat → .../Animated Loading Icons/Materials/VRM.mat b/Assets/Materials/VRM.mat → .../Animated Loading Icons/Materials/VRM.mat
diff --git a/Assets/Materials/VRM.mat.meta → ...ated Loading Icons/Materials/VRM.mat.meta b/Assets/Materials/VRM.mat.meta → ...ated Loading Icons/Materials/VRM.mat.meta
diff --git a/Assets/Export/export.Avatar/VrmAvatar.asset b/Assets/Export/export.Avatar/VrmAvatar.asset
diff --git a/Assets/Export/export.Materials/AvatarSkin_MAT (Instance).asset b/Assets/Export/export.Materials/AvatarSkin_MAT (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 6a96418cbc5350c4693adb7ff38d4d47, type: 3}
+        m_Texture: {fileID: 2800000, guid: 3d6136148423485459d3ee10b8f45fff, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/BlackMAT (Instance).asset b/Assets/Export/export.Materials/BlackMAT (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: ea5fb1aa31e93534297ff831f8fbd4c0, type: 3}
+        m_Texture: {fileID: 2800000, guid: 89d0604c5698a59489c076c9d3904bbe, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/M_Hair_BookStyle_MAT (Instance).asset b/Assets/Export/export.Materials/M_Hair_BookStyle_MAT (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 3d6136148423485459d3ee10b8f45fff, type: 3}
+        m_Texture: {fileID: 2800000, guid: 70ef96baebce82e44b005554813aafc1, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/Material.002 (Instance).asset b/Assets/Export/export.Materials/Material.002 (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 0736d2cf2abaaec4e88dca659770f5fa, type: 3}
+        m_Texture: {fileID: 2800000, guid: ea5fb1aa31e93534297ff831f8fbd4c0, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/Material.002 (Instance)__UNIGLTF__DUPLICATED__2.asset b/Assets/Export/export.Materials/Material.002 (Instance)__UNIGLTF__DUPLICATED__2.asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 3d6136148423485459d3ee10b8f45fff, type: 3}
+        m_Texture: {fileID: 2800000, guid: 94555b2ec1861b640a71885c3d41e33d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/Material.010 (Instance).asset b/Assets/Export/export.Materials/Material.010 (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 0ced07bc3f33c7842ac7e223709935ce, type: 3}
+        m_Texture: {fileID: 2800000, guid: 6946ffc5bfc79914396a7478c1fcbdbc, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/PatternMAT (Instance).asset b/Assets/Export/export.Materials/PatternMAT (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 94555b2ec1861b640a71885c3d41e33d, type: 3}
+        m_Texture: {fileID: 2800000, guid: 820ac138ef6185e4c8570ed4ae39cc75, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/SantaXray_MAT (Instance).asset b/Assets/Export/export.Materials/SantaXray_MAT (Instance).asset
@@ -26,11 +26,11 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _EmissionMap:
-        m_Texture: {fileID: 2800000, guid: 6946ffc5bfc79914396a7478c1fcbdbc, type: 3}
+        m_Texture: {fileID: 2800000, guid: 4d6649690ad01cc40a9822ba0edbc786, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 4d6649690ad01cc40a9822ba0edbc786, type: 3}
+        m_Texture: {fileID: 2800000, guid: 2b4197e65e43a24429a39637bf0adcfd, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Materials/TT_checker_512x512_UV_GRID.002 (Instance).asset b/Assets/Export/export.Materials/TT_checker_512x512_UV_GRID.002 (Instance).asset
@@ -30,7 +30,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 70ef96baebce82e44b005554813aafc1, type: 3}
+        m_Texture: {fileID: 2800000, guid: 0736d2cf2abaaec4e88dca659770f5fa, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OutlineWidthTexture:

diff --git a/Assets/Export/export.Meshes/Circle.006.baked.asset b/Assets/Export/export.Meshes/Circle.006.baked.asset
diff --git a/Assets/Export/export.Meshes/Cube.001.baked.asset b/Assets/Export/export.Meshes/Cube.001.baked.asset
diff --git a/Assets/Export/export.Meshes/M_Head_BaseMesh_Mesh.017.baked.asset b/Assets/Export/export.Meshes/M_Head_BaseMesh_Mesh.017.baked.asset
diff --git a/Assets/Export/export.Meshes/Mesh.001.baked.asset b/Assets/Export/export.Meshes/Mesh.001.baked.asset
diff --git a/Assets/Export/export.Meshes/Mesh.002.baked.asset b/Assets/Export/export.Meshes/Mesh.002.baked.asset
diff --git a/Assets/Export/export.Meshes/Mesh.007.baked.asset b/Assets/Export/export.Meshes/Mesh.007.baked.asset
diff --git a/Assets/Export/export.Meshes/Mesh.010.baked.asset b/Assets/Export/export.Meshes/Mesh.010.baked.asset