[天空盒及环境更新】

ModeDisplay/Assets/GameAssets/01.Animation.meta → ModeDisplay/Assets/ChivaFramework/Framework/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: cfbd5b91ae13fd2498bd192513957395
-folderAsset: yes
+guid: 4a6eaddfb3bfecf479d8d3a3f1f30d57
 DefaultImporter:
   externalObjects: {}
   userData: 

ModeDisplay/Assets/GameAssets/06.UIPrefabs/PartLabelPanel.prefab

@@ -143,7 +143,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ba955f5c902699745a7b2ed16640c4cd, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 15527c17e57ec7a42af296f964522a26, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -166,7 +166,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 20
+    m_Left: 34
     m_Right: 20
     m_Top: 0
     m_Bottom: 0
@@ -318,7 +318,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 54.99913}
+  m_SizeDelta: {x: 0, y: 41.249374}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7642275672550807330
 CanvasRenderer:
@@ -437,7 +437,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.79215693, g: 0.48235297, b: 0.2509804, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -529,7 +529,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.79215693, g: 0.48235297, b: 0.2509804, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:

ModeDisplay/Assets/QFrameworkData/QAssets.cs

@@ -11,6 +11,11 @@
 namespace QAssetBundle
 {
     
+    public class Autodisassemblypanel_prefab
+    {
+        public const string BundleName = "autodisassemblypanel_prefab";
+        public const string AUTODISASSEMBLYPANEL = "autodisassemblypanel";
+    }
     public class Partlabelpanel_prefab
     {
         public const string BundleName = "partlabelpanel_prefab";
@@ -26,10 +31,10 @@ namespace QAssetBundle
         public const string BundleName = "pc_operatepanel_prefab";
         public const string PC_OPERATEPANEL = "pc_operatepanel";
     }
-    public class TitlePanel_prefab
+    public class Principlepanel_prefab
     {
-        public const string BundleName = "titlePanel_prefab";
-        public const string PRINCIPLEPANEL = "titlePanel";
+        public const string BundleName = "principlepanel_prefab";
+        public const string TITLEPANEL = "titlepanel";
     }
     public class Subtitlespanel_prefab
     {
@@ -41,4 +46,9 @@ namespace QAssetBundle
         public const string BundleName = "uimultipanel_prefab";
         public const string UIMULTIPANEL = "uimultipanel";
     }
+    public class 隔离开关_110kv_gw22_126_prefab
+    {
+        public const string BundleName = "隔离开关_110kv_gw22_126_prefab";
+        public const string 隔离开关_110KV_GW22_126 = "隔离开关_110kv_gw22_126";
+    }
 }

ModeDisplay/Assets/Scenes/内部结构/01.500kV_变压器-ODFPS型.unity

@@ -342402,6 +342402,7 @@ GameObject:
   - component: {fileID: 8388240246815631921}
   - component: {fileID: 8388240246815631927}
   - component: {fileID: 8388240246815631926}
+  - component: {fileID: 8388240246815631928}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -342486,6 +342487,84 @@ MonoBehaviour:
   blendDistance: 0
   weight: 1
   priority: 0
+--- !u!114 &8388240246815631928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8388240246815631925}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _fillAlpha: 0
+  _downsampleFactor: 1
+  _iterations: 2
+  _blurMinSpread: 1
+  _blurSpread: 0
+  _blurIntensity: 1
+  _blurDirections: 2
+  _blitter: {fileID: 0}
+  _antiAliasing: 0
+  _presets:
+  - _name: Default
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 2
+    _blurMinSpread: 0.65
+    _blurSpread: 0.25
+    _blurIntensity: 0.3
+    _blurDirections: 0
+  - _name: Wide
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 4
+    _blurMinSpread: 0.65
+    _blurSpread: 0.25
+    _blurIntensity: 0.3
+    _blurDirections: 0
+  - _name: Strong
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 2
+    _blurMinSpread: 0.5
+    _blurSpread: 0.15
+    _blurIntensity: 0.325
+    _blurDirections: 0
+  - _name: Speed
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 1
+    _blurMinSpread: 0.75
+    _blurSpread: 0
+    _blurIntensity: 0.35
+    _blurDirections: 0
+  - _name: Quality
+    _fillAlpha: 0
+    _downsampleFactor: 2
+    _iterations: 3
+    _blurMinSpread: 0.5
+    _blurSpread: 0.5
+    _blurIntensity: 0.28
+    _blurDirections: 0
+  - _name: Solid 1px
+    _fillAlpha: 0
+    _downsampleFactor: 1
+    _iterations: 1
+    _blurMinSpread: 1
+    _blurSpread: 0
+    _blurIntensity: 1
+    _blurDirections: 2
+  - _name: Solid 2px
+    _fillAlpha: 0
+    _downsampleFactor: 1
+    _iterations: 2
+    _blurMinSpread: 1
+    _blurSpread: 0
+    _blurIntensity: 1
+    _blurDirections: 2
 --- !u!33 &8388526660036636700
 MeshFilter:
   m_ObjectHideFlags: 0

ModeDisplay/Assets/Scenes/内部结构/02.220kV_变压器-SFPSZ10型.unity

@@ -509887,6 +509887,7 @@ GameObject:
   - component: {fileID: 8388240246815631921}
   - component: {fileID: 8388240246815631927}
   - component: {fileID: 8388240246815631926}
+  - component: {fileID: 8388240246815631928}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -509971,6 +509972,84 @@ MonoBehaviour:
   m_BeforeTransparentBundles: []
   m_BeforeStackBundles: []
   m_AfterStackBundles: []
+--- !u!114 &8388240246815631928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8388240246815631925}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _fillAlpha: 0
+  _downsampleFactor: 1
+  _iterations: 2
+  _blurMinSpread: 1
+  _blurSpread: 0
+  _blurIntensity: 1
+  _blurDirections: 2
+  _blitter: {fileID: 0}
+  _antiAliasing: 0
+  _presets:
+  - _name: Default
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 2
+    _blurMinSpread: 0.65
+    _blurSpread: 0.25
+    _blurIntensity: 0.3
+    _blurDirections: 0
+  - _name: Wide
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 4
+    _blurMinSpread: 0.65
+    _blurSpread: 0.25
+    _blurIntensity: 0.3
+    _blurDirections: 0
+  - _name: Strong
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 2
+    _blurMinSpread: 0.5
+    _blurSpread: 0.15
+    _blurIntensity: 0.325
+    _blurDirections: 0
+  - _name: Speed
+    _fillAlpha: 0
+    _downsampleFactor: 4
+    _iterations: 1
+    _blurMinSpread: 0.75
+    _blurSpread: 0
+    _blurIntensity: 0.35
+    _blurDirections: 0
+  - _name: Quality
+    _fillAlpha: 0
+    _downsampleFactor: 2
+    _iterations: 3
+    _blurMinSpread: 0.5
+    _blurSpread: 0.5
+    _blurIntensity: 0.28
+    _blurDirections: 0
+  - _name: Solid 1px
+    _fillAlpha: 0
+    _downsampleFactor: 1
+    _iterations: 1
+    _blurMinSpread: 1
+    _blurSpread: 0
+    _blurIntensity: 1
+    _blurDirections: 2
+  - _name: Solid 2px
+    _fillAlpha: 0
+    _downsampleFactor: 1
+    _iterations: 2
+    _blurMinSpread: 1
+    _blurSpread: 0
+    _blurIntensity: 1
+    _blurDirections: 2
 --- !u!4 &8388360103245211590
 Transform:
   m_ObjectHideFlags: 0

ModeDisplay/Assets/StreamingAssets/Config/Audios/原理.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/ChivaFramework/Framework/Plugins/Easy performant outline/Demo/Models for Demo scene/CartoonLowPolyCityLite/CartoonLowPolyCityLite_HDRP_2018.3.unitypackage.meta
-guid: 4a6eaddfb3bfecf479d8d3a3f1f30d57
-========
-guid: fbdbdcc1ed0433a45998830f11e641ff
-folderAsset: yes
->>>>>>>> ba267c03576b6611344b2d6a6a151f761faffa55:ModeDisplay/Assets/StreamingAssets/Config/Audios/原理.meta
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ModeDisplay/ProjectSettings/EditorBuildSettings.asset

@@ -5,10 +5,10 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/ChivaFramework/Author/Author.unity
     guid: 5c5c8597de35c6f4483e852f5d465ef3
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/AsyncLoad.unity
     guid: 1dd9e366d4f9e8b418bc56a692130e37
   - enabled: 0
@@ -68,7 +68,13 @@ EditorBuildSettings:
   - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u7535\u78C1\u7279\u6027/500kV\u53D8\u538B\u5668-\u7535\u78C1\u7279\u6027.unity"
     guid: 08b60b4abc7dea64a809b148d418db97
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/500kV\u53D8\u538B\u5668-\u8FD0\u884C\u539F\u7406.unity"
     guid: 4988fbb6cfcde4d4c8c078efadd2e8d8
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/01.500kV_\u53D8\u538B\u5668-ODFPS\u578B.unity"
+    guid: 852eb4b617a0df34b99d9fab3930b2d5
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/02.220kV_\u53D8\u538B\u5668-SFPSZ10\u578B.unity"
+    guid: 9511eb1e944bba341924c3264cc56a1e
   m_configObjects: {}