Merge branch 'main' of https://www.nakjungit.site/sharedacc520k/Dino_Love_Simulation

2026-07-22 10:15:03 +09:00
parent 60f9a992ae 9d1500ac7b
commit 15eeb9d469
226 changed files with 14691 additions and 552 deletions
--- a/Assets/04_Models/Festival/Ground/ground.fbx.meta
+++ b/Assets/04_Models/Festival/Ground/ground.fbx.meta
@@ -162,7 +162,7 @@ ModelImporter:
    nodeNameCollisionStrategy: 1
    fileIdsGeneration: 2
    swapUVChannels: 0
-    generateSecondaryUV: 0
+    generateSecondaryUV: 1
    useFileUnits: 1
    keepQuads: 0
    weldVertices: 1
--- a/Assets/04_Models/Festival/Stage/R254,G254,B254.mat
+++ b/Assets/04_Models/Festival/Stage/R254,G254,B254.mat
@@ -11,9 +11,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 1
  m_CustomRenderQueue: 2000
@@ -46,7 +47,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EmissionMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 58cd1fdaaba297f4b904219321e56c2b, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
@@ -120,7 +121,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0.1517149, g: 0.13239272, b: 0.13239272, a: 1}
+    - _EmissionColor: {r: 2, g: 2, b: 2, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2.mat
@@ -11,9 +11,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -120,7 +121,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_2.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_2.mat
@@ -24,9 +24,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -133,7 +134,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_3.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_3.mat
@@ -24,9 +24,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -133,7 +134,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_4.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_4.mat
@@ -11,9 +11,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -120,7 +121,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_5.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_5.mat
@@ -24,9 +24,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -133,7 +134,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_6.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_6.mat
@@ -11,9 +11,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -120,7 +121,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_7.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_7.mat
@@ -24,9 +24,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -133,7 +134,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/[Beige]2_8.mat
+++ b/Assets/04_Models/Festival/Stage/[Beige]2_8.mat
@@ -11,9 +11,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 1
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -120,7 +121,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
    - _Color: {r: 0.91994107, g: 0.8762218, b: 0.7764671, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 8, g: 8, b: 8, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1
--- a/Assets/04_Models/Festival/Stage/sfsfsss.mat
+++ b/Assets/04_Models/Festival/Stage/sfsfsss.mat
@@ -11,9 +11,10 @@ Material:
  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
@@ -101,13 +102,13 @@ Material:
    - _GlossMapScale: 1
    - _Glossiness: 0.4472136
    - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.5
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _QueueOffset: 0
    - _ReceiveShadows: 1
-    - _Smoothness: 0.4472136
+    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -120,7 +121,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 5.9921575, g: 5.9921575, b: 5.9921575, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
  m_AllowLocking: 1