diff --git a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua index 9a33a81d..bc1bb6b5 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyMsgRecord.lua @@ -24,7 +24,6 @@ local function list_msgRender(self, index, obj) local msgText = '' if msg.m_state == 0 then - --msgText = string.format("【%s】被【%s】加入亲友圈", msg.user_name, msg.tag_name) msgText = string.format("【%s】被【%s】加入亲友圈", msg.tag_name, msg.user_name) elseif msg.m_state == 1 then msgText = string.format("【%s】退出亲友圈", msg.user_name) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua b/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua index bd687ce6..c60c7f27 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua @@ -1,7 +1,7 @@ local HuCardImg = { } -HuCardImg[1] = { 1 } +HuCardImg[1] = { "tile_hu" } HuCardImg[2] = { "tile_zimo" } HuCardImg[3] = { "tile_cs_shisanlan" } HuCardImg[4] = { "tile_cs_qxshisanlan" } 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 baa7788a..b6cfca28 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 e473368f..e154dba2 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