diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 0e85ddd0..c873bca7 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,127 +1,32 @@ { -<<<<<<< HEAD - "libview.firstColumnWidth": 356, -======= -<<<<<<< HEAD - "libview.firstColumnWidth": 413, - "libview.iconScale": 0, "doc.openedDocs": [ - "ui://5cdldr01qaqf9c", - "ui://5cdldr01qaqf61", - "ui://442j0uepygxga", - "ui://5cdldr01qaqfo", - "ui://c7j2rnvqtpf01p", - "ui://c7j2rnvqtpf06k", - "ui://c7j2rnvqtpf08q", - "ui://c7j2rnvqtpf06t", - "ui://z3z0ysurygxgd", - "ui://442j0uepygxgd", - "ui://c7j2rnvqtpf06p", - "ui://v6yvqp7waen81b0", - "ui://5cdldr01qaqfe0", - "ui://5cdldr01qaqfcn", - "ui://5cdldr01qaqf4n", - "ui://35sf1c1fr05e9k", - "ui://5cdldr01qaqfa2", - "ui://5cdldr01qaqf46", - "ui://5cdldr01qaqf4w", - "ui://5cdldr01qaqf4t", - "ui://5cdldr01qaqf3y", - "ui://5cdldr01qaqf4e" + "ui://niy3ldiwl9mn14" ], - "auxline1": true, - "canvasColor": 10066329, - "auxline2": true, - "doc.activeDoc": "ui://442j0uepygxgd", - "libview.twoColumn": false, + "libview.iconScale": 0, + "doc.activeDoc": "ui://niy3ldiwl9mn14", + "libview.currentGroup": "", "libview.expandedNodes": [ - "442j0uep", + "27vd145b", "/", - "442j0uep", - "/component/", - "442j0uep", - "/component/create_room/", - "z3z0ysur", + "27vd145b", + "/conMui/", + "niy3ldiw", "/", - "z3z0ysur", + "niy3ldiw", "/component/", - "z3z0ysur", - "/component/create_room/", - "z3z0ysur", - "/component/create_room/images/", - "z3z0ysur", - "/font/", - "z3z0ysur", - "/images/", - "z3z0ysur", - "/mgr/", - "z3z0ysur", - "/mgr/imgs/", - "z3z0ysur", - "/mgr/imgs/game/", "5cdldr01", - "/" - ], - "snapToGrid": true, - "backgroundColor": 6710886, - "libview.currentGroup": "", - "gridSize": 30, - "gridColor": 80 -======= - "doc.openedDocs": [], ->>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed - "libview.iconScale": 0, - "doc.openedDocs": [ - "ui://c7j2rnvqtpf06k", - "ui://c7j2rnvqtpf06t", - "ui://m7iejg46mpllhv2", - "ui://m7iejg46kwi0hkl", - "ui://m7iejg46mpllhv5", - "ui://27vd145blwcl28", - "ui://m7iejg46mkdvhdu", - "ui://c7j2rnvqtpf06q", - "ui://c7j2rnvqtpf02w", - "ui://c7j2rnvqtpf06p", - "ui://c7j2rnvqtpf06l" - ], - "auxline1": true, - "canvasColor": 10066329, - "auxline2": true, - "doc.activeDoc": "ui://c7j2rnvqtpf06k", - "libview.twoColumn": false, - "libview.expandedNodes": [ - "c7j2rnvq", "/", - "c7j2rnvq", + "5cdldr01", "/component/", - "c7j2rnvq", - "/component/ENJCSMui/", - "c7j2rnvq", - "/component/qishou_hu/", - "c7j2rnvq", - "/component/qishou_hu/images/", - "c7j2rnvq", - "/component/result/", - "c7j2rnvq", - "/component/result/component/", - "m7iejg46", + "5cdldr01", + "/component/clearing/", + "v6yvqp7w", "/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/component/play_set/" + "v6yvqp7w", + "/component/", + "v6yvqp7w", + "/component/clearing/" ], -<<<<<<< HEAD - "snapToGrid": true, - "backgroundColor": 6710886, - "libview.currentGroup": "", - "gridSize": 30, - "gridColor": 80 -======= - "libview.firstColumnWidth": 356, + "libview.firstColumnWidth": 413, "libview.twoColumn": false ->>>>>>> 0b0313d1f7fe0999ceff3986fd87f1d7c882b902 ->>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed } \ No newline at end of file diff --git a/fk101/wb_new_ui/assets/Common/package.xml b/fk101/wb_new_ui/assets/Common/package.xml index 86480609..78c9b85f 100644 --- a/fk101/wb_new_ui/assets/Common/package.xml +++ b/fk101/wb_new_ui/assets/Common/package.xml @@ -1139,6 +1139,8 @@ + + diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta index b56b1e15..523bc42f 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/common/af187115a4824290240734622129b80b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_csp47cn9.png.meta b/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_csp47cn9.png.meta index 85dd7ef3..1afdfe95 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_csp47cn9.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_csp47cn9.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta b/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta index 0e1242a2..6a7efe39 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas_ker3j4.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta index 51db036d..4dc9bc5c 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png.meta index a17f4b2f..b8aaf790 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmme.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png.meta index 5ace51d7..c8e788c5 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmf.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png.meta index c7e45dea..be720dd9 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_jokmmg.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta index 1dce6419..c4435ae1 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta index 8df72369..5aed21fb 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx2.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png.meta index 7f0b65d9..e3b3f9e5 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx6.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png.meta index 7d3b937e..75c743f4 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_ld1zx7.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png.meta index 75ab00dc..092f03a5 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png.meta index 5dd18339..3066d00f 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta new file mode 100644 index 00000000..b761bfa6 --- /dev/null +++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d2d1201bd63e5804c9d0d548e95ec807 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7 + assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftf.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftf.png.meta index 2a6694da..87023c72 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftf.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftf.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftg.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftg.png.meta index 938d4859..6caf4a7e 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftg.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqftg.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqfth.png.meta b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqfth.png.meta index 1dd90257..733cc93a 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqfth.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas_qaqfth.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta index 9d41eb5d..3513d16c 100644 --- a/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_atlas0_2.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/newgroup/1876b2140d79b7dc6c2674f954027415 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0_1.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0_1.png.meta index 4eec7cc7..a8e324e1 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0_1.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/majiang/changsha/ui/Extend_MJ_ChangSha_atlas0_1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/changsha/d7829e76d3fb928cdbf041d12e51a83b assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta index 69aab4e7..ab18afa1 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png.meta index 62a60999..6a4cfd7a 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_2.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png.meta index d58d3048..3220a2ae 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_3.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_4.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_4.png.meta index d26918b8..18fd49b5 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_4.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_4.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas10.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas10.png.meta index 02ba4160..d76b41bc 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas10.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas10.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgn1.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgn1.png.meta index 87f7d2e8..2030d854 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgn1.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgn1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgox.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgox.png.meta index 9f9e95f2..b5ca3ba0 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgox.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgox.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgoy.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgoy.png.meta index 3431a9d7..de4c1feb 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgoy.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgoy.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgp0.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgp0.png.meta index 3557e82e..0ecbc499 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgp0.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_kpmgp0.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05esr.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05esr.png.meta index 135cf255..91f2a232 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05esr.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05esr.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05ess.png.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05ess.png.meta index af16ab72..750c0639 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05ess.png.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas_r05ess.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgce.mp3.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgce.mp3.meta index dba286d4..4de2c36c 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgce.mp3.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgce.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgch.mp3.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgch.mp3.meta index a92b35be..9da19f5a 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgch.mp3.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgch.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgd3.mp3.meta b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgd3.mp3.meta index fd9f1cad..1dd7d403 100644 --- a/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgd3.mp3.meta +++ b/fk101/wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_kpmgd3.mp3.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22 assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/Icon/icon.png b/fk101/wb_unity_pro/Assets/Icon/icon.png index 1d33d371..65919880 100644 Binary files a/fk101/wb_unity_pro/Assets/Icon/icon.png and b/fk101/wb_unity_pro/Assets/Icon/icon.png differ diff --git a/fk101/wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs b/fk101/wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs new file mode 100644 index 00000000..116b5e42 --- /dev/null +++ b/fk101/wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs @@ -0,0 +1,141 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; +using System.IO; +using taurus.client; +using taurus.unity; + +class ReadAssetBase : Editor +{ + private static string baseVersion = "1.0.10"; +#if UNITY_IPHONE + static string PACK_PATH = Path.Combine(Path.GetFullPath(Path.Combine(Application.dataPath, "..")), "Pack", "iOS"); +#else + static string PACK_PATH = Path.Combine(Path.GetFullPath(Path.Combine(Application.dataPath, "..")), "Pack", "Android32"); +#endif + static string READ_PATH = Path.Combine(Application.streamingAssetsPath, "Pack"); + static string READ_ZIP = Path.Combine(Application.streamingAssetsPath, "Pack.byte"); + static string READ_VERSION = Path.Combine(Application.streamingAssetsPath, "version.txt"); + + [MenuItem("BuildTools/Read Pack In Local")] + static public void ReadAssetBaseRun() + { + if (!Directory.Exists(PACK_PATH)) + { + Debug.LogError("请打包后再运行解压操作"); + return; + } + try + { + EditorApplication.LockReloadAssemblies(); + EditorUtility.DisplayProgressBar("正在解压资源包中", "请稍候，正在处理资源...", 0f); + if (Directory.Exists(READ_PATH)) + { + Directory.Delete(READ_PATH, true); + } + Directory.CreateDirectory(READ_PATH); + + if (File.Exists(READ_ZIP)) + { + File.Delete(READ_ZIP); + } + + if (File.Exists(READ_VERSION)) + { + File.Delete(READ_VERSION); + } + + string baseString = Path.Combine(Application.streamingAssetsPath , "init2_1.json"); + string baseBytes = File.ReadAllText(baseString); + + ArrayList baseList = (ArrayList)MiniJSON.Json.Deserialize(baseBytes); + for (int i = 0; i < baseList.Count; i++) + { + var tem = (Hashtable)baseList[i]; + string _base_path = Path.Combine("base", tem["name"] as string); + string version = tem["version"] as string; + __UnPack(version, _base_path); + } + + string extendString = Path.Combine(Application.streamingAssetsPath, "init1_1.json"); + string extendBytes = File.ReadAllText(extendString); + + ArrayList extendList = (ArrayList)MiniJSON.Json.Deserialize(extendBytes); + for (int i = 0; i < extendList.Count; i++) + { + var tem = (Hashtable)extendList[i]; + string extendBundle = tem["bundle"] as string; + string[] extendNameTem = extendBundle.Split('/'); + string _extend_path = Path.Combine(extendNameTem); + string version = tem["version"] as string; + __UnPack(version, _extend_path); + } + + string arv = Path.Combine(READ_PATH, string.Format("asset_config{0}.json", baseVersion)); + File.WriteAllText(arv, baseBytes); + string rv = Path.Combine(READ_PATH , "version.txt"); + File.WriteAllText(rv, baseVersion); + File.WriteAllText(READ_VERSION, baseVersion); + + IFilePack zf = null; + zf = new FilePack20(READ_ZIP, PackMode.Write); + zf.PackFile(READ_PATH, ".meta|.manifest"); + zf = null; + + Directory.Delete(READ_PATH, true); + + EditorUtility.DisplayDialog("完成", "处理完毕！", "确定"); + } + finally + { + EditorUtility.ClearProgressBar(); + EditorApplication.UnlockReloadAssemblies(); + } + + } + + static void __UnPack(string version, string _base_path) + { + try + { + string dir = PACK_PATH; + var zip_path = Path.Combine(dir, _base_path, $"asset_pack{version}.bytes"); + if (!File.Exists(zip_path)) + { + Debug.LogError("打包文件不完全，请将打包所有资源包"); + throw new System.Exception(); + } + IFilePack zip = null; + zip = new FilePack20(zip_path, PackMode.Read); + zip.UnPackFile(READ_PATH); + + var lua_pack_path = Path.Combine(READ_PATH, "lua_pack"); + if (File.Exists(lua_pack_path)) + { + var lua_dir = Path.Combine(READ_PATH, "lua/"); + if (!Directory.Exists(READ_PATH)) + Directory.CreateDirectory(READ_PATH); + zip = new FilePack20(lua_pack_path, PackMode.Read); + zip.UnPackFile(lua_dir); + File.Delete(lua_pack_path); + } + + string rv = Path.Combine(READ_PATH, _base_path, "version.txt"); + string directory = Path.GetDirectoryName(rv); + + if (!Directory.Exists(directory)) + { + Directory.CreateDirectory(directory); // 递归创建所有不存在的文件夹 + } + File.WriteAllText(rv, version, System.Text.Encoding.ASCII); + } + catch + { + Directory.Delete(READ_PATH, true); + + } + + } + +} diff --git a/fk101/wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs.meta b/fk101/wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs.meta new file mode 100644 index 00000000..0bcc0be2 --- /dev/null +++ b/fk101/wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55efdee799c9f77498775894b7930d6d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/Scripts/VerCheck.cs b/fk101/wb_unity_pro/Assets/Scripts/VerCheck.cs index f7b869b0..e33fc25f 100644 --- a/fk101/wb_unity_pro/Assets/Scripts/VerCheck.cs +++ b/fk101/wb_unity_pro/Assets/Scripts/VerCheck.cs @@ -7,6 +7,7 @@ using UnityEngine.Networking; using taurus.unity; using System.Text; using System; +using taurus.client; /// /// 版本检查与资源更新管理器 @@ -354,7 +355,7 @@ public class VerCheck : MonoBehaviour string asset_config_text = null; // 如果本地版本为空或包含服务器版本的所有内容,需要下载资源配置 - if (local_version == null || local_version.ContainAll(server_version)) + if (local_version == null) { // 构建资源配置文件的URL string ac_url=""; @@ -389,6 +390,179 @@ public class VerCheck : MonoBehaviour yield return null; } + + yield return request; + if (string.IsNullOrEmpty(request.error)) + { + asset_config_text = request.text; + asset_config_list = Json.Deserialize(asset_config_text) as ArrayList; + + if (asset_config_list == null) + { + ShowTip("连接错误导致游戏配置下载异常，请检查您的网络设置!", () => + { + StartCoroutine(CheckAssetConfig(server_version)); + }); + yield break; + } + // + v_tex_info.text = "正在检查资源。。。"; + GSlider _pd = _version_view.GetChild("pb_progress").asSlider; + _pd.value = 0; + if (!Directory.Exists(ResourcesManager.PACK_PATH)) + { + Directory.CreateDirectory(ResourcesManager.PACK_PATH); + } + string copyVersionPath = Path.Combine(Application.streamingAssetsPath, "version.txt"); + +#if UNITY_IPHONE + string copyVersionString = ""; + if (File.Exists(copyVersionPath)) + { + copyVersionString = File.ReadAllText(copyVersionPath).Trim(); + + } + else + { + ShowTip("本地缓存版本加载失败", () => + { + File.WriteAllText(Path.Combine(ResourcesManager.PACK_PATH, "version.txt"), "1.0.0"); + StartCoroutine(CheckAssetConfig(server_version)); + }); + yield break; + } +#endif +#if UNITY_ANDROID + UnityWebRequest copyRequest = UnityWebRequest.Get(copyVersionPath); + yield return copyRequest.SendWebRequest(); + + if (copyRequest.isNetworkError || copyRequest.isHttpError) + { +/* ShowTip("本地缓存版本加载失败", () => + {*/ + File.WriteAllText(Path.Combine(ResourcesManager.PACK_PATH, "version.txt"), "1.0.0"); + StartCoroutine(CheckAssetConfig(server_version)); + //}); + yield break; + } + + string copyVersionString = copyRequest.downloadHandler.text.Trim(); +#endif + bool isSame = copyVersionString.Equals(server_version.ToString()); + if (isSame) + { + string copyZipPath = Path.Combine(Application.streamingAssetsPath, "Pack.byte"); + +#if UNITY_IPHONE + Byte[] zipData; + if (File.Exists(copyZipPath)) + { + + zipData = File.ReadAllBytes(copyZipPath); + + } + else + { + ShowTip("本地缓存压缩包加载失败", () => + { + StartCoroutine(CheckAssetConfig(server_version)); + }); + yield break; + } +/* if (zipData.LongLength < 1024) + { + ShowTip("本地缓存压缩包加载失败", () => + { + StartCoroutine(CheckAssetConfig(server_version)); + }); + yield break; + }*/ + string zipString = Path.Combine(Application.persistentDataPath, "Pack.byte"); + File.WriteAllBytes(zipString, zipData); +#endif +#if UNITY_ANDROID + UnityWebRequest copyZipRequest = UnityWebRequest.Get(copyZipPath); + yield return copyZipRequest.SendWebRequest(); + + if (copyZipRequest.isNetworkError || copyZipRequest.isHttpError) + { + ShowTip("本地缓存压缩包加载失败", () => + { + StartCoroutine(CheckAssetConfig(server_version)); + }); + yield break; + } + + byte[] zipData = copyZipRequest.downloadHandler.data; + string zipString = Path.Combine(Application.persistentDataPath, "Pack.byte"); + File.WriteAllBytes(zipString, zipData); +#endif + + IFilePack zip = null; + zip = new FilePack20(zipString, PackMode.Read); + zip.UnPackFileSyn(ResourcesManager.PACK_PATH); + while (!zip.Complete) + { + _pd.value = zip.Progress*100; + yield return null; + } + StartCoroutine(CheckAssetConfig(server_version)); + yield break; + } + else + { + File.WriteAllText(Path.Combine(ResourcesManager.PACK_PATH, "version.txt"), copyVersionString); + StartCoroutine(CheckAssetConfig(server_version)); + yield break; + } + + } + else + { + ShowTip("游戏资源下载失败，请检查您的网络设置!", () => + { + StartCoroutine(CheckAssetConfig(server_version)); + }); + yield break; + } + } + } + else if (local_version.ContainAll(server_version)) + { + string ac_url=""; + if(isGFF==false) + ac_url = string.Format("{0}/config/asset_config{1}.json", Hotupdate.PackUrl, server_version.ToString()); + else + ac_url = string.Format("http://{0}/NewFK/config/asset_config{1}.json", conn.ip + ":" + conn.port, server_version.ToString()); + + // Debugger.LogError("CheckAssetConfig===>>>"); + // Debugger.LogError(ac_url); + + float downTimeOut = 5; + using (var request = new WWW(ac_url)) + { + float timeOut = Time.time; + float process = request.progress; + while (request != null && request.isDone == false) + { + if (process < request.progress) + { + timeOut = Time.time; + process = request.progress; + } + + if (Time.time - timeOut > downTimeOut) + { + ShowTip("连接超时导致游戏配置下载异常，请检查您的网络设置!", () => + { + StartCoroutine(CheckNet()); + }); + yield break; + } + + yield return null; + + } yield return request; // 检查下载是否成功 diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte new file mode 100644 index 00000000..5da7c849 Binary files /dev/null and b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta new file mode 100644 index 00000000..a93ad2ae --- /dev/null +++ b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13a2568f2d5900647bdc01afbc7740bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/version.txt b/fk101/wb_unity_pro/Assets/StreamingAssets/version.txt new file mode 100644 index 00000000..437d26b1 --- /dev/null +++ b/fk101/wb_unity_pro/Assets/StreamingAssets/version.txt @@ -0,0 +1 @@ +1.0.10 \ No newline at end of file diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/version.txt.meta b/fk101/wb_unity_pro/Assets/StreamingAssets/version.txt.meta new file mode 100644 index 00000000..46cd8d9f --- /dev/null +++ b/fk101/wb_unity_pro/Assets/StreamingAssets/version.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 509df9e8308921c48adea1d07ccd29ab +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes index e8ca715c..7027ade6 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes index 3f030053..75375e51 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes index 7c26d381..89b8362e 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes index badf0589..fade3d17 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes index 96c09409..cebdd490 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes index 66b642d1..66e7baa8 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes index e5c5dca0..5f9c8930 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes index 861de103..d88812d9 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes index a8bc72a3..5cc9cb69 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes index f05e35c5..66cb59a4 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes index 84775cd4..7423a921 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes index 00343e25..ca9a2dc0 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes b/fk101/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes index 7b786010..7c492c27 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes and b/fk101/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes new file mode 100644 index 00000000..1a2df141 Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes new file mode 100644 index 00000000..73d8b7df Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.5.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.5.bytes new file mode 100644 index 00000000..abc3509d Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.5.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes new file mode 100644 index 00000000..0e437570 Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes new file mode 100644 index 00000000..9b5d4b32 Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes new file mode 100644 index 00000000..493ac64a Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes new file mode 100644 index 00000000..b4bb997f Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes differ diff --git a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes new file mode 100644 index 00000000..82f44c88 Binary files /dev/null and b/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes differ diff --git a/fk101/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/fk101/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index 4f4dac17..ad8f23e5 100644 --- a/fk101/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/fk101/wb_unity_pro/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}