diff --git a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua index c2790fd2..c0f54efc 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyRecord.lua @@ -99,15 +99,17 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj) for i = 1, #rdata do local obj2 = list:AddItemFromPool() obj2:GetChild('title').text = rdata[i].score - if allDate.applyDismisUserId and allDate.applyDismisUserId ~= "" then - if round == tonumber(allDate.round) then - obj2:GetController('jiesan').selectedIndex = rdata[i].nick == allDate.applyDismisUserId and 1 or 2 - end + if round == tonumber(allDate.round) and allDate.applyDismisUserId and allDate.applyDismisUserId ~= "null" then + obj2:GetController('jiesan').selectedIndex = rdata[i].nick == allDate.applyDismisUserId and 1 or 2 + else + obj2:GetController('jiesan').selectedIndex = 0 end end if round == tonumber(allDate.round) then - obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "") and - 1 or 0 + obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "null") and + 1 or 0 + else + obj:GetController('jiesan_mng').selectedIndex = 0 end local btn_play = obj:GetChild("n10") diff --git a/wb_new_ui/assets/Family/Record/Component/Item_record.xml b/wb_new_ui/assets/Family/Record/Component/Item_record.xml index b0081e24..864e2c25 100644 --- a/wb_new_ui/assets/Family/Record/Component/Item_record.xml +++ b/wb_new_ui/assets/Family/Record/Component/Item_record.xml @@ -1,5 +1,6 @@ + @@ -14,5 +15,9 @@ + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/Record/Component/Item_score.xml b/wb_new_ui/assets/Family/Record/Component/Item_score.xml index 91b5f6a0..c7576d2f 100644 --- a/wb_new_ui/assets/Family/Record/Component/Item_score.xml +++ b/wb_new_ui/assets/Family/Record/Component/Item_score.xml @@ -1,5 +1,6 @@ + @@ -7,5 +8,13 @@ + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/package.xml b/wb_new_ui/assets/Family/package.xml index 99c0d923..e37a069e 100644 --- a/wb_new_ui/assets/Family/package.xml +++ b/wb_new_ui/assets/Family/package.xml @@ -399,6 +399,9 @@ + + + \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png index c745f04f..0b4be5e8 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png index a1009e1d..bcfbb5ee 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png index 8ce30330..ab1c33e4 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png index 99d4243f..696ef1a1 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png index 930f5d09..4b08989e 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png new file mode 100644 index 00000000..930f5d09 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png differ diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta new file mode 100644 index 00000000..1c5359f9 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: d9f45c8ec791b144baf8a9663f8389b1 +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/family/b23cba4d4e164d6d5cb3cff916b9e0a4 + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_wbhh7d6a.png.meta b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_wbhh7d6a.png.meta index a80c805e..c481f751 100644 --- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_wbhh7d6a.png.meta +++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas_wbhh7d6a.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/family/b23cba4d4e164d6d5cb3cff916b9e0a4 assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index f346453f..51872b37 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_xqxr1er.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_xqxr1er.png.meta index 6bbcb85d..0bc69daa 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_xqxr1er.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_xqxr1er.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas_ksm6hoq.png.meta b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas_ksm6hoq.png.meta index e8a3deb7..1807bba7 100644 --- a/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas_ksm6hoq.png.meta +++ b/wb_unity_pro/Assets/ART/base/newgroup/ui/FGAssist_atlas_ksm6hoq.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: base/newgroup/d046279ddc055f308f8ad01da4806e9a assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas_f8c31a.png.meta b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas_f8c31a.png.meta index 7e888f0a..8efd29e1 100644 --- a/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas_f8c31a.png.meta +++ b/wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas_f8c31a.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70 assetBundleVariant: diff --git a/wb_unity_pro/Assets/StreamingAssets/init1_1.json b/wb_unity_pro/Assets/StreamingAssets/init1_1.json index 0c9893ec..9f2a8a9c 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init1_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init1_1.json @@ -24,34 +24,34 @@ "bundle": "extend/poker2/suoha" }, { - "ver": "1.0.32", + "ver": "1.0.33", "name": "南城麻将", "check": true, - "version": "1.0.32", + "version": "1.0.33", "game_id": "86", "bundle": "extend/majiang/nancheng" }, { - "ver": "1.0.34", + "ver": "1.0.35", "name": "黎川麻将", "check": true, - "version": "1.0.34", + "version": "1.0.35", "game_id": "87", "bundle": "extend/majiang/lichuan" }, { - "ver": "1.0.19", + "ver": "1.0.20", "name": "金溪麻将", "check": true, - "version": "1.0.19", + "version": "1.0.20", "game_id": "88", "bundle": "extend/majiang/jinxi" }, { - "ver": "1.0.18", + "ver": "1.0.19", "name": "抚州麻将", "check": true, - "version": "1.0.18", + "version": "1.0.19", "game_id": "89", "bundle": "extend/majiang/fuzhou" } diff --git a/wb_unity_pro/Assets/StreamingAssets/init2_1.json b/wb_unity_pro/Assets/StreamingAssets/init2_1.json index b036bfbf..5e1193b5 100644 --- a/wb_unity_pro/Assets/StreamingAssets/init2_1.json +++ b/wb_unity_pro/Assets/StreamingAssets/init2_1.json @@ -1,109 +1,109 @@ [ { "lua_path": "/tolua_project,/base_project,/main_project", - "ver": "1.0.6", + "ver": "1.0.11", "name": "base_script", "check": true, "bundle": "base/base_script", - "version": "1.0.6" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "common", "check": true, "bundle": "base/common", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "login", "check": true, "bundle": "base/login", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "lobby", "check": true, "bundle": "base/lobby", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.9", + "ver": "1.0.11", "name": "Family", "check": true, "bundle": "base/Family", - "version": "1.0.9" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "chat", "check": true, "bundle": "base/chat", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "newgroup", "check": true, "bundle": "base/newgroup", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "rank", "check": true, - "version": "1.0.8", + "version": "1.0.11", "bundle": "base/rank" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "main_majiang", "check": true, - "version": "1.0.8", + "version": "1.0.11", "bundle": "base/main_majiang" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "main_poker", "check": true, - "version": "1.0.8", + "version": "1.0.11", "bundle": "base/main_poker" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "main_zipai", "check": true, - "version": "1.0.8", + "version": "1.0.11", "bundle": "base/main_zipai" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "static", "check": true, "bundle": "base/static", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "is_res": true, "name": "embed", "check": true, "bundle": "base/embed", - "version": "1.0.8" + "version": "1.0.11" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "main_pokemajiang", "check": true, - "version": "1.0.8", + "version": "1.0.11", "bundle": "base/main_pokemajiang" }, { - "ver": "1.0.8", + "ver": "1.0.11", "name": "main_zipaimajiang", "check": true, - "version": "1.0.8", + "version": "1.0.11", "bundle": "base/main_zipaimajiang" } ] diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.11.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.11.bytes new file mode 100644 index 00000000..6bd9f275 Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes deleted file mode 100644 index be123cbd..00000000 Binary files a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.9.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.11.bytes similarity index 97% rename from wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes rename to wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.11.bytes index ae5f0c6c..6cde5552 100644 Binary files a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.11.bytes similarity index 65% rename from wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.11.bytes index dbd71849..c60187e4 100644 Binary files a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.11.bytes similarity index 93% rename from wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.11.bytes index b49698cd..ff0358bf 100644 Binary files a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.11.bytes similarity index 68% rename from wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.11.bytes index 5e575530..2be868ae 100644 Binary files a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.11.bytes similarity index 95% rename from wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.11.bytes index b374a750..41d53c7b 100644 Binary files a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.11.bytes differ diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.11.bytes similarity index 100% rename from wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes rename to wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.11.bytes diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.18.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.18.bytes deleted file mode 100644 index 99c2e152..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/fuzhou/asset_pack1.0.18.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.19.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.19.bytes deleted file mode 100644 index 13248a44..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/jinxi/asset_pack1.0.19.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes deleted file mode 100644 index e1ed27b7..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/lichuan/asset_pack1.0.34.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.32.bytes b/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.32.bytes deleted file mode 100644 index bd89cf00..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/majiang/nancheng/asset_pack1.0.32.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.2.bytes b/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.2.bytes deleted file mode 100644 index 4658b0a6..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/chuntian/asset_pack1.0.2.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes b/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes deleted file mode 100644 index 69526901..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.23.bytes and /dev/null differ diff --git a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.3.bytes b/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.3.bytes deleted file mode 100644 index 04708fa4..00000000 Binary files a/wb_unity_pro/Pack/Android32/extend/poker2/suoha/asset_pack1.0.3.bytes and /dev/null differ diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index a7bcfc3d..4da061a7 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset @@ -39,6 +39,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}