2 Commits 7b02b32dd4 ... 0f91964747

Autor SHA1 Mensaje Fecha
  FYX 0f91964747 Merge branch 'feature/cjy' into develop hace 2 semanas
  FYX e4be0ec54b [+]500kV变压器电磁特性timeline调整 hace 2 semanas

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 91 - 256
ModeDisplay/Assets/GameAssets/04.TimeLines/变压器_500kV_ODFPSZ_运行原理.playable


+ 2 - 8
ModeDisplay/Assets/Scenes/运行原理/电磁特性/500kV变压器-电磁特性.unity

@@ -92007,7 +92007,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 97129181}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0023192912, y: -15.047589, z: 0.22467373}
+  m_LocalPosition: {x: 0.0023192912, y: -15.047599, z: 0.22468327}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 956524574}
@@ -1136376,8 +1136376,6 @@ PlayableDirector:
     value: {fileID: 1614131596114751440}
   - key: {fileID: -3220307914785183157, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
     value: {fileID: 240668250}
-  - key: {fileID: 7666619545738437697, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
-    value: {fileID: 0}
   - key: {fileID: 5135136584562709105, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
     value: {fileID: 5185578877526469381}
   - key: {fileID: -8063053558411304529, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
@@ -1136488,10 +1136486,6 @@ PlayableDirector:
     value: {fileID: 1963792559}
   - key: {fileID: 4200296648735890018, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
     value: {fileID: 1080295996}
-  - key: {fileID: -1993806737057233787, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
-    value: {fileID: 1518476345}
-  - key: {fileID: 9152100873770108505, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
-    value: {fileID: 246500805}
   - key: {fileID: 8825404375970768416, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
     value: {fileID: 2138793547}
   - key: {fileID: -9178114086037568674, guid: c3a1bafbccd865e47b6aae7eb4e62bf2, type: 2}
@@ -1511311,7 +1511305,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1683423644}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.0023192912, y: 15.431644, z: 0.22467135}
+  m_LocalPosition: {x: 0.0023192912, y: 15.431649, z: 0.22468089}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 956524574}

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio