Prechádzať zdrojové kódy

Merge branch 'feature/LQD' into develop

DESKTOP-VJNJ4VK\Administrator 3 mesiacov pred
rodič
commit
75437fb6f8

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/05.110kV断路器-LW35型V20250711/Materials/漆面_01.mat

@@ -61,7 +61,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.648
+    - _Glossiness: 0.3
     - _GlossyReflections: 1
     - _Metallic: 0.386
     - _Mode: 0

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/05.110kV断路器-LW35型V20250711/Materials/瓷瓶_AlbedoTransparency.mat

@@ -60,7 +60,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _GlossMapScale: 0.598
+    - _GlossMapScale: 0.538
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _Metallic: 0

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/05.110kV断路器-LW35型V20250711/Materials/金属_铁.mat

@@ -61,7 +61,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 0.3
     - _GlossyReflections: 1
     - _Metallic: 1
     - _Mode: 0

+ 2 - 2
ModeDisplay/Assets/GameAssets/14.Materials/110kV断路器-燃弧熄弧特性/旋转融合.mat

@@ -66,12 +66,12 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _Metallic: 0.317
+    - _Metallic: 0.488
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Offset: 3.45
     - _Parallax: 0.02
-    - _Smoothness: 0.556
+    - _Smoothness: 0.437
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

+ 17 - 1
ModeDisplay/Assets/Scenes/运行原理/机械联动特性/110kV断路器-机械联动特性.unity

@@ -12966,6 +12966,16 @@ PrefabInstance:
       propertyPath: m_Intensity
       value: 1.67
       objectReference: {fileID: 0}
+    - target: {fileID: 8954847376970719806, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8954847377543025883, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 0.5
+      objectReference: {fileID: 0}
     - target: {fileID: 8954847377636127617, guid: 344aa4d1090904f4e89b56776b0917a3,
         type: 3}
       propertyPath: m_Name
@@ -13031,6 +13041,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8954847377972553116, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 0.5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 344aa4d1090904f4e89b56776b0917a3, type: 3}
 --- !u!1 &608980693
@@ -13088,6 +13103,7 @@ MonoBehaviour:
   singlePlaye: 1
   isWaitOneFrame: 1
   isUseGlobalTimeBySubTitlesPanel: 1
+  initTime: 0
 --- !u!4 &608980696
 Transform:
   m_ObjectHideFlags: 0
@@ -73238,7 +73254,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4d1a2ec3eae9373468cebc95f8da7a4e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Direction: {x: 0, y: 0, z: 14}
+  m_Direction: {x: 0, y: 0, z: 0}
   m_UserGlobalDirection: 0
   m_Duration: 3
   m_IsHighterHide: 0