diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index db3a83d3..463b088b 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -42,8 +42,9 @@ function M:InitView(url) self.Laizi2Btn.visible = true self.bugangnum = self._view:GetChild("bugangnum") + self.jing = self._view:GetChild('jing') + if room.jing then - self.jing = self._view:GetChild('jing') self.jing.visible = true end diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png new file mode 100644 index 00000000..d1dca25a Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png.meta new file mode 100644 index 00000000..d86bb5eb --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_atlas0.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 07efc638b8e721b43a49940c9d45a122 +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: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes new file mode 100644 index 00000000..24c853b2 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes.meta new file mode 100644 index 00000000..bfd79434 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fbda7506a5976cb44840289e8ebcb105 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes index e6c56015..0f1a7e8b 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png index 2cc8d88c..91995208 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes index 51dc5422..b5e3c17d 100644 Binary files a/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes and b/wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_fui.bytes differ