Merge branch 'develop' into Animations

RE-SS3D · Dec 7, 2024 · 4b2396e · 4b2396e
2 parents be637c4 + 020eedd
commit 4b2396e
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 10 deletions.
diff --git a/Assets/Content/Resources/Simple Toon/Shaders/STDefault.shader b/Assets/Content/Resources/Simple Toon/Shaders/STDefault.shader
@@ -102,14 +102,14 @@
                 float toon = Toon(NdotL, atten);
 
 				fixed4 shadecol = _DarkColor;
-				fixed4 litcol = ColorBlend(_Color, _LightColor0, _AmbientCol);
+				fixed4 litcol = ColorBlend(_LightColor0, _Color, _AmbientCol);
 				fixed4 texcol = tex2D(_MainTex, i.uv) * litcol * _ColIntense + _ColBright;
 
 				float4 blendCol = ColorBlend(shadecol, texcol, toon);
 				float4 postCol = PostEffects(blendCol, toon, atten, NdotL, NdotH, VdotN, FdotV);
 
 				postCol.a = 1.;
-				return _LightColor0.a > 0 ? postCol : 0;
+				return postCol;
             }
 
             ENDCG
@@ -186,7 +186,7 @@
                 float toon = Toon(NdotL, atten);
 
 				fixed4 shadecol = _DarkColor;
-				fixed4 litcol = ColorBlend(_Color, _LightColor0, _AmbientCol);
+				fixed4 litcol = ColorBlend(_LightColor0, _Color, _AmbientCol);
 				fixed4 texcol = tex2D(_MainTex, i.uv) * litcol * _ColIntense + _ColBright;
 
 				float4 blendCol = ColorBlend(shadecol, texcol, toon);

diff --git a/Assets/Content/Scenes/Game.unity b/Assets/Content/Scenes/Game.unity
@@ -2833,6 +2833,30 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1962741443027797558, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1962741443579838927, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1962741443836442778, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1962741444063654987, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1962741444099505125, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1962741444111849070, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1962741444460096578, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
       propertyPath: m_Name
       value: Static World Objects
@@ -2957,6 +2981,14 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1962741444867659683, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1962741444990409278, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
 --- !u!1 &1962741445064829234 stripped

diff --git a/Assets/Content/WorldObjects/Entities/Humanoids/Human/Human.prefab b/Assets/Content/WorldObjects/Entities/Humanoids/Human/Human.prefab
@@ -6779,7 +6779,7 @@ MonoBehaviour:
   _initializeOrder: 0
   _defaultDespawnType: 0
   NetworkObserver: {fileID: 0}
-  <PrefabId>k__BackingField: 111
+  <PrefabId>k__BackingField: 113
   <SpawnableCollectionId>k__BackingField: 0
   _scenePathHash: 0
   <SceneId>k__BackingField: 0
@@ -11353,12 +11353,11 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents:
-    - {fileID: -7742570199249696470, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
+    - {fileID: 0}
     - {fileID: 8124597772398120270, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
     - {fileID: -5519180950159476568, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
     - {fileID: 5300969123225040956, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
     - {fileID: 6224308330480900340, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
-    - {fileID: 427023688766138603, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
 --- !u!114 &2124807441123396136 stripped
 MonoBehaviour:
@@ -14413,12 +14412,11 @@ PrefabInstance:
       value: 64
       objectReference: {fileID: 0}
     m_RemovedComponents:
-    - {fileID: 4484307789628443258, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
+    - {fileID: 0}
     - {fileID: 171912613050136349, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
     - {fileID: 3804509484627004799, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
     - {fileID: 7380375041138074868, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
     - {fileID: 6209280579436442931, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
-    - {fileID: 3325623441715482320, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
 --- !u!114 &2032574427462071784 stripped
 MonoBehaviour:

diff --git a/Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanSkin.mat b/Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanSkin.mat
@@ -71,7 +71,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _AlphaClip: 0
-    - _AmbientCol: 0
+    - _AmbientCol: 1
     - _Blend: 0
     - _BlendOp: 0
     - _BumpScale: 1

diff --git a/Assets/Content/WorldObjects/World/Materials/PaletteEmission.mat b/Assets/Content/WorldObjects/World/Materials/PaletteEmission.mat
@@ -70,7 +70,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _AmbientCol: 0
+    - _AmbientCol: 1
     - _BumpScale: 1
     - _Clipped: 0
     - _ColBright: 0