Fixed merge conflict

This commit is contained in:
2026-03-28 11:18:01 +01:00
407 changed files with 183557 additions and 1971 deletions

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b63e0053080646b9819789bf3bf9fa17
guid: a02f1d9a228cbe24f9a08123375b5a99
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 73a79399807f4e8388c2cbb5494681ca
timeCreated: 1484172033
licenseType: Pro
guid: 8cd13c09d91d4f74487e1489c3a8683c
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,19 +1,21 @@
fileFormatVersion: 2
guid: 997a43b767814dd0a7642ec9b78cba41
timeCreated: 1484172033
licenseType: Pro
guid: 98234b1166120f645ae08ae53aa054c3
TrueTypeFontImporter:
serializedVersion: 2
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 1
characterPadding: 0
characterSpacing: 0
characterPadding: 1
includeFontData: 1
use2xBehaviour: 0
fontNames: []
fontNames:
- Anton
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: efe0bf4ac872451e91612d1ae593f480
timeCreated: 1484171296
licenseType: Pro
guid: d7a505afb48e54147b360a6dcf4be474
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,19 +1,21 @@
fileFormatVersion: 2
guid: 5dd49b3eacc540408c98eee0de38e0f1
timeCreated: 1484171297
licenseType: Pro
guid: 8fa834054279e22409f8819a64891d3f
TrueTypeFontImporter:
serializedVersion: 2
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 1
characterPadding: 0
characterSpacing: 0
characterPadding: 1
includeFontData: 1
use2xBehaviour: 0
fontNames: []
fontNames:
- Bangers
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 8a2b9e2a607dd2143b58c44bc32410b4
guid: 90b2a461b3cab6c43ac09c2321066707
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
@@ -8,7 +8,6 @@ TrueTypeFontImporter:
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontName: Electronic Highway Sign
fontNames:
- Electronic Highway Sign
fallbackFontReferences: []

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: d2cf87a8a7a94aa8b80dff1c807c1178
timeCreated: 1484171296
licenseType: Pro
guid: 70e1963478aa38b4c9138f5329841d2f
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,19 +1,21 @@
fileFormatVersion: 2
guid: c9f6d0e7bc8541498c9a4799ba184ede
timeCreated: 1484171297
licenseType: Pro
guid: b88cbd21457ab864bad2d391f1c8ab27
TrueTypeFontImporter:
serializedVersion: 2
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 1
characterPadding: 0
characterSpacing: 0
characterPadding: 1
includeFontData: 1
use2xBehaviour: 0
fontNames: []
fontNames:
- Oswald
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: f28c334d44214474d9702d3ad79ecb0a
timeCreated: 1484171296
licenseType: Pro
guid: 44c0310b434525e4a917abeca89c2a02
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: f0303f887b8fa7243a51432c478ff2f3
timeCreated: 1484171296
licenseType: Pro
guid: b2c2835be4742b4489866842096d01fe
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4beb055f07aaff244873dec698d0363e
guid: 48506c3038849b044be7e1ff90243438
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
@@ -8,7 +8,6 @@ TrueTypeFontImporter:
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontName: Roboto
fontNames:
- Roboto
fallbackFontReferences: []

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 0251f66ebc602a944b35bccd13be2738
timeCreated: 1484171296
licenseType: Pro
guid: 6c183fc094f49c245bea25d94e7b7092
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f4eec857a4fdf2f43be0e9f3d1a984e7
guid: 8ef51ac6dd62782409c068e7d730c1fa
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: 5808953df7a24274a851aa6dee52d30e
guid: a250ed4cf17fd584295081fd17346064
folderAsset: yes
timeCreated: 1436068007
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -2,20 +2,26 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Crate - Surface Shader Scene
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION _NORMALMAP _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -59,6 +65,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 0.5
- _Cutoff: 0.5
@@ -82,3 +89,5 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@@ -1,6 +1,8 @@
fileFormatVersion: 2
guid: e6b9b44320f4448d9d5e0ee634259966
guid: a4b25e099a001af469e41823c264aa87
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 3b5cc91c3bf8cf74391252247f52fb59
guid: e99f7f8abefca3849bb746e16c707abc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,8 @@
fileFormatVersion: 2
guid: c719e38f25a9480abd2480ab621a2949
guid: 0bb8119d52bde2846a70a64a9ab841f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,8 @@
fileFormatVersion: 2
guid: aadd5a709a48466c887296bb5b1b8110
guid: a50d3a61f7bac8a408e9714ec619073d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 71529b88994c1a341b22bc57c038674a
guid: 78aae43b5b8309744beda5f6dfa49343
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 22262639920f43d6be32430e4e58350d
timeCreated: 1473643741
licenseType: Pro
guid: d9e7785af74e81e4cb3f5876cd3be6a5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: 5bff2544887143f5807c7d5059d07f79
guid: ef3d5d7654864e947b41240c046caf2c
folderAsset: yes
timeCreated: 1436068007
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: b06f0e6c1dfa4356ac918da1bb32c603
timeCreated: 1435130987
licenseType: Store
NativeFormatImporter:
guid: f397c02c15927b64ba3a9cdcc399a8d7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: a6e39ced0ea046bcb636c3f0b2e2a745
NativeFormatImporter:
guid: 3b35cff6ce503bb4fad3e21e8a638efe
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: fdad9d952ae84cafb74c63f2e694d042
NativeFormatImporter:
guid: 966d25657f18bf5489aa86193385ce93
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: d6d3a169ad794942a21da6a552d62f6f
guid: 5871330726d2c9d4495df47658c99b70
folderAsset: yes
timeCreated: 1436068007
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f422cd1388b01047a58cd07c7a23d9d
guid: a411efc51d3eb1242879bbcae543e7a8
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 479a66fa4b094512a62b0a8e553ad95a
timeCreated: 1468189245
licenseType: Pro
guid: 183c3c44158d7144b91310f2f3f93a9c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 4c86a3366cd840348ebe8dc438570ee4
timeCreated: 1468443381
licenseType: Pro
guid: 5a5cd8e63723e6044bac8b6c106040d7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 5cf8ae092ca54931b443bec5148f3c59
timeCreated: 1468443381
licenseType: Pro
guid: 6faec5fa82b2c2f4ab1f513526c9c832
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 69a525efa7e6472eab268f6ea605f06e
timeCreated: 1468213165
licenseType: Pro
guid: 95b972b7e44cfdf42b01af2ac8a39617
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: 4f1e85c79acf49968737939ce8b445c7
guid: d6885de4a42d5d34191cf4fb1753c1fe
folderAsset: yes
timeCreated: 1436068007
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 749b9069dc4742c5bfa5c74644049926
timeCreated: 1484173523
licenseType: Pro
guid: eb059dcdc9cdcbc479f7a52f4b3b7895
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: a00013af81304728b2be1f4309ee2433
timeCreated: 1484173536
licenseType: Pro
guid: 9fbc17ac926d57546a9b8b1b1581fabe
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 6522f30e342599e4e9dd4cc2cc03c830
guid: d8ebe44138ecee244a10c2c07b727ccb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 8a89fa14b10d46a99122fd4f73fca9a2
timeCreated: 1484172732
licenseType: Pro
guid: 83266ee87de78da4e8bd396c9d253944
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 947a44964e53bf0448ff698b2a2219c0
guid: 14470559b67c0584a974bcb7a57db164
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: f2dcf029949142e28b974630369c8b4e
timeCreated: 1444812175
licenseType: Store
guid: c9b341266409aec4bba8415de91cc877
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: f629c6e43dba4bf38cb74d8860150664
timeCreated: 1455497618
licenseType: Store
guid: 173e631594ff2c149bfc4ab03ba423f7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: d75b8f41e959450c84ac6e967084d3e1
timeCreated: 1426033972
licenseType: Store
guid: d701e9c72d4b4f7418d890f07564ad3e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 6751ce1a4611b3940812c13a6847d94f
guid: 6cfb01a55f3027e48a8f0ddf3887d5bc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,8 @@
fileFormatVersion: 2
guid: f4e195ac1e204eff960149d1cb34e18c
guid: af009a7a572d8804691a7c2f2f7f6eba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,8 @@
fileFormatVersion: 2
guid: 125cb55b44b24c4393181402bc6200e6
guid: 3a1e73289311d604b995eac0973c3c6b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: dc36b3fdc14f47ebb36fd484a67e268a
timeCreated: 1487729771
licenseType: Pro
guid: 3048b93456ef31c45899001d8c106814
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 8b29aaa3eec7468097ff07adfcf29ac9
timeCreated: 1484213182
licenseType: Pro
guid: 6ea764fe8f0e2c147addee65b33cf7ef
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 9ad269c99dcf42b7aedefd83dd5a7b9d
timeCreated: 1484174016
licenseType: Pro
guid: 262315d717ed6b840a0ec0e48e681201
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 42df1c7856584b6b8db9a509b6b10074
timeCreated: 1484173785
licenseType: Pro
guid: 39a0d54bc74aacb42ae9422143479f75
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 0161d805a3764c089bef00bfe00793f5
timeCreated: 1484171878
licenseType: Pro
guid: 916376ccf9316424792dee894183e392
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: b246c4190f4e46ec9352fe15a7b09ce0
timeCreated: 1487723245
licenseType: Pro
guid: 4e614df2e6343df40a311981c9b7949f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 2ddca8f46aa0838419d568affb0ca6b4
guid: 94b002a29f58e8f47bdc9fcb3d58dda0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: e6b276ec991f467aa14ef1f3cc665993
timeCreated: 1487723313
licenseType: Pro
guid: 9292abfc09874d34c8bc005614e41e22
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 90722b8bd74d9aa49958562aff7bdf76
guid: b94be58768b9e7d4d9feedb680bb8305
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 5302535af1044152a457ed104f1f4b91
timeCreated: 1487723159
licenseType: Pro
guid: 8a2311666a6dcb247b69259cea098080
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 8d176c01131de8f46ad61094e29d79b2
guid: ed09c04aaf674bc41b4510d08cb75d5b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 967f61bb1e3e28645a39e0cb647cc79e
guid: 7f1078071f6e6ef44b8438176aad4245
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: c9adb1f542a93ae489bacfeae21e8394
guid: f3bc02b892ee9d64a9e79f9e148f90f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: 3ac6db30e75b49b282a3564110579f27
guid: 75230aae57758cd4c87a8f49d67162d1
folderAsset: yes
timeCreated: 1480573362
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: fbef3c704dce48f08a44612d6c856c8d
timeCreated: 1454544381
licenseType: Pro
guid: efc404ea64c129244907024c08cbbc35
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 14aa93acbb234d16aaef0e8b46814db6
timeCreated: 1464163339
licenseType: Pro
guid: a681c8bdc664eea4ab4b235efa448184
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: db1090641b3241f6995b587eb21637bc
guid: 99956038eee542e4586ed3abcfe47b52
folderAsset: yes
timeCreated: 1436068007
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 2ac8cf212df6445e8aebbe3cb832e993
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 54c78572b14813c44b794e4e80c2b1dc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 251716609f634449bfe8ce75c0ed78fe
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 5e871863aff5e284c84d02e47c61eb6f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 21a509e1d3cd49978623fa564adb6f02
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 4249d04a49c9ba04da3ebf3d2e71ac28
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 8f7137eacd7042d5b17ef0efe5e744f5
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: b38d8ed5f61808d46a52c9052d91accb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 70615243e2be4a81afaab9bf5d273d65
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 177490356c5d38b4eb6cead5fbca0667
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: 39a1fa96ad2a449b908fca29d4297a74
guid: a26c0712c847c9c45a92938974c63127
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 03ec435d4b7140e9b2d87f79136d8374
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 132382e556232f041a465f58166ecc30
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: 5fe2257128d9401fad0790f581dc8a6f
guid: ad5066e8aba47f84da84777a15d04f1c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 349f38d3606449708c7340d26740e1e2
timeCreated: 1434495347
licenseType: Store
guid: 055ac47d551311249bbc97268ba51f3f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: c3f814e1d12c45568daf3dd9a86a0e61
timeCreated: 1464165314
licenseType: Pro
guid: 2a22a6e929eb94240b8032bbe4d6941b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 84ed36ad77dd4956b2ffe3769f759879
timeCreated: 1488146780
licenseType: Pro
guid: 8ea4b273e9eca9743a0d3d97f13ed30b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 9747140c28254be2adc582210dfb89b8
timeCreated: 1432629665
licenseType: Store
guid: 5916d7fed0c8ed34ba6f2c56d76383eb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 08572ab7713642c8a60789750f0bce5c
timeCreated: 1468999615
licenseType: Pro
guid: 08290b9b9f3a6dc43a7a1e09a95d0f42
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 875684baf40f4d008ce806d03e2a81b2
timeCreated: 1487545080
licenseType: Pro
guid: db78f5e5d710db54abde1f680a686751
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 22a2fba786ad4c40ac0ba09f0b933100
timeCreated: 1488062344
licenseType: Pro
guid: 8d2038a4fdccd0b4494808af0724efae
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: e76e6c0f81964cbda3fe0b7d26ed8060
guid: 3adb71541f864944d80addb7707b8f8f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 9442cda25baa4a0bb544c4d095b00caa
timeCreated: 1480388889
licenseType: Pro
guid: a515e9c3e2579534ebc3e744ac039660
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 3e2e4d7b0bed4cf9ab827e9f32448f69
timeCreated: 1435300594
licenseType: Store
guid: a6fad3cfd76ae4e4c8ba71780d784a7c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 03f9d74cec8e4b94a29d2dfd177c821b
timeCreated: 1445416487
licenseType: Pro
guid: 6c48d99afdedd8340bdd0bbf07dd54db
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 9abcd5bd764646568a6ea70d00f9264c
timeCreated: 1465858578
licenseType: Pro
guid: f77d6c0ec0d1e84459558110dea19607
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 337f92480dd24675aae9e79210fb1ad9
timeCreated: 1487199155
licenseType: Pro
guid: 4e6d92da49edf1f4d8a03a3d0e3c5da2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 50f52f9274434ecfb34dd87f0836f323
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 789e76b1fc40d9547963636d0b8b2332
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 6250f98e58fe4abbaada5d84b7ca846d
timeCreated: 1449626883
licenseType: Pro
guid: 298237fc91fff5142bf917d491343790
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 54e994244b4b467e8583cf2da6dcc716
timeCreated: 1461311052
licenseType: Pro
guid: 294b815da9b751e409d97d1a49a3af80
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 57694ed9d1cd1e340a4924c0f2eac8e3
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 4788fbea3d51c284f9b5ce1fb785b31c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 8c4969fd8ba94a68b07cf11f3e7a5137
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: e1ccf972cf3a6c1439462aec0e6ce193
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: f9b4c22e15cff344ba9fc6542a58dd07
timeCreated: 1472854817
licenseType: Free
guid: 3348f3fb53f471346919cb8d3dea028f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0851605490a599b46b6ac5cb681d93ea
guid: 6d9dd1aa4544b484da02ebe18e804d11
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3b38a6ba32b869f48812e595baf39746
guid: 58e49b646c7996e41a2723841d788dc0
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a7eaeb4188c60454faf0a41c253b505c
guid: e1f668d9b705a104cb68598b4507317e
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: eea2b7206368b444e84fbec4ec32b64a
guid: 8ae701e53a8890e41ba5e9603d975f67
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 83ba2e375bed45f48bce43e5a5f7c88a
guid: 2aef06b2b94833a408f75ebc7db20923
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,24 +1,7 @@
fileFormatVersion: 2
guid: 16177da2e3254cee91944756d5f8ddd3
labels:
- Mesh
- Text
- Rendering
- TextMesh
- TextMeshPro
- Font
- Dynamic
- Pro
- Fonts
- Advanced
- GUI
- Scene
- Styles
- Style
- Layout
- Atlas
- Kerning
guid: 18519645b3a7b5442ad9510c17bf1765
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: 3979ce59e55144c89a2b3b3f8dcf7fd3
guid: f966755ac03175f4599d94bb9a742cb6
folderAsset: yes
timeCreated: 1436068007
licenseType: Pro
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,10 +1,2 @@
fileFormatVersion: 2
guid: f970ea55f9f84bf79b05dab180b8c125
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
guid: d243a3ae0b53850458ff2616fb0f8b44

View File

@@ -1,10 +1,2 @@
fileFormatVersion: 2
guid: 8ef7be1c625941f7ba8ed7cc71718c0d
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
guid: 9ac27334382f5094ab86aa7acb9a4fe3

View File

@@ -1,11 +1,2 @@
fileFormatVersion: 2
guid: e8538afcddc14efbb5d9e94b7ae50197
MonoImporter:
serializedVersion: 2
defaultReferences:
- TheFont: {instanceID: 0}
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
guid: a8b3c3cd8b369ae4aabd420e1d6e05a4

View File

@@ -1,11 +1,2 @@
fileFormatVersion: 2
guid: a73109742c8d47ac822895a473300c29
MonoImporter:
serializedVersion: 2
defaultReferences:
- TheFont: {instanceID: 0}
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
guid: 8c699a75a7ff09d42b733c567afea925

View File

@@ -1,11 +1,2 @@
fileFormatVersion: 2
guid: dc20866c0d5e413ab7559440e15333ae
MonoImporter:
serializedVersion: 2
defaultReferences:
- TheFont: {instanceID: 0}
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
guid: 47cfe10f8e0c6f341852d701d885c021

View File

@@ -1,10 +1,2 @@
fileFormatVersion: 2
guid: 2d687537154440a3913a9a3c7977978c
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
guid: c684f6c1177153c4686acf2301b3eccf

Some files were not shown because too many files have changed in this diff Show More