@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 19492b8d4adc99c49988bb52b0516d06
+guid: 4576c3bad36d6494fad282e24ce5ee9a
folderAsset: yes
DefaultImporter:
externalObjects: {}
@@ -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,8 +0,0 @@
-fileFormatVersion: 2
-guid: e9fb17934c34f1f498103dfa1fabda81
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
@@ -1,6 +1,6 @@
<<<<<<<< HEAD:ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修(吊罩检修)-中 (备份).unity.meta
-guid: ec016e6d1be4ff74bacdefa1262b1178
+guid: f17050feeebe5724c8a26a7fc45edd6d
========
guid: da252e6bef93aa44e979193d789ba4da
>>>>>>>> feature/JNHJ:ChivaTechFramework/Assets/Scenes/云南/220kV主变-主变解体大修(回装).unity.meta
+guid: f268140792a369d47bd754767618b028
<<<<<<<< HEAD:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/220kV主变-主变解体大修(拆解).xlsx.meta
-guid: 97cb5b6c7c56bb7458e3c45d79cf527b
+guid: d6f6846364bf09143845f498b5987c41
guid: fb4bdb920448fee419c391d43f854ba9
>>>>>>>> feature/jinxin:ChivaTechFramework/Assets/StreamingAssets/Config/流程配置/10kV真空断路器-VS1型分合闸线圈更换及特性试验.xlsx.meta
@@ -1,6 +1,5 @@
-guid: 7d3c77e11ed28904dad55174a962cb4f
+guid: e9067fc9fb1cdc94ea3e352108514cfc
userData:
+guid: 5b1453742af6d0c49992a56774578ebb