Forráskód Böngészése

Merge branch 'feature/jinxin' into develop_合作分支

# Conflicts:
#	ChivaTechFramework/ProjectSettings/EditorBuildSettings.asset
#	ChivaTechFramework/ProjectSettings/ProjectSettings.asset
zhangjx 5 hónapja
szülő
commit
1778f7c2e7

+ 9 - 8
ChivaTechFramework/Assets/GameAssets/03.Models/05.110kV断路器-LW35型/Materials/玻璃.mat

@@ -9,12 +9,13 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: "\u73BB\u7483"
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -59,19 +60,19 @@ Material:
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
-    - _DstBlend: 0
+    - _DstBlend: 10
     - _GlossMapScale: 1
-    - _Glossiness: 0
+    - _Glossiness: 0.901
     - _GlossyReflections: 1
     - _Metallic: 0
-    - _Mode: 0
+    - _Mode: 3
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
-    - _ZWrite: 1
+    - _ZWrite: 0
     m_Colors:
-    - _Color: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 1}
+    - _Color: {r: 0.9433962, g: 0.9433962, b: 0.9433962, a: 0.02745098}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 2 - 2
ChivaTechFramework/Assets/GameAssets/03.Models/主场景模型资源/主变检修/Tool_Tex/HuGanJiaoYanYi_Normal.tga.meta

@@ -7,7 +7,7 @@ TextureImporter:
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -51,7 +51,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0

+ 1 - 1
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/110kV断路器-LW35型解体大修.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 8900000, guid: a14e88f8d2de8ab42b53466a9c49897e, type: 3}
   m_Sun: {fileID: 1985573707}
-  m_IndirectSpecularColor: {r: 0.50795394, g: 0.5352426, b: 0.55202174, a: 1}
+  m_IndirectSpecularColor: {r: 0.7405715, g: 0.7581086, b: 0.76863384, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

+ 0 - 8
ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/220kV断路器-LW25型瓷质绝缘检修.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9913b635e592cca4785603c39d9d8365
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 72 - 0
ChivaTechFramework/ProjectSettings/EditorBuildSettings_BACKUP_1767.asset

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+<<<<<<< HEAD
+  m_Scenes:
+  - enabled: 1
+    path: Assets/ChivaFramework/Author/Author.unity
+    guid: 5c5c8597de35c6f4483e852f5d465ef3
+  - enabled: 1
+    path: Assets/Scenes/AsyncLoad.unity
+    guid: 1dd9e366d4f9e8b418bc56a692130e37
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/110kV\u9694\u79BB\u5F00\u5173\u4F8B\u884C\u68C0\u4FEE\u7CFB\u7EDF.unity"
+    guid: c3d853339305ce840a91a2f784892a2f
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u4E09\u76F8\u4E00\u4F53\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u7ED3\u6784\u62C6\u89E3.unity"
+    guid: 9f9a7ff8bb2ab9c4c9c16050ce9200d6
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u547C\u5438\u5668\u66F4\u6362.unity"
+    guid: a413b3cfd313e1941b9f25138fe3dca0
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u8865\u6CB9.unity"
+    guid: 5cafa2b47302e4941bd3d900883a4658
+  - enabled: 0
+    path: Assets/Scenes/OldLoad.unity
+    guid: 65885eff9dcdb8843b72f55c4c595c77
+  - enabled: 0
+    path: "Assets/Scenes/\u6C42\u8BC6\u5236\u4F5C\u573A\u666F/\u53D8\u538B\u5668\u9AD8\u538B\u4FA7\u76F4\u963B\u8D85\u6807\u5904\u7406_old.unity"
+    guid: 2e57631a16e36444c9f7e2342b70ecca
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/10kV\u771F\u7A7A\u65AD\u8DEF\u5668\u53CA\u5F00\u5173\u67DC\u4F8B\u884C\u68C0\u4FEE.unity"
+    guid: 9d06aab5d54543949908336e9bcebdc8
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/35kV#1SVG\u5F00\u51733K1\u65AD\u8DEF\u5668\u8FD0\u884C\u8F6C\u68C0\u4FEE.unity"
+    guid: 2d0aef51c43920748a51e97a2c2a17f4
+  - enabled: 0
+    path: "Assets/Scenes/\u5185\u8499\u673A\u7535-\u53D8\u7535\u8FD0\u7EF4\u7535\u6C14\u8BD5\u9A8C\u865A\u62DF\u4EFF\u771F\u5B9E\u8BAD\u7CFB\u7EDF/\u65AD\u8DEF\u5668\u56DE\u8DEF\u7535\u963B\u6D4B\u8BD5\u4EFF\u771F.unity"
+    guid: af429b879ef875448a3cc4cbb99c319c
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u622A\u56FE01.unity"
+    guid: 7b72b898ba48e7a4483fb152abbaaa85
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE\uFF08\u98CE\u6247\u7535\u673A\u66F4\u6362\u3001\u6F5C\u6CB9\u6CF5\u66F4\u6362\u3001\u6CB9\u6D41\u7EE7\u7535\u5668\u66F4\u6362\uFF09.unity"
+    guid: 22ca87101e39c6e4e81a9512284b9502
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE.unity"
+    guid: 8fd8b362c86fa9a44b6bbc678225f568
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6F5C\u6CB9\u6CF5\u66F4\u6362).unity"
+    guid: 35d9070ff0a3b9443b00a33b5e949de0
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u98CE\u6247\u7535\u673A\u66F4\u6362).unity"
+    guid: 2db95636f76d59440bf375876376f3cb
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6CB9\u6D41\u7EE7\u7535\u5668).unity"
+    guid: 749cec40e080690498d78e5076301031
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6CB9\u6D41\u7EE7\u7535\u5668).unity"
+    guid: da26339052ad1ab4da98ac96965d7dc8
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6F5C\u6CB9\u6CF5\u66F4\u6362).unity"
+    guid: 91391ec273c4d87439ac2a5921c15756
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u98CE\u6247\u7535\u673A\u66F4\u6362).unity"
+    guid: 616d391e618a577468222c890205710f
+=======
+  m_Scenes: []
+>>>>>>> feature/jinxin
+  m_configObjects: {}

+ 93 - 0
ChivaTechFramework/ProjectSettings/EditorBuildSettings_BASE_1767.asset

@@ -0,0 +1,93 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/ChivaFramework/Author/Author.unity
+    guid: 5c5c8597de35c6f4483e852f5d465ef3
+  - enabled: 1
+    path: Assets/Scenes/AsyncLoad.unity
+    guid: 1dd9e366d4f9e8b418bc56a692130e37
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/110kV\u9694\u79BB\u5F00\u5173\u4F8B\u884C\u68C0\u4FEE\u7CFB\u7EDF.unity"
+    guid: c3d853339305ce840a91a2f784892a2f
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u4E09\u76F8\u4E00\u4F53\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u7ED3\u6784\u62C6\u89E3.unity"
+    guid: 9f9a7ff8bb2ab9c4c9c16050ce9200d6
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/35kV#1SVG\u5F00\u51733K1\u65AD\u8DEF\u5668\u8FD0\u884C\u8F6C\u68C0\u4FEE.unity"
+    guid: 2d0aef51c43920748a51e97a2c2a17f4
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u547C\u5438\u5668\u66F4\u6362.unity"
+    guid: a413b3cfd313e1941b9f25138fe3dca0
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u8865\u6CB9.unity"
+    guid: 5cafa2b47302e4941bd3d900883a4658
+  - enabled: 0
+    path: Assets/Scenes/OldLoad.unity
+    guid: 65885eff9dcdb8843b72f55c4c595c77
+  - enabled: 0
+    path: "Assets/Scenes/\u6C42\u8BC6\u5236\u4F5C\u573A\u666F/\u53D8\u538B\u5668\u9AD8\u538B\u4FA7\u76F4\u963B\u8D85\u6807\u5904\u7406_old.unity"
+    guid: 2e57631a16e36444c9f7e2342b70ecca
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/10kV\u771F\u7A7A\u65AD\u8DEF\u5668\u53CA\u5F00\u5173\u67DC\u4F8B\u884C\u68C0\u4FEE.unity"
+    guid: 9d06aab5d54543949908336e9bcebdc8
+  - enabled: 0
+    path: "Assets/Scenes/\u5185\u8499\u673A\u7535-\u53D8\u7535\u8FD0\u7EF4\u7535\u6C14\u8BD5\u9A8C\u865A\u62DF\u4EFF\u771F\u5B9E\u8BAD\u7CFB\u7EDF/\u65AD\u8DEF\u5668\u56DE\u8DEF\u7535\u963B\u6D4B\u8BD5\u4EFF\u771F.unity"
+    guid: af429b879ef875448a3cc4cbb99c319c
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u622A\u56FE01.unity"
+    guid: 7b72b898ba48e7a4483fb152abbaaa85
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE\uFF08\u98CE\u6247\u7535\u673A\u66F4\u6362\u3001\u6F5C\u6CB9\u6CF5\u66F4\u6362\u3001\u6CB9\u6D41\u7EE7\u7535\u5668\u66F4\u6362\uFF09.unity"
+    guid: 22ca87101e39c6e4e81a9512284b9502
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: c628b263750c9924da8656debc0c06af
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE.unity"
+    guid: 8fd8b362c86fa9a44b6bbc678225f568
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u706D\u5F27\u3001\u5BFC\u7535\u548C\u7EDD\u7F18\u90E8\u5206\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 5657f005aa973504dbb026332caafadc
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u624B\u52A8\u7535\u52A8\u5206\u5408\u95F8\u68C0\u67E5.unity"
+    guid: 922f799831d5ce846b94651f70f5517f
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u63A5\u5730\u5200\u95F8\u53CA\u5173\u8054\u90E8\u4EF6\u5927\u4FEE.unity"
+    guid: a543a81da812d5f4abb7640b2f65feac
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u4F20\u52A8\u673A\u6784\u548C\u8F6C\u52A8\u90E8\u4EF6\u5927\u4FEE.unity"
+    guid: 3887660294457434d89bad5129ba556a
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u5BFC\u7535\u90E8\u5206\u5F02\u5E38\u68C0\u4FEE.unity"
+    guid: a791221d330ced24fb9983d049c37939
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u6CD5\u5170\u90E8\u4EF6\u66F4\u6362.unity"
+    guid: 76147a3688923994cba742500eed4c51
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u9694\u79BB\u5F00\u5173-GW22\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 9263387a8745ebb499a01812f7fdbc77
+<<<<<<< HEAD
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u8F74\u627F\u5EA7\u5927\u4FEE.unity"
+    guid: 296eeba5d42edff41a1a54271cbac86b
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 230b3e331b8cf7543b6988b80e726c83
+  - enabled: 1
+=======
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u89E3\u4F53\u5927\u4FEE.unity"
+    guid: 230b3e331b8cf7543b6988b80e726c83
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u8F74\u627F\u5EA7\u5927\u4FEE.unity"
+    guid: 296eeba5d42edff41a1a54271cbac86b
+  - enabled: 0
+>>>>>>> feature/jinxin
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/110kV\u65AD\u8DEF\u5668-LW35\u578B\u624B\u52A8\u7535\u52A8\u5206\u5408\u95F8\u68C0\u67E5.unity"
+    guid: 1e8f7fea301c5e94e9c0749bdec61ea7
+  m_configObjects: {}

+ 68 - 0
ChivaTechFramework/ProjectSettings/EditorBuildSettings_LOCAL_1767.asset

@@ -0,0 +1,68 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/ChivaFramework/Author/Author.unity
+    guid: 5c5c8597de35c6f4483e852f5d465ef3
+  - enabled: 1
+    path: Assets/Scenes/AsyncLoad.unity
+    guid: 1dd9e366d4f9e8b418bc56a692130e37
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/110kV\u9694\u79BB\u5F00\u5173\u4F8B\u884C\u68C0\u4FEE\u7CFB\u7EDF.unity"
+    guid: c3d853339305ce840a91a2f784892a2f
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u4E09\u76F8\u4E00\u4F53\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u7ED3\u6784\u62C6\u89E3.unity"
+    guid: 9f9a7ff8bb2ab9c4c9c16050ce9200d6
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u547C\u5438\u5668\u66F4\u6362.unity"
+    guid: a413b3cfd313e1941b9f25138fe3dca0
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/220kV\u6CB9\u6D78\u5F0F\u53D8\u538B\u5668\u8865\u6CB9.unity"
+    guid: 5cafa2b47302e4941bd3d900883a4658
+  - enabled: 0
+    path: Assets/Scenes/OldLoad.unity
+    guid: 65885eff9dcdb8843b72f55c4c595c77
+  - enabled: 0
+    path: "Assets/Scenes/\u6C42\u8BC6\u5236\u4F5C\u573A\u666F/\u53D8\u538B\u5668\u9AD8\u538B\u4FA7\u76F4\u963B\u8D85\u6807\u5904\u7406_old.unity"
+    guid: 2e57631a16e36444c9f7e2342b70ecca
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/10kV\u771F\u7A7A\u65AD\u8DEF\u5668\u53CA\u5F00\u5173\u67DC\u4F8B\u884C\u68C0\u4FEE.unity"
+    guid: 9d06aab5d54543949908336e9bcebdc8
+  - enabled: 0
+    path: "Assets/Scenes/\u90D1\u5DDE\u7535\u4E13\u5236\u4F5C\u573A\u666F/35kV#1SVG\u5F00\u51733K1\u65AD\u8DEF\u5668\u8FD0\u884C\u8F6C\u68C0\u4FEE.unity"
+    guid: 2d0aef51c43920748a51e97a2c2a17f4
+  - enabled: 0
+    path: "Assets/Scenes/\u5185\u8499\u673A\u7535-\u53D8\u7535\u8FD0\u7EF4\u7535\u6C14\u8BD5\u9A8C\u865A\u62DF\u4EFF\u771F\u5B9E\u8BAD\u7CFB\u7EDF/\u65AD\u8DEF\u5668\u56DE\u8DEF\u7535\u963B\u6D4B\u8BD5\u4EFF\u771F.unity"
+    guid: af429b879ef875448a3cc4cbb99c319c
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u622A\u56FE01.unity"
+    guid: 7b72b898ba48e7a4483fb152abbaaa85
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE\uFF08\u98CE\u6247\u7535\u673A\u66F4\u6362\u3001\u6F5C\u6CB9\u6CF5\u66F4\u6362\u3001\u6CB9\u6D41\u7EE7\u7535\u5668\u66F4\u6362\uFF09.unity"
+    guid: 22ca87101e39c6e4e81a9512284b9502
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357\u7535\u7F51-\u53D8\u7535\u68C0\u4FEE\u4EFF\u771F\u57F9\u8BAD/220kV\u65AD\u8DEF\u5668-LW25\u578B\u64CD\u52A8\u673A\u6784\u89E3\u4F53\u68C0\u4FEE.unity"
+    guid: 8fd8b362c86fa9a44b6bbc678225f568
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6F5C\u6CB9\u6CF5\u66F4\u6362).unity"
+    guid: 35d9070ff0a3b9443b00a33b5e949de0
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u98CE\u6247\u7535\u673A\u66F4\u6362).unity"
+    guid: 2db95636f76d59440bf375876376f3cb
+  - enabled: 0
+    path: "Assets/Scenes/\u4E91\u5357/\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6CB9\u6D41\u7EE7\u7535\u5668).unity"
+    guid: 749cec40e080690498d78e5076301031
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6CB9\u6D41\u7EE7\u7535\u5668).unity"
+    guid: da26339052ad1ab4da98ac96965d7dc8
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u6F5C\u6CB9\u6CF5\u66F4\u6362).unity"
+    guid: 91391ec273c4d87439ac2a5921c15756
+  - enabled: 1
+    path: "Assets/Scenes/\u4E91\u5357/\u81EA\u7531\u6A21\u5F0F\u4E3B\u53D8\u51B7\u5374\u6563\u70ED\u7CFB\u7EDF\u5927\u4FEE(\u98CE\u6247\u7535\u673A\u66F4\u6362).unity"
+    guid: 616d391e618a577468222c890205710f
+  m_configObjects: {}

+ 8 - 0
ChivaTechFramework/ProjectSettings/EditorBuildSettings_REMOTE_1767.asset

@@ -0,0 +1,8 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes: []
+  m_configObjects: {}