Merge branch 'fang/tourn' into 'dev_20231009'

波次锦标赛、竞技场锦标赛

See merge request b6-client/b6-unity!19
This commit is contained in:
陈希 2023-09-28 03:51:59 +00:00
commit ebb7db4e18
123 changed files with 25992 additions and 433 deletions

View File

@ -41,6 +41,8 @@ MonoBehaviour:
- {fileID: 21300000, guid: 0762713162f99b5498194943c615f10f, type: 3} - {fileID: 21300000, guid: 0762713162f99b5498194943c615f10f, type: 3}
- {fileID: 21300000, guid: 67a8896c656220b4589cfb6b575d2182, type: 3} - {fileID: 21300000, guid: 67a8896c656220b4589cfb6b575d2182, type: 3}
- {fileID: 21300000, guid: 9545ed746bdf7324690f022acf842dfd, type: 3} - {fileID: 21300000, guid: 9545ed746bdf7324690f022acf842dfd, type: 3}
- {fileID: 21300000, guid: 7e57388d1437a9a4694006447fddcfc6, type: 3}
- {fileID: 21300000, guid: cc0683a968773ff4a9f88208ccba3221, type: 3}
- {fileID: 21300000, guid: 51db9ab67bf21b940ad6d1558fdc549c, type: 3} - {fileID: 21300000, guid: 51db9ab67bf21b940ad6d1558fdc549c, type: 3}
- {fileID: 21300000, guid: bdf66a84ca42eb84dbba2b0ff569c46b, type: 3} - {fileID: 21300000, guid: bdf66a84ca42eb84dbba2b0ff569c46b, type: 3}
- {fileID: 21300000, guid: 7aa4cf1671d2abb428e9efd1b05f2099, type: 3} - {fileID: 21300000, guid: 7aa4cf1671d2abb428e9efd1b05f2099, type: 3}
@ -57,4 +59,4 @@ MonoBehaviour:
- {fileID: 21300000, guid: ef8a35cfb6a1ce64a8ca2f92cfd02297, type: 3} - {fileID: 21300000, guid: ef8a35cfb6a1ce64a8ca2f92cfd02297, type: 3}
- {fileID: 21300000, guid: 0571651624e4fa54abb05c2668eb20ab, type: 3} - {fileID: 21300000, guid: 0571651624e4fa54abb05c2668eb20ab, type: 3}
- {fileID: 21300000, guid: d14332356f8b7f74f93ab5e69da2bc97, type: 3} - {fileID: 21300000, guid: d14332356f8b7f74f93ab5e69da2bc97, type: 3}
spriteNameList: 5eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d5fb071e060b071e061b071e062b071e063b071e064b071e065b071e066b071e0110efddb120efddb130efddb140efddb150efddb160efddb6c6b2a056d6b2a056e6b2a056db6df2d6eb6df2d8d56fb9b8e56fb9b0673dde60773dde610f4d0f4c23b6404c33b6404e3fcb3a7032df98a82068b0583068b05fb068552fc068552fd068552ad279fe6ae279fe6af279fe6b0279fe6 spriteNameList: 5eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d5fb071e060b071e061b071e062b071e063b071e064b071e065b071e066b071e0110efddb120efddb130efddb140efddb150efddb160efddb6c6b2a056d6b2a056e6b2a056db6df2d6eb6df2d8d56fb9b8e56fb9b380d789d390d789d0673dde60773dde610f4d0f4c23b6404c33b6404e3fcb3a7032df98a82068b0583068b05fb068552fc068552fd068552ad279fe6ae279fe6af279fe6b0279fe6

View File

@ -85,6 +85,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: 14ad4f38009bb6047b202a1be6186579, type: 3} - {fileID: 21300000, guid: 14ad4f38009bb6047b202a1be6186579, type: 3}
- {fileID: 21300000, guid: e0af49586b6e08845a1449755f0a8bb6, type: 3} - {fileID: 21300000, guid: e0af49586b6e08845a1449755f0a8bb6, type: 3}
- {fileID: 21300000, guid: 33742a69dfc2db342b7024db4a13350f, type: 3} - {fileID: 21300000, guid: 33742a69dfc2db342b7024db4a13350f, type: 3}
- {fileID: 21300000, guid: cc0683a968773ff4a9f88208ccba3221, type: 3}
- {fileID: 21300000, guid: 876299a9b17a67c46be2a48ecad9bdb0, type: 3} - {fileID: 21300000, guid: 876299a9b17a67c46be2a48ecad9bdb0, type: 3}
- {fileID: 21300000, guid: c323612a846c8d94792aa7a298572f53, type: 3} - {fileID: 21300000, guid: c323612a846c8d94792aa7a298572f53, type: 3}
- {fileID: 21300000, guid: 5307c05ab6598f34f99fe9f1b4a40e3a, type: 3} - {fileID: 21300000, guid: 5307c05ab6598f34f99fe9f1b4a40e3a, type: 3}
@ -97,6 +98,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: e28dfe8ca34221e458141880d94104d4, type: 3} - {fileID: 21300000, guid: e28dfe8ca34221e458141880d94104d4, type: 3}
- {fileID: 21300000, guid: 87c1a1ccd91ce7f42982499c4925b555, type: 3} - {fileID: 21300000, guid: 87c1a1ccd91ce7f42982499c4925b555, type: 3}
- {fileID: 21300000, guid: 3569dfdcd6f978f4ab5fd10e9a6abf83, type: 3} - {fileID: 21300000, guid: 3569dfdcd6f978f4ab5fd10e9a6abf83, type: 3}
- {fileID: 21300000, guid: 7e57388d1437a9a4694006447fddcfc6, type: 3}
- {fileID: 21300000, guid: 2e590d0eb7f248749aca7f67745b21c5, type: 3} - {fileID: 21300000, guid: 2e590d0eb7f248749aca7f67745b21c5, type: 3}
- {fileID: 21300000, guid: 8c3ca04eb36a76a478721536e16a82f7, type: 3} - {fileID: 21300000, guid: 8c3ca04eb36a76a478721536e16a82f7, type: 3}
- {fileID: 21300000, guid: caa7705ea3a1b044db4413eeb49d394e, type: 3} - {fileID: 21300000, guid: caa7705ea3a1b044db4413eeb49d394e, type: 3}
@ -130,6 +132,7 @@ SpriteAtlas:
- act_common_select - act_common_select
- act_common_bg_2 - act_common_bg_2
- act_common_chest_1 - act_common_chest_1
- act_common_menu_2
- act_common_bg_5 - act_common_bg_5
- act_ranking_3 - act_ranking_3
- act_common_bg_4 - act_common_bg_4
@ -142,6 +145,7 @@ SpriteAtlas:
- act_common_bg_7 - act_common_bg_7
- act_common_progress_bg_1 - act_common_progress_bg_1
- act_common_dec_1 - act_common_dec_1
- act_common_menu_1
- act_common_bg_13 - act_common_bg_13
- act_common_bg_11 - act_common_bg_11
- act_common_bg_12 - act_common_bg_12

View File

@ -71,6 +71,7 @@ MonoBehaviour:
- {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3} - {fileID: 21300000, guid: 4e52f863d256e2b45aa84ecbf844ee89, type: 3}
- {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3} - {fileID: 21300000, guid: 2b61c72119833dc47ad00f1de32145c3, type: 3}
- {fileID: 21300000, guid: 404c6896d4f37d948bdc120a8f209d2c, type: 3} - {fileID: 21300000, guid: 404c6896d4f37d948bdc120a8f209d2c, type: 3}
- {fileID: 21300000, guid: de2410b5cd93ab344918ec333608859a, type: 3}
- {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3} - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3}
- {fileID: 21300000, guid: 37058029318370c46be63c3fbe4d1758, type: 3} - {fileID: 21300000, guid: 37058029318370c46be63c3fbe4d1758, type: 3}
- {fileID: 21300000, guid: 15b627938e203f545ac49661789d7351, type: 3} - {fileID: 21300000, guid: 15b627938e203f545ac49661789d7351, type: 3}
@ -210,4 +211,4 @@ MonoBehaviour:
- {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3}
- {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3}
- {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3}
spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d056d861a066d861a076d861a8c243e8d8d243e8d8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402efbed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1aa49b7ac57d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a922baf4357abe63dbff20842826e418d7a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47252af848262af848272af8484c159f46a07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb696e3feee158aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d056d861a066d861a076d861a8c243e8d8d243e8d8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402efbed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1aa49b7ac57d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a922baf4357abe63dbff20842826e418d7a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47252af848262af848272af8484c159f46a07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb696e3feee158aa025459aa0254a15c468d14c42155b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158

View File

@ -124,6 +124,7 @@ SpriteAtlas:
- {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3} - {fileID: 21300000, guid: e71034853e8f2eb4e9be049af351872e, type: 3}
- {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3} - {fileID: 21300000, guid: b143f69564fbebd479463ddf96a9685a, type: 3}
- {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} - {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3}
- {fileID: 21300000, guid: de2410b5cd93ab344918ec333608859a, type: 3}
- {fileID: 21300000, guid: acd148c524edafa4c83cad76eb65e5df, type: 3} - {fileID: 21300000, guid: acd148c524edafa4c83cad76eb65e5df, type: 3}
- {fileID: 21300000, guid: 41712ec52dced184b8169064ac650484, type: 3} - {fileID: 21300000, guid: 41712ec52dced184b8169064ac650484, type: 3}
- {fileID: 21300000, guid: 324d3fc5bf7f47241865971067a87b80, type: 3} - {fileID: 21300000, guid: 324d3fc5bf7f47241865971067a87b80, type: 3}
@ -322,6 +323,7 @@ SpriteAtlas:
- common_btn_grey_1 - common_btn_grey_1
- common_bg_6 - common_bg_6
- common_star_1 - common_star_1
- common_board_134
- common_point_2 - common_point_2
- common_title_14 - common_title_14
- common_line_5 - common_line_5

View File

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

View File

@ -0,0 +1,49 @@
ui_act_tourn_arena_title.png
size:1024,1024
filter:Linear,Linear
duanwei
bounds:688,842,200,151
offsets:1,1,202,153
g1
bounds:1,73,398,459
offsets:7,27,413,487
g2
bounds:1,534,560,459
offsets:9,27,579,487
hao1
bounds:401,343,189,158
rotate:90
hao2
bounds:401,170,171,140
offsets:1,1,173,142
rotate:90
hao3
bounds:688,684,186,156
offsets:1,1,188,158
hao4
bounds:688,542,171,140
offsets:1,1,173,142
qi
bounds:563,288,705,123
rotate:90
xx1
bounds:1,29,42,42
offsets:2,2,46,46
xx2
bounds:543,323,18,18
offsets:1,1,21,20
xx3
bounds:688,514,26,26
offsets:2,2,30,30
xx4
bounds:1,1,26,26
offsets:2,2,30,30
xx5
bounds:401,140,28,28
offsets:2,2,32,32
xx6
bounds:45,45,26,26
offsets:2,2,29,30
xx7
bounds:890,961,33,32
offsets:1,2,35,36

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 47c9b03a616a2c1409f93f64319629c3
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

View File

@ -0,0 +1,120 @@
fileFormatVersion: 2
guid: dea00c8a9f4918b4f9fc58e39471895b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6186b117e26ad1a41b0e83ba1e9d61a1
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: ui_act_tourn_arena_title_atlas
m_EditorClassIdentifier:
atlasFile: {fileID: 4900000, guid: 47c9b03a616a2c1409f93f64319629c3, type: 3}
materials:
- {fileID: 2100000, guid: 0c1dc93dde833c449a3de505be20410a, type: 2}

View File

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

View File

@ -0,0 +1,40 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ui_act_tourn_arena_title_material
m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3}
m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: dea00c8a9f4918b4f9fc58e39471895b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Cutoff: 0.1
- _OutlineMipLevel: 0
- _OutlineOpaqueAlpha: 1
- _OutlineReferenceTexWidth: 1024
- _OutlineSmoothness: 1
- _OutlineWidth: 3
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 1
- _ThresholdEnd: 0.25
- _Use8Neighbourhood: 1
m_Colors:
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
m_BuildTextureStacks: []

View File

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

View File

@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: ui_act_tourn_arena_title_skeletondata
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: 2ebf52a5fa8c7df4a9776eeaa9e30bfa, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 6186b117e26ad1a41b0e83ba1e9d61a1, type: 3}
isUpgradingBlendModeMaterials: 0
blendModeMaterials:
requiresBlendModeMaterials: 0
applyAdditiveMaterial: 0
additiveMaterials: []
multiplyMaterials: []
screenMaterials: []
skeletonDataModifiers: []
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 KiB

View File

@ -0,0 +1,120 @@
fileFormatVersion: 2
guid: 5b2ed82b032a70943af92581cd150f43
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: 7e57388d1437a9a4694006447fddcfc6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: cc0683a968773ff4a9f88208ccba3221
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1,132 @@
fileFormatVersion: 2
guid: de2410b5cd93ab344918ec333608859a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 23, y: 23, z: 23, w: 23}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 47
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 50
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 12
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,4 @@
bf_encrypt_luai)1X+H-ø8GH:uua0
3D9xI4k5MR0qYxsNX9Z#4Y^[ 2P 0kZ8 ^.]I Z!'Qqqi8reD9xH6]5MR;qrisòeDsø‰´!5<>Ó:1qésòeDsxˆ´<>Ó:1qèsòeDsøˆ´!uŒÓ:1ñësòeDs¸ˆ´!5ŒÓ:1qësòeDs8´!5<>Ó:1qísòeDsø´!µŒÓ:1qêsòeDsxŠ´<>Ó:1ñìsòeDs8Š´!õŒÓ:1ñêsòeDs¸Š´!µŽÓ:1qîsòeDsx<73>´!u<>Ó:1ñísòeDsø<73>´!u‰Ó:1ñásòeDs¸<73>´<>Ó:1qìsòeDsxI¾!µ<>ØVqqhråD/xI4x4MR0qqi8vo4V'@4B$<#sqi8reD9|BD\#&o]aaD9xI4k5^Q0qqi8reW?xI4k5MR#yqi8reD9kL4k5MR0qbc8reD9xI'g5MR0qqi+ueD9xI4k&CR0qqi8rvT9xI4k5MA9qqi8reD*jI4k5MR0bei8reD9xZ?k5MR0qqz.reD9xI4x-MR0qqi8v` X (0mV"'^pi8rdD9xI4]5MR1qqi:reD:xI4o5MR5qqi>reD>xI4c5MR9qqi2reD2xI4g5MR=qqi6reD6xI4{5MR!qqi*reD*xI45MR%qqi.reD.xI4s5MR)qqi"reD"xI4w5MR-qqi&reD&xI4K5MRqqireDxI4O5MRqqireDxI4C5MRqqireDxI4G5MRqqireDxI4[5MRqqi reD xI4_5MRqqireD;xI4pT.&YA-+L
'k
G(<Q.Qu9xIk5MUSQQD9x4k5LR0qt6}<3

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 96e6bbbe1a18a1f4284a17f6baae8e32
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c51ea1f8360dd5b4f80aac413dffde77
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d8f2c0345df51d34fad2405a71ad195a
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7c49e4bd6c6f87c409deb2cdc350b1bb
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c880aba717fa0c44fa8185466992dffa
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f32de45dea999a8469056c651532f65e
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ca77a812a8e17224ebba28729a36071f
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 22c6b45b55ac32a488b21b2c6cea0c35
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f961440bcef1c4743950c4f6e00f3ade
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0fb8d2192e40b5b43ac0019091b1f1d3
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 67f80c1f70c299d44b9efff179f882ba
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 343d3d4990d81d1488dd7e9e00ad1259
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: de62c13295bad474f96bfc3d2b0e6aab
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 49211a31464abda4c8d2c2257b6f0312
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2386ebd5aaea81647816e65a8c5f1a7d
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0b744e85b0ecf8447bc954b68623ca33
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 25a0e957913b70841b8e45dfec535eb7
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 795809af19ea29549a280768d36baa23
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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