diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 67177b0f..4240e24f 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -269,8 +269,13 @@ function M:UpdateOutCardList(outcard, card_item, cursor) local outcard = self._view_outCardList:AddItemFromPool() self:fillCard2(outcard, outCardName, outlist[i + 1]) if cursor and i == #outlist - 1 then - outcard:AddChild(cursor) - cursor:Center() + Timer.New(function() + self._view:AddChild(cursor) + -- GRoot.inst:AddChild(cursor) + cursor.xy = self._view_outCardList.xy + + self._view_outCardList:GlobalToLocal(outcard:LocalToGlobal(Vector2.New(outcard.width * 0.5, + outcard.height * 0.5))) + end, Time.deltaTime, 1, false):Start() end end end diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml index a30060d2..e0aaa0e6 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml @@ -1,5 +1,5 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml index 05b5638e..6d27ad49 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_1.xml @@ -3,9 +3,9 @@ - + - + @@ -46,7 +46,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml index c04b467d..80845505 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml @@ -3,7 +3,7 @@ - + @@ -44,7 +44,7 @@ - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index ff9d9d0d..fe5308ae 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -243,7 +243,7 @@ - + @@ -254,12 +254,12 @@ - + - + - + \ No newline at end of file diff --git a/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml b/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml index 6e814edb..08ec7e5a 100644 --- a/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml +++ b/wb_new_ui/assets/Main_Majiang/component/ani/Ani_play_bj.xml @@ -1,12 +1,11 @@ - + - + - - - + + \ No newline at end of file diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png index 20e57143..f52bd4d8 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png index 03725362..593ac357 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png index 472012ca..17e19bff 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png index bf6bb308..11280d0f 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png index ceb1b755..7f66c9e0 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png new file mode 100644 index 00000000..bc537328 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta new file mode 100644 index 00000000..cb2e6ae5 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3ad3937da18bb154e8135801fe276a86 +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/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index ab73e1a3..c9becdbc 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