done

2024-03-09 21:58:31 -05:00 · 2024-03-09 21:58:31 -05:00 · 5fef696eb9
parent da7d10546d
commit 5fef696eb9
4 changed files with 194 additions and 20 deletions
--- a/Assets/Resources/Games/builtToScaleDS.prefab
+++ b/Assets/Resources/Games/builtToScaleDS.prefab
@ -2133,7 +2133,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -947387224812249842, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0.0000034693476
+      value: 0.0000033637534
      objectReference: {fileID: 0}
    - target: {fileID: -944302891571569470, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_Layer
@ -2147,9 +2147,21 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.000000017798401
+      objectReference: {fileID: 0}
+    - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.5258911
+      objectReference: {fileID: 0}
+    - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.117873535
+      objectReference: {fileID: 0}
    - target: {fileID: 364309268697413728, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0.000003469348
+      value: 0.0000033637539
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_Name
@ -2213,7 +2225,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7193526923147233643, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -0.46825576
+      value: 1.7452948
      objectReference: {fileID: 0}
    - target: {fileID: 7193526923147233643, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
@ -2221,7 +2233,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7193526923147233643, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
-      value: -180
+      value: -0.000015258789
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4d6a1ca519b6789419c00178b5d2b983, type: 3}
@ -2333,6 +2345,18 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -3631897138051517956, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 1.019213e-22
+      objectReference: {fileID: 0}
+    - target: {fileID: -3631897138051517956, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 1.390904e-12
+      objectReference: {fileID: 0}
+    - target: {fileID: -3631897138051517956, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -2.2417196e-20
+      objectReference: {fileID: 0}
    - target: {fileID: -3203485738917446855, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
      propertyPath: m_Layer
      value: 0
@ -2340,7 +2364,7 @@ PrefabInstance:
    - target: {fileID: -1003055794911221338, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
      propertyPath: m_Materials.Array.data[0]
      value: 
-      objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2}
+      objectReference: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
    - target: {fileID: -1003055794911221338, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
      propertyPath: m_Materials.Array.data[1]
      value: 
@ -2361,6 +2385,34 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 2043205891256864238, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -89.98021
+      objectReference: {fileID: 0}
+    - target: {fileID: 3042270054197743208, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.000015258788
+      objectReference: {fileID: 0}
+    - target: {fileID: 3042270054197743208, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -179.99998
+      objectReference: {fileID: 0}
+    - target: {fileID: 3042270054197743208, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406523010655556583, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -4.0711103e-13
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406523010655556583, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -8.1422206e-13
+      objectReference: {fileID: 0}
+    - target: {fileID: 4406523010655556583, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 3.546283e-20
+      objectReference: {fileID: 0}
    - target: {fileID: 7226848437003788013, guid: 69111fa8d72cdb847ad14fc0d8fd984c, type: 3}
      propertyPath: m_Layer
      value: 0
@ -3041,14 +3093,62 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: -6725864900740283272, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -89.98021
+      objectReference: {fileID: 0}
+    - target: {fileID: -4582022389678750781, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0.0000009932132
+      objectReference: {fileID: 0}
+    - target: {fileID: -4582022389678750781, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -1.8263537e-20
+      objectReference: {fileID: 0}
+    - target: {fileID: -4582022389678750781, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 7.2141267e-22
+      objectReference: {fileID: 0}
    - target: {fileID: -3487895895819380211, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
      propertyPath: m_Layer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -2623360714175404741, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 89.98021
+      objectReference: {fileID: 0}
+    - target: {fileID: -2623360714175404741, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -0.0000008680054
+      objectReference: {fileID: 0}
+    - target: {fileID: -2099288412364085233, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.0000034150944
+      objectReference: {fileID: 0}
+    - target: {fileID: -2099288412364085233, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -0.00000047354183
+      objectReference: {fileID: 0}
+    - target: {fileID: -2099288412364085233, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0.0000031419652
+      objectReference: {fileID: 0}
    - target: {fileID: -244648530497092133, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
      propertyPath: m_Layer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 55471896798365850, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -47.373425
+      objectReference: {fileID: 0}
+    - target: {fileID: 55471896798365850, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 25.834826
+      objectReference: {fileID: 0}
+    - target: {fileID: 55471896798365850, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -33.344215
+      objectReference: {fileID: 0}
    - target: {fileID: 308257133709792796, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
      propertyPath: m_Layer
      value: 0
@ -3089,10 +3189,50 @@ PrefabInstance:
      propertyPath: m_Materials.Array.data[3]
      value: 
      objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2}
+    - target: {fileID: 4518858451777631492, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 05418807da86e2146bc9e10ad24a33aa, type: 2}
+    - target: {fileID: 6096549794379710491, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.000006518555
+      objectReference: {fileID: 0}
+    - target: {fileID: 6096549794379710491, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.0000008680054
+      objectReference: {fileID: 0}
+    - target: {fileID: 6096549794379710491, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -1.6191626e-15
+      objectReference: {fileID: 0}
    - target: {fileID: 8813323920513627783, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
      propertyPath: m_Layer
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 9156511915099979942, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -0.0000004268868
+      objectReference: {fileID: 0}
+    - target: {fileID: 9156511915099979942, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0.00000066414475
+      objectReference: {fileID: 0}
+    - target: {fileID: 9156511915099979942, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0.0000018876924
+      objectReference: {fileID: 0}
+    - target: {fileID: 9181040827110084542, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -19.721653
+      objectReference: {fileID: 0}
+    - target: {fileID: 9181040827110084542, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 49.642414
+      objectReference: {fileID: 0}
+    - target: {fileID: 9181040827110084542, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -73.99892
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: c9dfe6e539f24b14c8918dba9c6e35eb, type: 3}
 --- !u!4 &8251119247562495620 stripped
--- a/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/PartsHit.anim
+++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Animations/PartsHit.anim
@ -767,12 +767,12 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
+      value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
    - time: 0.041666668
-      value: {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2}
+      value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
    - time: 0.083333336
      value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
-    - time: 0.125
+    - time: 0.16666667
      value: {fileID: 2100000, guid: c2dcdccce937af54aab2ffb52ce8b7e4, type: 2}
    - time: 7.5416665
      value: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
@ -780,6 +780,19 @@ AnimationClip:
    path: parts_ok.001
    classID: 137
    script: {fileID: 0}
+  - curve:
+    - time: 0
+      value: {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
+    - time: 0.083333336
+      value: {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2}
+    - time: 0.125
+      value: {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2}
+    - time: 0.16666667
+      value: {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
+    attribute: m_Materials.Array.data[3]
+    path: parts_ok.001
+    classID: 137
+    script: {fileID: 0}
  m_SampleRate: 24
  m_WrapMode: 0
  m_Bounds:
@ -843,6 +856,13 @@ AnimationClip:
      typeID: 137
      customType: 21
      isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2603234997
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 137
+      customType: 21
+      isPPtrCurve: 1
    - serializedVersion: 2
      path: 2288273962
      attribute: 1
@ -900,11 +920,15 @@ AnimationClip:
      customType: 0
      isPPtrCurve: 0
    pptrCurveMapping:
-    - {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
-    - {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2}
+    - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
+    - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
    - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
    - {fileID: 2100000, guid: c2dcdccce937af54aab2ffb52ce8b7e4, type: 2}
    - {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
+    - {fileID: 2100000, guid: bb9b20d1fb0ff2e45a2a8f14bd1fd6ee, type: 2}
+    - {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2}
+    - {fileID: 2100000, guid: 65811a5ed9222154b8a07c752e87c8c8, type: 2}
+    - {fileID: 2100000, guid: 1edfe5e6a93077d4cb5f95cf53c7e768, type: 2}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
--- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/Impact.mat
+++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/Impact.mat
@ -2,15 +2,19 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Impact
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF
-  m_LightmapFlags: 4
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 3000
@ -42,7 +46,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EmissionMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 772d88056ab3bf5408fc8d5a3387df8d, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
@ -77,6 +81,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
@ -110,7 +115,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: 1, g: 1, b: 1, a: 1}
    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
  m_BuildTextureStacks: []
 --- !u!114 &1655112528312275563
--- a/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/ImpactFaded.mat
+++ b/Assets/Resources/Models/Games/BuiltToScaleDS/Materials/Effects/ImpactFaded.mat
@ -2,15 +2,19 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: ImpactFaded
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _GLOSSYREFLECTIONS_OFF
-  m_LightmapFlags: 4
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: 3000
@ -42,7 +46,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _EmissionMap:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 772d88056ab3bf5408fc8d5a3387df8d, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
@ -77,6 +81,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
    - _Blend: 0
@ -110,7 +115,7 @@ Material:
    m_Colors:
    - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5019608}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
  m_BuildTextureStacks: []
 --- !u!114 &1655112528312275563