Merge pull request #36 from CyberAgentGameEntertainment/develop_lit

Develop lit
CyberAgentGameEntertainment · Oct 3, 2022 · 42600fa · 42600fa
2 parents fa4e6ac + c6cfe03
commit 42600fa
Show file tree

Hide file tree

Showing 247 changed files with 254,527 additions and 1,246 deletions.
diff --git a/Assets/Demo/Common.meta b/Assets/Demo/Common.meta
diff --git a/Assets/Demo/Common/Materials.meta b/Assets/Demo/Common/Materials.meta
diff --git a/Assets/Demo/Materials/mat_demo_skybox.mat → ...mmon/Materials/mat_demo_common_skybox.mat b/Assets/Demo/Materials/mat_demo_skybox.mat → ...mmon/Materials/mat_demo_common_skybox.mat
@@ -20,7 +20,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: mat_demo_skybox
+  m_Name: mat_demo_common_skybox
   m_Shader: {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4

diff --git a/...s/Demo/Materials/mat_demo_skybox.mat.meta → ...Materials/mat_demo_common_skybox.mat.meta b/...s/Demo/Materials/mat_demo_skybox.mat.meta → ...Materials/mat_demo_common_skybox.mat.meta
diff --git a/Assets/Demo/Common/Meshes.meta b/Assets/Demo/Common/Meshes.meta
diff --git a/Assets/Demo/Common/Meshes/teapot.fbx b/Assets/Demo/Common/Meshes/teapot.fbx
diff --git a/Assets/Demo/Common/Meshes/teapot.fbx.meta b/Assets/Demo/Common/Meshes/teapot.fbx.meta
diff --git a/Assets/Demo/Common/Textures.meta b/Assets/Demo/Common/Textures.meta
diff --git a/Assets/Demo/Common/Textures/tex_demo_common_00.png b/Assets/Demo/Common/Textures/tex_demo_common_00.png
diff --git a/Assets/Demo/Common/Textures/tex_demo_common_00.png.meta b/Assets/Demo/Common/Textures/tex_demo_common_00.png.meta
diff --git a/Assets/Demo/Common/Textures/tex_demo_common_01.png b/Assets/Demo/Common/Textures/tex_demo_common_01.png
diff --git a/Assets/Demo/Common/Textures/tex_demo_common_01.png.meta b/Assets/Demo/Common/Textures/tex_demo_common_01.png.meta
diff --git a/Assets/Demo/Common/Textures/tex_demo_common_02.png b/Assets/Demo/Common/Textures/tex_demo_common_02.png