first test
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
<<<<<<< HEAD
|
||||
guid: 51abf582baf2aab459968bb1990d0721
|
||||
=======
|
||||
guid: 7d462475aa39c2a4db80b0368d5a573a
|
||||
>>>>>>> c95a54dace4cf3733823269953614a5bc163b79d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0a566e8a8a250644c90e3ccff901f321
|
||||
guid: c77c73b46d8a1bf4592b3cca10be9dcb
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f2a9e023801739e4f9878602f1b22b5b
|
||||
guid: adfe0b449f8cf9b469093db339fe336a
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 772af81aca85a5e41a70c0f02b7c7f5f
|
||||
guid: a0b06f150cff247429c3a8dfd50f0a45
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 15fa9d4aa26e16c4f8937004c29fdeb6
|
||||
guid: 406d45715888d5f498c25d61baa30b37
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bd8c98095815b8f49bb712050eac80d1
|
||||
guid: b542ba25e1e384d4482fec92b6af25cf
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9626116148d5e1148aea5edd2d934554
|
||||
guid: cf0740607b128774f92434c29bd076cb
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6cba3720f5262ff4eb95ef5a81312186
|
||||
guid: eb2f850877304114892b1f7f9be9b5a6
|
||||
ModelImporter:
|
||||
serializedVersion: 20200
|
||||
internalIDToNameTable: []
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fa95bd10b86639f4b9f47aa879bfd172
|
||||
guid: 5127f0406076e444fb14dd3d97de8ec0
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 647f5f9ee05bc15458f17a32eccb4741
|
||||
guid: f2169110801054947bb5dd57fba703b5
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1f1d34a1973181b41a2ca913a895accb
|
||||
guid: cb5d9db8d05678041a1fbe0352406f03
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1a1d2fc5ad81d434d9939ff498bfb621
|
||||
guid: 031616d284031de4199a08c84a08afcd
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 887858c5cd9e03648a483fb9ef4eb474
|
||||
guid: 6b557c6dd218e2843b56d9a2971797ec
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a7b35b86a0eb6474896897be148632dd
|
||||
guid: d00adb4b33311ec4c85218178da963a8
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 87a1668f0be4806459829331d38c4f45
|
||||
guid: 39e50df32539758428205096569ae131
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 970ccda6fb96ee74ea15c40aad0b3cbf
|
||||
guid: 1ed78e292803cef489f0778f653ee02d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9ec5529e57c40d14fadb19c931db7093
|
||||
guid: cf576708704895040b37db07c898c8d2
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 47e3b580cd0bc9d4baaa88eee6455384
|
||||
guid: d3cc2af8d64c1244389a371763567bde
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 450f52786c8ee4b4196464e77eb1903d
|
||||
guid: 312ec37dccb98ed4d8f334e14ffcab20
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0771fc3d83441904ab4e78f02c462874
|
||||
guid: ab733a82f3c5dea44990517c27122e46
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c279c74e750cee643b348e0981d8c1d4
|
||||
guid: 80e745fd3cb592544bbc69bf1040716b
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7a6b8a2ab15892848a3c71549f20acd3
|
||||
guid: d78fd07dfdd51e14aa246336d076e21d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2b73ed60d670e6146b82a38bd2ccfb61
|
||||
guid: 69a77a1df231ca3429576e1a3de8230d
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6960158d6f82cc548ae9fe5b9b532f2f
|
||||
guid: f6a94983d46654f49aaab026f7d1317c
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 37c1dc827fc2c0f43b7b86267b3fb184
|
||||
guid: 208f769fc5eb2bc46848480c39c38711
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2586147e9b548c94a92695b6b27db402
|
||||
guid: ce181c03f421b0143b6521513c4830a8
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4721cdd35e7ff89439512a846a0ca36c
|
||||
guid: 59d5de0a16e9c824793360654695eab5
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e6a12616add06f44bb557420ae6d193a
|
||||
guid: 81bdd001ca11fd24cb3e40f726d888b1
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c705c6689b0138f44bdf9a53f206a372
|
||||
guid: 3901c468f5a0d19418c0b0311fc5cad5
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 31a7b8599f43ba8459d61cdb5abe67d7
|
||||
guid: 709a14c4283765944ae672f4858a99d6
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61a989ebec8b7d34f8f057a8d3bbe071
|
||||
guid: 7a21286f82d661342ab3d539377f748f
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1f1b0c19b099fb94ab2494911c30b2be
|
||||
guid: 5c305f32c09099f4790dff46f274acec
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 74b65ce0a63483b41addb73a2b1579cd
|
||||
guid: 76b95f86375f9224ab6f9a27d77d0337
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f2e9b44ba5b024346bf8505c703b51b4
|
||||
guid: 8a98a68b5519aaf46861a858916863b9
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5facc9d3d6097124a96f06a9f6f2ce14
|
||||
guid: cefec71fa3829144990a6b8521240220
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a561aa80fdd1a2d44a33bd43553cfa9c
|
||||
guid: e13df99573dd4a74b85f50134bd42ad0
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6c488a5c51648d8429be8069ae71e31e
|
||||
guid: 2e0c63c549197f44dae76b116509e6e9
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 26a6ec8adb80ffc4a958f55689608efa
|
||||
guid: 9287fd839a13c7146866a938ac6c7fb0
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4d30b5f5808449e45a4f7b6a70df495e
|
||||
guid: 291167fa68e2cdc4c948d403d528954f
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 22bbb58179385d44a8218020b34e8cc7
|
||||
guid: d1488131714c78c43b915d6746dd87bf
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 783d783b97ceedd45a1fb0d01682387f
|
||||
guid: f89819fad8e69ac4393ddc054d831c55
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0cf75869f00cc064a99229da6d0f2e21
|
||||
guid: c4bd6b9c33481094aa40e18117a510c8
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c7cb0fe7a9b408d4695367f16293d04e
|
||||
guid: a39360fecd3716a4eb6bb4d218772842
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4e740387b96352f40b60af38467a32af
|
||||
guid: 06abc5264ed15fd4f9d6bb41c5be9011
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f500ef0b76c776340916e5d5cad2dedf
|
||||
guid: ba66909610962fb4fa29a1aafd86e690
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 12fda1bb65563024f830e356aea7dbb1
|
||||
guid: 81832e7ac8b32174595ea77b6c4c36df
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a38db46e655640243810dbe8f126c32d
|
||||
guid: 58fb507d5746a1b48beacc57cd506b07
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 06de41f740a438646bd23ae56ddcae91
|
||||
guid: 7c171b375622d574caccb9bc4e322b62
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b471425be9280b945b8fa1caa4b142fd
|
||||
guid: 3890ce192cad024428221368d4a0bb90
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 903d4df725093be4284e8ecc752b2fdd
|
||||
guid: 57371981c9e5a4c4c9923f0fd9927bfc
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5c42d7d6d337a7548a2c18293b483101
|
||||
guid: bdb22542b7a027b44a45b181690c3961
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
@@ -7,7 +7,7 @@ TextureImporter:
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
@@ -52,7 +52,7 @@ TextureImporter:
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 0
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ba4a32f950f2fb645a27f6b0993e567b
|
||||
guid: 8aa0abc68e89329408f54d2fc6893345
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c0406ac1ef71aa4478382ce86b97b9c6
|
||||
guid: 1c451ea90b9ac124dba67cb8b8438ee6
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
Reference in New Issue
Block a user