diff --git a/fk101/.gitignore b/fk101/.gitignore index 4d2e5f63..5cb7f881 100644 --- a/fk101/.gitignore +++ b/fk101/.gitignore @@ -4,13 +4,14 @@ !lua_probject/ !wb_unity_pro/ !wb_new_ui/ -!wb_new_ui/assets +# !wb_new_ui/assets !wb_unity_pro_ios/ !xcode/ !lua_probject/** !wb_unity_pro/** -!wb_new_ui/assets/** +# !wb_new_ui/assets/** +!wb_new_ui/** !wb_unity_pro_ios** !xcode/** !.gitignore \ No newline at end of file diff --git a/fk101/wb_new_ui/.objs/workspace.json b/fk101/wb_new_ui/.objs/workspace.json index 3e7684ea..2cac5e49 100644 --- a/fk101/wb_new_ui/.objs/workspace.json +++ b/fk101/wb_new_ui/.objs/workspace.json @@ -1,5 +1,5 @@ { - "libview.firstColumnWidth": 384, + "libview.firstColumnWidth": 413, "libview.iconScale": 0, "doc.openedDocs": [ "ui://m7iejg4610snh5j", @@ -19,20 +19,10 @@ "doc.activeDoc": "ui://m7iejg46nwgkhx0", "libview.twoColumn": false, "libview.expandedNodes": [ - "27vd145b", + "egnzysm7", "/", - "27vd145b", - "/buttons/", - "m7iejg46", - "/", - "m7iejg46", - "/mgr/", - "m7iejg46", - "/mgr/component/", - "m7iejg46", - "/mgr/component/member/", - "m7iejg46", - "/mgr/component/member/partner/" + "eyxz924g", + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/fk101/wb_new_ui/assets/Common/images/game/Frame 1240.png b/fk101/wb_new_ui/assets/Common/images/game/Frame 1240.png new file mode 100644 index 00000000..7e012faf Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/images/game/Frame 1240.png differ diff --git a/fk101/wb_new_ui/assets/Common/images/game/Frame 1241.png b/fk101/wb_new_ui/assets/Common/images/game/Frame 1241.png new file mode 100644 index 00000000..32bf17b2 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/images/game/Frame 1241.png differ diff --git a/fk101/wb_new_ui/assets/Common/images/game/Rectangle 303.png b/fk101/wb_new_ui/assets/Common/images/game/Rectangle 303.png new file mode 100644 index 00000000..3f3f9fb8 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/images/game/Rectangle 303.png differ diff --git a/fk101/wb_new_ui/assets/Common/images/game/Rectangle 306.png b/fk101/wb_new_ui/assets/Common/images/game/Rectangle 306.png new file mode 100644 index 00000000..288bf609 Binary files /dev/null and b/fk101/wb_new_ui/assets/Common/images/game/Rectangle 306.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png new file mode 100644 index 00000000..081d3028 Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png.meta b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png.meta new file mode 100644 index 00000000..c6154dc7 --- /dev/null +++ b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93v.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e2e33887c1ff88b4a8772b5b091df544 +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/common/af187115a4824290240734622129b80b + assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png new file mode 100644 index 00000000..3bac7baf Binary files /dev/null and b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png differ diff --git a/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png.meta b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png.meta new file mode 100644 index 00000000..f84c6f66 --- /dev/null +++ b/fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_mub93x.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 91856ffa6c475db4a8161e3fef331c28 +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/common/af187115a4824290240734622129b80b + assetBundleVariant: diff --git a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte index 98ac9e14..782119f9 100644 Binary files a/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte and b/fk101/wb_unity_pro/Assets/StreamingAssets/Pack.byte differ 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 49bdf20b..3e16d75a 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 96058483..22cd23a5 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 5dd69629..370ab327 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 a906bca4..128685d6 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 b1f6e88f..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 bb6343cd..46ec3a29 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 713c0665..b28b0f6a 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 cfe56b2c..0ee6523e 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 ebe6e17e..fc383123 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 af2b4488..83d82c3b 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 index 8efec252..355ceb4d 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/changsha/asset_pack1.0.7.bytes 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 index 51ce2bf6..f9cec3e9 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/hongzhong/asset_pack1.0.7.bytes 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 index 973f7684..f65a9d7a 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/majiang/zhuanzhuan/asset_pack1.0.5.bytes 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 index 56841a16..bce7b9b6 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.6.bytes 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 index d6ed5ebe..88c0bcc9 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/changdepaohuzi/asset_pack1.0.10.bytes 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 index 5d95cd19..e12e2671 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/fulushou/asset_pack1.0.4.bytes 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 index 735c403f..7530909b 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/runbeard/asset_pack1.0.6.bytes 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 index eca6259c..225f5524 100644 Binary files a/fk101/wb_unity_pro/Pack/Android32/extend/zipai/yueyangwaihuzi/asset_pack1.0.4.bytes 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/ProjectSettings.asset b/fk101/wb_unity_pro/ProjectSettings/ProjectSettings.asset index d5066588..2687f47a 100644 --- a/fk101/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/fk101/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -12,7 +12,7 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: llgame + companyName: llgamebb productName: "\u9E3F\u8FD0" defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} @@ -254,8 +254,8 @@ PlayerSettings: AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 2 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: blm.keystore' - AndroidKeyaliasName: blm + AndroidKeystoreName: '{inproject}: tessst11.keystore' + AndroidKeyaliasName: ts AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 diff --git a/fk101/wb_unity_pro/tessst11.keystore b/fk101/wb_unity_pro/tessst11.keystore new file mode 100644 index 00000000..b31debb0 Binary files /dev/null and b/fk101/wb_unity_pro/tessst11.keystore differ