Merge branch 'feature/cjy' into develop

# Conflicts:
#	ModeDisplay/Assets/GameAssets/09.Audios/工作原理/气缸.srt.meta
#	ModeDisplay/Assets/Scenes/运行原理/工作原理.meta
#	ModeDisplay/Assets/Scenes/运行原理/电磁特性/220kV变压器-电磁特性 1.unity.meta
#	ModeDisplay/Assets/Scenes/运行原理/电磁特性/220kV变压器-电磁特性_old.unity.meta

ModeDisplay/Assets/GameAssets/04.TimeLines/变压器_500kV_ODFPSZ_运行原理.playable

@@ -33774,10 +33774,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 55.5
+    m_Start: 57.333333333333336
     m_ClipIn: 0
     m_Asset: {fileID: 3819808824868897064}
-    m_Duration: 2.4999999999999964
+    m_Duration: 0.6666666666666572
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8728442908476140122}
     m_EaseInDuration: 0

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

@@ -1805571,10 +1805571,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   lineRenderer: {fileID: 1604148466}
-  pointCount: 50
-  lineLength: 0.05
-  amplitude: 0.009
-  wavelength: 0.015
+  pointCount: 45
+  lineLength: 0.03
+  amplitude: 0.005
+  wavelength: 0.01
   waveSpeed: 1
   phaseOffset: -1
   startPointTransform: {fileID: 164412836}
@@ -2896298,7 +2896298,7 @@ TextMesh:
   m_FontSize: 100
   m_FontStyle: 0
   m_RichText: 1
-  m_Font: {fileID: 12800000, guid: bf731b4ad21603f40b8fb8a274a68304, type: 3}
+  m_Font: {fileID: 12800000, guid: 1acaacc45176e17419cae61a68eb2f1d, type: 3}
   m_Color:
     serializedVersion: 2
     rgba: 4278190080
@@ -2896320,7 +2896320,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  - {fileID: 2100000, guid: 1acaacc45176e17419cae61a68eb2f1d, type: 3}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

ModeDisplay/Assets/StreamingAssets/SubTitles/原理/500kV变压器电磁特性.srt

@@ -275,43 +275,43 @@
 来调节输出的电压
 
 70
-00:02:57,184 --> 00:02:59,950
+00:02:57,184 --> 00:03:00,950
 所有组件安装于密封油箱内部
 
 71
-00:02:59,950 --> 00:03:03,900
+00:03:00,950 --> 00:03:04,300
 油箱顶部设有五个引出电流的绝缘套管
 
 72
-00:03:03,900 --> 00:03:08,240
+00:03:04,300 --> 00:03:08,740
 分别为高压、中压、高压中性点及两个低压套管
 
 73
-00:03:08,244 --> 00:03:12,844
+00:03:08,744 --> 00:03:13,244
 这些套管是绝缘结构 防止高压击穿油箱壳体
 
 74
-00:03:12,844 --> 00:03:15,264
+00:03:13,244 --> 00:03:15,764
 油箱内部填充绝缘矿物油
 
 75
-00:03:15,264 --> 00:03:17,854
+00:03:15,764 --> 00:03:18,154
 具备良好绝缘性和热稳定性
 
 76
-00:03:17,854 --> 00:03:19,584
+00:03:18,154 --> 00:03:19,984
 可有效冷却内部绕组
 
 77
-00:03:19,651 --> 00:03:22,561
+00:03:19,984 --> 00:03:22,961
 在油箱上方还设置了油枕
 
 78
-00:03:22,561 --> 00:03:24,581
+00:03:22,961 --> 00:03:24,981
 用于储存备用绝缘油
 
 79
-00:03:24,581 --> 00:03:26,631
+00:03:24,981 --> 00:03:25,631
 同时它还可以过滤湿气
 
 80