特效

.gitignore

@@ -12,3 +12,4 @@
 !.gitignore
 lua_probject/.emmyrc.json
 lua_probject/base_project/Game/View/Common/FguiEmojiDict.lua
+wb_unity_pro/Pack/

lua_probject/base_project/Game/View/FamilyView.lua

@@ -154,6 +154,7 @@ function M:init(url)
     self.cMyfamilyList = view:GetController("cMyfamilyList")
     self.btn_quitMyfamilyTab = view:GetChild("btn_quitMyfamilyTab")
     self.btn_chatRoom = view:GetChild("btn_chatRoom")
+    self.list_family = view:GetChild("list_family")
 
     self.cChatRoomRedPoint = self.btn_chatRoom:GetController("cRedPoint")
 
@@ -220,6 +221,25 @@ function M:init(url)
         --FamilyChatRoom:Show(self.ChatRoomData)
         self.com_FamilyChatRoom:Show()
     end)
+
+    self.list_family.itemRenderer = function(i, obj)
+        local j = i + 1
+        local group = DataManager.groups.groupList[j]
+        obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
+        obj.text = Utils.TextOmit(group.name, 6, "...")
+        obj.onClick:Add(function()
+            if self._group ~= nil and group.id == self._group.id then
+                --ViewUtil.ShowBannerOnScreenCenter("已在家族中")
+                return
+            end
+
+            self.curGroupIndex = j
+
+            self:ConnetFamily(j, DataManager.groups.groupList)
+        end)
+    end
+
+    self.familyType.selectedIndex = 1
 end
 
 function M:Reflash()
@@ -234,8 +254,11 @@ function M:Reflash()
 
         local groups = res.Data.groups
         if #groups > 0 then
-            self.familyType.selectedIndex = 1
-            self:ConnetFamily(1, groups, true)
+            --self:ConnetFamily(1, groups)
+            self.list_family.numItems = #DataManager.groups.groupList
+            local index = (self.curGroupIndex or 1) - 1
+            local btn = self.list_family:GetChildAt(index)
+            btn.onClick:Call()
         else
             self:JoinFamily(true)
             self.btn_chatRoom.visible = false
@@ -775,7 +798,7 @@ function M:ReflashFamilyList()
     list_family.numItems = #DataManager.groups.groupList
 end
 
-function M:ConnetFamily(index, groups, isCreate)
+function M:ConnetFamily(index, groups)
     if self._group then
         FamilyOffline(self._group.id, self)
     end
@@ -783,8 +806,6 @@ function M:ConnetFamily(index, groups, isCreate)
     UpdateBeat:Remove(self.OnUpdate, self)
     ViewUtil:CloseModalWait()
 
-    local list_family = self._view:GetChild('list_family')
-    --list_family:SetVirtual()
     self._group = DataManager.groups:get(groups[index].id)
     DataManager.CurrenGroup = self._group
     self._view:GetChild('text_familyId').text = self._group.id
@@ -793,27 +814,6 @@ function M:ConnetFamily(index, groups, isCreate)
     pt(self._group)
     self._roomNum = self._group.room_num
 
-    if isCreate then
-        list_family.itemRenderer = function(i, obj)
-            local j = i + 1
-            local group = DataManager.groups.groupList[j]
-            obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
-            obj.text = Utils.TextOmit(group.name, 6, "...")
-            obj.onClick:Add(function()
-                if group.id == self._group.id then
-                    --ViewUtil.ShowBannerOnScreenCenter("已在家族中")
-                    return
-                end
-
-                self:ConnetFamily(j, DataManager.groups.groupList, false)
-            end)
-        end
-        list_family.numItems = #groups
-        if list_family.selectedIndex == -1 then
-            list_family.selectedIndex = 0
-        end
-    end
-
     local fgCtr = ControllerManager.GetController(NewGroupController)
 
     ViewUtil.ShowModalWait(self._root_view, "正在进入亲友圈......")

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -136,6 +136,18 @@ function M:FillGameData()
     end
     printlog("lingmeng GameListView.new", lst_game, index, page, self.room_config)
     self.gl_view = GameListView.new(lst_game, index, page, self.room_config)
+
+    -- 通用设置
+    local com_editSetting = self.gl_view:GetModeData().data._config:GetChild("com_editSetting")
+    
+    self.cGps = com_editSetting:GetController("cGps")
+    self.cTuoguan = com_editSetting:GetController("cTuoguan")
+    self.cJiesan = com_editSetting:GetController("cJiesan")
+    self.cGongneng = com_editSetting:GetController("cGongneng")
+    self.cChat = com_editSetting:GetController("cChat")
+    self.cMisslie = com_editSetting:GetController("cMisslie")
+
+
     local btn_close = lst_game:GetChild("btn_close")
     btn_close.onClick:Set(function()
         self:Destroy()
@@ -146,6 +158,31 @@ function M:FillGameData()
         tex_name.text = Utils.TextOmit(self.play.name, 6, "...")
         self._view:GetChild("tex_times").text = self.play.hp_times / 1000
         self.SliderTimes.value = self.play.hp_times / 1000
+
+        local config = json.decode(self.play.config)
+        local hpData = json.decode(self.play.hpData)
+
+        self.cGps.selectedIndex = 2
+        if config.GPSDetection == 100 then
+            self.cGps.selectedIndex = 0
+        elseif config.GPSDetection == 500 then
+            self.cGps.selectedIndex = 1
+        elseif config.GPSDetection == 0 then
+            self.cGps.selectedIndex = 2
+        end
+
+        self.cTuoguan.selectedIndex = 0
+        if config.tuoguan_active_time == 30 then
+            self.cTuoguan.selectedIndex = 1
+        elseif config.tuoguan_active_time == 60 then
+            self.cTuoguan.selectedIndex = 2
+        elseif config.tuoguan_active_time == 120 then
+            self.cTuoguan.selectedIndex = 3
+        end
+
+        self.cJiesan.selectedIndex = hpData.JieShan - 1
+        self.cChat.selectedIndex = hpData.BanChat
+        self.cMisslie.selectedIndex = hpData.BanMissile
     end
 end
 
@@ -620,6 +657,7 @@ function M:FillFagData_jiangxi()
     local cb_tuoguan_type = panel_play_set:GetChild("comb_result")  --托管结算类型
     local btn_hidden = panel_play_set:GetChild("btn_hidden")        --防作弊开关
     local btn_vip = panel_play_set:GetChild("btn_vip")              --vip房间开关
+
     --根据hpType显示
     local game_data = mod.data.game_data
     panel_play_set:GetController("game_type").selectedIndex = game_data and game_data.hpType or 0
@@ -870,36 +908,36 @@ function M:FillFagData_jiangxi()
         _data.isvip = 0
     end
 
-    -- 通用设置
-    local com_editSetting = mod.data._config:GetChild("com_editSetting")
-    local cGps = com_editSetting:GetController("cGps")
-    local cTuoguan = com_editSetting:GetController("cTuoguan")
-    local cJiesan = com_editSetting:GetController("cJiesan")
-    local cGongneng = com_editSetting:GetController("cGongneng")
-    local cChat = com_editSetting:GetController("cChat")
-    local cMisslie = com_editSetting:GetController("cMisslie")
-
     -- GPS设置
-    self.hpData.gps = cGps.selectedIndex + 1
+    local dis = 0
+    if self.cGps.selectedIndex == 0 then
+        dis = 100
+    elseif self.cGps.selectedIndex == 1 then
+        dis = 500
+    elseif self.cGps.selectedIndex == 2 then
+        dis = 0
+    end
+    _data.GPSDetection = dis
+
     -- 托管
     local time = 0
-    if cTuoguan.selectedIndex == 1 then
+    if self.cTuoguan.selectedIndex == 1 then
         time = 30
-    elseif cTuoguan.selectedIndex == 2 then
+    elseif self.cTuoguan.selectedIndex == 2 then
         time = 60
-    elseif cTuoguan.selectedIndex == 3 then
+    elseif self.cTuoguan.selectedIndex == 3 then
         time = 120
     end
     _data.tuoguan_active_time = time
 
     -- 解散
-    self.hpData.JieShan = cJiesan.selectedIndex + 1
+    self.hpData.JieShan = self.cJiesan.selectedIndex + 1
     -- 功能
-    self.hpData.GongNeng = cGongneng.selectedIndex + 1
+    self.hpData.GongNeng = self.cGongneng.selectedIndex + 1
     -- 开启聊天
-    self.hpData.BanChat = cChat.selectedIndex
+    self.hpData.BanChat = self.cChat.selectedIndex
     -- 开启表情互动
-    self.hpData.BanMissile = cMisslie.selectedIndex
+    self.hpData.BanMissile = self.cMisslie.selectedIndex
 
 
     local hpType = mod.data.game_data.hpType

lua_probject/base_project/table/Table_Error_code.lua

@@ -43,7 +43,7 @@ Table_Error_code_Map = {
 	[17]={id=17,note="奖券不足"},
 	[53]={id=53,note="与桌上玩家IP相同，进入房间失败"},
 	[54]={id=54,note="与桌上玩家距离过近，进入房间失败"},
-	[55]={id=55,note="GPS未开启，进入房间失败"},
+	[55]={id=55,note="GPS服务未开启，请开启GPS服务！"},
 	[56]={id=56,note="不是大联盟"},
 	[57]={id=57,note="大联盟不能退出"},
 	[59]={id=59,note="无效的验证码"},

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
 local HuTipView = import("main.majiang.HuTipView")
 local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
 local M = {}
 
 --- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
 
     self.EXClearingViewClass = EXClearingView
 
+    self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
     self.class = "MainView"
     self.asset_group = "FuZhou_MJ"
+    self.HuCardImg_path = "ui://Extend_MJ_FuZhou/"
+    self.Sound_path = "extend/majiang/fuzhou/sound/"
     self:init()
     ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/fuzhou/sound/bg.mp3")
     return self
@@ -294,106 +299,7 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
 
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
-        self._left_time = 0
-        self:UpdateCardBox(0)
-        self:__CloseTip()
-        self._popEvent = false
-        local arg = { ... }
-        local win_seat = arg[1]
-        local lose_seat = arg[2]
-        local win_card = arg[3]
-        local cards = arg[4]
-        local win_list = arg[5]
-        local index = self:GetPos(win_seat)
-        local info = self._player_card_info[index]
-        self:RemoveCursor()
-        --info:UpdateHandCard(false, false)
-        info:ShowHuCard(win_card)
-
-        local obj_win_card = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Btn_Card_jiangxi")
-        obj_win_card.icon = "ui://Main_Majiang/b202_" .. win_card
-        obj_win_card:GetController("bg").selectedIndex = 1
-        info._view:AddChild(obj_win_card)
-        obj_win_card:Center()
-
-        local url, pNode
-        local player = _room:GetPlayerBySeat(win_seat)
-        if win_seat ~= _room.self_player.seat then
-            url = "ui://Main_Majiang/别人胡"
-            pNode = info._view
-        elseif win_seat == _room.self_player.seat then
-            url = "ui://Main_Majiang/自己胡牌"
-            pNode = self._view
-        end
-        if win_seat == lose_seat then
-            url = "ui://Main_Majiang/eff_zimo"
-        end
-
-        local he = UIPackage.CreateObjectFromURL(url)
-        pNode:AddChild(he)
-        he:GetTransition("t2"):Play()
-        he:Center()
-        if _room.room_config.people_num == 2 then
-            if win_seat ~= _room.self_player.seat then
-                he.scaleY = 0.4
-                he.scaleX = 0.4
-                he.x = he.width * 0.4 * 0.5 * -1
-                he.y = he.height * 0.4 * 0.5 * -1
-            end
-        end
-
-        if win_seat == _room.self_player.seat then
-            printlog("自己位置=====")
-            he:Center()
-        elseif url == "ui://Main_Majiang/eff_zimo" then
-            printlog("自摸地址==========")
-            he.scaleY = 0.4
-            he.scaleX = 0.4
-            he.x = he.width * 0.4 * 0.5 * -1
-            he.y = he.height * 0.4 * 0.5 * -1
-        end
-
-
-
-        ---
-        local isZiMo = win_seat == lose_seat
-        DataManager.CurrenRoom.isZiMoHu = isZiMo
-        local hu_sound = isZiMo and ("zimo") or ("hu")
-        printlog("声音====>>>", hu_sound)
-        self:PlaySound("FuZhou_MJ", player.self_user.sex, hu_sound)
-
-        local pNode = info._view
-        local url = "eff_list1"
-        local he_list = UIPackage.CreateObjectFromURL("ui://Extend_MJ_FuZhou/" .. url)
-        he_list.touchable = false
-        pNode:AddChild(he_list)
-        he_list:Center()
-
-        coroutine.start(function()
-            coroutine.wait(0.4)
-            for i = 1, #win_list do
-                local tem = win_list[i]
-                if tem.type > 0 and tem.type < 32 then
-                    local com_name = "he" .. tem.type
-                    printlog("声音====>>>", com_name)
-                    local sound_name = string.format("extend/majiang/fuzhou/sound/%s/%s.mp3",
-                        ViewUtil.Sex_Chat[player.self_user.sex],
-                        com_name)
-                    ViewUtil.PlaySound("FuZhou_MJ", sound_name)
-
-                    local listObj = he_list:GetChild("list")
-                    local imgPath = "ui://Extend_MJ_FuZhou/" .. com_name
-                    listObj:AddItemFromPool(imgPath)
-                    coroutine.wait(0.3)
-                end
-            end
-
-            coroutine.wait(2)
-            obj_win_card:Dispose()
-            he:Dispose()
-            he_list:Dispose()
-            self._popEvent = true
-        end)
+        MJMainView.OnHuCard(self, ...)
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)

lua_probject/extend_project/extend/majiang/fuzhou/HuCardImg.lua

@@ -0,0 +1,28 @@
+local HuCardImg = {
+}
+
+HuCardImg[1] = { 1 }
+HuCardImg[2] = { "tile_zimo" }
+HuCardImg[3] = { "tile_cs_shisanlan" }
+HuCardImg[4] = { "tile_cs_qxshisanlan" }
+HuCardImg[5] = { "tile_cs_pengpenghu" }
+HuCardImg[6] = { "tile_cs_pengpenghu", "tile_cs_qingyise" }
+HuCardImg[7] = { "tile_cs_pengpenghu", "tile_cs_ziyise" }
+HuCardImg[8] = { "tile_cs_qidui" }
+HuCardImg[9] = { "tile_cs_qidui", "tile_cs_qingyise" }
+HuCardImg[10] = { "tile_cs_qidui", "tile_cs_ziyise" }
+HuCardImg[11] = { "tile_cs_qingyisezhenhu" }
+HuCardImg[12] = { "tile_cs_qingyisejiahu" }
+HuCardImg[13] = { "tile_cs_ziyisezhenhu" }
+HuCardImg[14] = { "tile_cs_ziyisejiahu" }
+HuCardImg[15] = { "缺失" }
+HuCardImg[16] = { "tile_cs_dihu" }
+HuCardImg[17] = { "tile_cs_pinghu" }
+HuCardImg[18] = { "tile_cs_qiangganghu" }
+HuCardImg[19] = { "tile_cs_gangshanghua" }
+HuCardImg[20] = { "缺失" }
+HuCardImg[21] = { "tile_cs_siguiyi" }
+HuCardImg[22] = { "tile_cs_baguiyi" }
+HuCardImg[23] = { "tile_cs_seguiyi" }
+
+return HuCardImg

lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua

@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
 local HuTipView = import("main.majiang.HuTipView")
 local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
 local M = {}
 
 --- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
 
     self.EXClearingViewClass = EXClearingView
 
+    self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
     self.class = "MainView"
     self.asset_group = "JinXi_MJ"
+    self.HuCardImg_path = "ui://Extend_MJ_JinXi/"
+    self.Sound_path = "extend/majiang/jinxi/sound/"
     self:init()
     ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/jinxi/sound/bg.mp3")
     return self
@@ -293,6 +298,8 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
 
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+        MJMainView.OnHuCard(self, ...)
+        --[[
         self._left_time = 0
         self:UpdateCardBox(0)
         self:__CloseTip()
@@ -388,6 +395,7 @@ function M:EventInit()
             he_list:Dispose()
             self._popEvent = true
         end)
+        ]]
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)

lua_probject/extend_project/extend/majiang/jinxi/HuCardImg.lua

@@ -0,0 +1,7 @@
+local HuCardImg = {}
+
+HuCardImg[15] = {"tile_cs_tianhu"}
+HuCardImg[16] = {"tile_cs_dihu"}
+HuCardImg[17] = {"tile_cs_pinghu"}
+
+return HuCardImg

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
 local HuTipView = import("main.majiang.HuTipView")
 local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
 local M = {}
 
 --- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
 
     self.EXClearingViewClass = EXClearingView
 
+    self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
     self.class = "MainView"
     self.asset_group = "LiChuan_MJ"
+    self.HuCardImg_path = "ui://Extend_MJ_LiChuan/"
+    self.Sound_path = "extend/majiang/lichuan/sound/"
     self:init()
     ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/lichuan/sound/bg.mp3")
     return self
@@ -294,6 +299,8 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
 
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+        MJMainView.OnHuCard(self, ...)
+        --[[
         self._left_time = 0
         self:UpdateCardBox(0)
         self:__CloseTip()
@@ -388,7 +395,7 @@ function M:EventInit()
             he:Dispose()
             he_list:Dispose()
             self._popEvent = true
-        end)
+        end)]]
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)

lua_probject/extend_project/extend/majiang/lichuan/HuCardImg.lua

@@ -0,0 +1,13 @@
+local HuCardImg = {}
+
+HuCardImg[6] = {"tile_cs_qidui"}
+HuCardImg[7] = {"tile_cs_tianhu"}
+HuCardImg[8] = {"tile_cs_dihu"}
+HuCardImg[9] = {"tile_cs_pinghu"}
+HuCardImg[10] = {"tile_cs_deguo"}
+HuCardImg[11] = {"tile_cs_qiangganghu"}
+HuCardImg[12] = {"tile_cs_gangshanghua"}
+HuCardImg[13] = {"tile_cs_quanqiuren"}
+
+
+return HuCardImg

lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua

@@ -7,6 +7,7 @@ local TX_GameEvent = import(".GameEvent")
 local HuTipView = import("main.majiang.HuTipView")
 local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
+local HuCardImg = import(".HuCardImg")
 local M = {}
 
 --- Create a new ZZ_MainView
@@ -16,8 +17,12 @@ function M.new()
 
     self.EXClearingViewClass = EXClearingView
 
+    self.HuCardImg = setmetatable(HuCardImg, { __index = self.HuCardImg })
+
     self.class = "MainView"
     self.asset_group = "NanCheng_MJ"
+    self.HuCardImg_path = "ui://Extend_MJ_NanCheng/"
+    self.Sound_path = "extend/majiang/nancheng/sound/"
     self:init()
     ViewUtil.PlayMuisc(self.asset_group, "extend/majiang/nancheng/sound/bg.mp3")
     return self
@@ -291,6 +296,8 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.FangziAction, handler(self, self.OnFangziAction))
 
     _gamectr:AddEventListener(TX_GameEvent.ZPHuCard, function(...)
+        MJMainView.OnHuCard(self, ...)
+        --[[
         self._left_time = 0
         self:UpdateCardBox(0)
         self:__CloseTip()
@@ -387,6 +394,7 @@ function M:EventInit()
             he_list:Dispose()
             self._popEvent = true
         end)
+        ]]
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.EventNiao, function(...)

lua_probject/extend_project/extend/majiang/nancheng/HuCardImg.lua

@@ -0,0 +1,7 @@
+local HuCardImg = {}
+
+HuCardImg[15] = {"tile_cs_tianhu"}
+HuCardImg[16] = {"tile_cs_dihu"}
+HuCardImg[17] = {"tile_cs_pinghu"}
+
+return HuCardImg

lua_probject/main_project/main/majiang/HuCardImg.lua

@@ -0,0 +1,29 @@
+local HuCardImg = {
+}
+
+HuCardImg[1] = { "tile_hu" }
+HuCardImg[2] = { "tile_zimo" }
+HuCardImg[3] = { "tile_cs_shisanlan" }
+HuCardImg[4] = { "tile_cs_qxshisanlan" }
+HuCardImg[5] = { "tile_cs_pengpenghu" }
+HuCardImg[6] = { "tile_cs_pengpenghu", "tile_cs_qingyise" }
+HuCardImg[7] = { "tile_cs_pengpenghu", "tile_cs_ziyise" }
+HuCardImg[8] = { "tile_cs_qidui" }
+HuCardImg[9] = { "tile_cs_qidui", "tile_cs_qingyise" }
+HuCardImg[10] = { "tile_cs_qidui", "tile_cs_ziyise" }
+HuCardImg[11] = { "tile_cs_qingyisezhenhu" }
+HuCardImg[12] = { "tile_cs_qingyisejiahu" }
+HuCardImg[13] = { "tile_cs_ziyisezhenhu" }
+HuCardImg[14] = { "tile_cs_ziyisejiahu" }
+HuCardImg[15] = { "缺失" }
+HuCardImg[16] = { "tile_cs_dihu" }
+HuCardImg[17] = { "tile_cs_pinghu" }
+HuCardImg[18] = { "tile_cs_qiangganghu" }
+HuCardImg[19] = { "tile_cs_gangshanghua" }
+HuCardImg[20] = { "缺失" }
+HuCardImg[21] = { "tile_cs_siguiyi" }
+HuCardImg[22] = { "tile_cs_baguiyi" }
+HuCardImg[23] = { "tile_cs_seguiyi" }
+HuCardImg[25] = { "tile_cs_seguiyi" , "tile_cs_qingyisezhenhu"}
+
+return HuCardImg

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -5,6 +5,7 @@ local MJSettingView = import(".MJSettingViewNew")
 local MJMainRightPanelView = import(".MJMainRightPanelView")
 local MJCheckG = import('.MJCheckG')
 local GameInfoWindow = import(".GameInfoWindow")
+local HuCardImg = import(".HuCardImg")
 
 local bg_config = {
     { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
@@ -16,6 +17,8 @@ local M = {}
 
 setmetatable(M, { __index = MainView })
 
+M.HuCardImg = HuCardImg
+
 local default_bg = 1
 
 local function IsRoomOwer()
@@ -40,6 +43,14 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
     self._full = false
     self._scale = true
     MainView.InitView(self, url)
+
+    self.list_otherHuEffect = self._view:GetChild("list_otherHuEffect")
+    self.list_HuEffect = self._view:GetChild("list_HuEffect")
+    self.loader_otherHuCardEffect = self._view:GetChild("loader_otherHuCardEffect")
+    self.loader_selfHuCardEffect = self._view:GetChild("loader_selfHuCardEffect")
+    self.cHuCardEffect = self._view:GetController("cHuCardEffect")
+    self.effect_ZiMo = self._view:GetChild("effect_ZiMo")
+
     self.btn_setting = self._view:GetChild("btn_setting")
     local _view = self._view
     self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
@@ -691,6 +702,112 @@ function M:OnResult1(...)
     end
 end
 
+function M:OnHuCard(...)
+    self._left_time = 0
+    self:UpdateCardBox(0)
+    self:__CloseTip()
+    self._popEvent = false
+    local arg = { ... }
+    local win_seat = arg[1]
+    local lose_seat = arg[2]
+    local win_card = arg[3]
+    local cards = arg[4]
+    local win_list = arg[5]
+    local index = self:GetPos(win_seat)
+    local info = self._player_card_info[index]
+    local player = self._room:GetPlayerBySeat(win_seat)
+    self:RemoveCursor()
+    --info:UpdateHandCard(false, false)
+    info:ShowHuCard(win_card)
+
+    self.cHuCardEffect.selectedIndex = 1
+
+    local loader_HuEffect = nil
+    local list_HuCardEffect = nil
+    if win_seat == self._room.self_player.seat then
+        loader_HuEffect = self.loader_selfHuCardEffect
+        list_HuCardEffect = self.list_HuEffect
+    else
+        loader_HuEffect = self.loader_otherHuCardEffect
+        list_HuCardEffect = self.list_otherHuEffect
+    end
+
+
+    ---
+    local isZiMo = win_seat == lose_seat
+    DataManager.CurrenRoom.isZiMoHu = isZiMo
+    local hu_sound = isZiMo and ("zimo") or ("hu")
+    printlog("声音====>>>", hu_sound)
+    self:PlaySound(self.asset_group, player.self_user.sex, hu_sound)
+
+    local effects = isZiMo and ("tile_zimo") or ("tile_hu")
+    loader_HuEffect.visible = true
+    loader_HuEffect.url = "ui://Main_Majiang/" .. effects
+    loader_HuEffect:SetScale(2, 2)
+    loader_HuEffect:TweenScale(Vector2(1, 1), 0.3):SetEase(EaseType.QuartOut)
+
+    self.effect_ZiMo.xy = loader_HuEffect.xy
+    self.effect_ZiMo:SetPlaySettings(0, -1, 1, -1);
+    self.effect_ZiMo.visible = true
+    self.effect_ZiMo.playing = true
+    self.effect_ZiMo.onPlayEnd:Set(function()
+        self.effect_ZiMo.visible = false
+    end)
+
+    coroutine.start(function()
+        coroutine.wait(1)
+
+        loader_HuEffect.visible = false
+        local Effects = {}
+        for i = 1, #win_list do
+            local HuMsg = win_list[i]
+
+            -- ↓↓↓先排列好特效图片
+            if HuMsg.type > 2 and HuMsg.type < 32 then
+                local sound_name = string.format(self.Sound_path .. "%s/%s.mp3",
+                    ViewUtil.Sex_Chat[player.self_user.sex],
+                    "he" .. HuMsg.type)
+                ViewUtil.PlaySound(self.asset_group, sound_name)
+
+                local imgList = self.HuCardImg[HuMsg.type]
+                for _, img in pairs(imgList) do
+                    local imgPath = "ui://Main_Majiang/" .. img
+                    local imgObj = list_HuCardEffect:AddItemFromPool()
+                    local imgLoader = imgObj:GetChild("loader_img")
+                    imgLoader.url = imgPath
+                    imgObj.visible = false
+                    Effects[#Effects + 1] = imgObj
+                end
+            end
+        end
+
+        -- ↓↓↓播放动画
+        for _, imgObj in pairs(Effects) do
+            imgObj.visible = true
+
+            local effect_xingxing = imgObj:GetChild("effect_xingxing")
+            effect_xingxing:SetPlaySettings(0, -1, 1, -1);
+            effect_xingxing.visible = true
+            effect_xingxing.playing = true
+            effect_xingxing.onPlayEnd:Set(function()
+                effect_xingxing.visible = false
+            end)
+
+            local imgLoader = imgObj:GetChild("loader_img")
+            imgLoader:SetScale(2, 2)
+            imgLoader:Center()
+            imgLoader:TweenScale(Vector2(1, 1), 0.3)
+            coroutine.wait(0.7)
+        end
+
+        coroutine.wait(0.5)
+        self._popEvent = true
+        list_HuCardEffect:RemoveChildrenToPool()
+
+        self.cHuCardEffect.selectedIndex = 0
+    end)
+end
+
 function M:Show()
     MainView.Show(self)
     local win = GameInfoWindow.New()

wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/com_huType.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="800,186" pivot="0.5,0.5">
+  <displayList>
+    <movieclip id="n2_m21r" name="n2" src="f8c31a" fileName="component/hu_effect/xingxing.jta" xy="0,-207" size="800,600"/>
+    <loader id="n1_m21r" name="loader_img" xy="0,5" pivot="0.5,0.5" size="800,176" url="ui://irbqzs46m21r81" align="center" vAlign="middle" fill="scale"/>
+  </displayList>
+</component>

wb_new_ui/assets/Extend_MJ_FuZhou/component/hu_effect/eff_list1.xml

@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,172" pivot="0.5,0.5" anchor="true">
   <displayList>
-    <list id="n66_hhtd" name="list" xy="90,-7" size="2308,379" scale="0.5,0.5" touchable="false" layout="flow_hz" scroll="horizontal" lineGap="5" colGap="98" lineItemCount="4" defaultItem="ui://3qr8nmi4mi374v" align="center" vAlign="middle" autoClearItems="true">
-      <item url="ui://irbqzs46plau5x"/>
-      <item url="ui://irbqzs46plau57"/>
-      <item url="ui://irbqzs46plau5y"/>
-      <item url="ui://irbqzs46plau57"/>
-      <item url="ui://irbqzs46plau56"/>
-      <item url="ui://irbqzs46plau5b"/>
-      <item url="ui://irbqzs46plau5c"/>
-      <item url="ui://irbqzs46plau53"/>
+    <list id="n66_hhtd" name="list" xy="-1235,0" size="3805,172" touchable="false" layout="flow_hz" scroll="horizontal" lineGap="5" colGap="40" lineItemCount="4" defaultItem="ui://irbqzs46m21r8i" align="center" vAlign="middle" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
     </list>
   </displayList>
 </component>

wb_new_ui/assets/Extend_MJ_FuZhou/package.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="irbqzs46">
   <resources>
-    <folder id="/component/hu_effect/image/" name="image" path="/component/hu_effect/" atlas="1"/>
     <component id="plau0" name="Btn_Blue.xml" path="/buttons/" exported="true"/>
     <image id="plau1" name="game_bottom_02.png" path="/font/images/" exported="true"/>
     <component id="plau2" name="Btn_Blue2.xml" path="/buttons/" exported="true"/>
@@ -196,53 +195,9 @@
     <image id="plau69" name="Head0.png" path="/images/clearing/"/>
     <image id="plau6a" name="icon.png" path="/images/" exported="true"/>
     <component id="k1od6b" name="Gang_tip_choice.xml" path="/component/choose/" exported="true"/>
-    <image id="pio96c" name="he1.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96d" name="he25.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96e" name="he26.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96f" name="he27.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96g" name="he28.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96h" name="he29.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96i" name="he30.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96j" name="he31.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96k" name="he32.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96l" name="he24.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96m" name="he33.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96n" name="he35.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96o" name="he36.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96p" name="he37.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96q" name="he38.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96r" name="he39.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96s" name="he40.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96t" name="he41.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96u" name="he42.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96v" name="he34.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96w" name="he23.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96x" name="he22.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96y" name="he21.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio96z" name="he2.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio970" name="he3.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio971" name="he4.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio972" name="he5.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio973" name="he6.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio974" name="he7.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio975" name="he8.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio976" name="he9.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio977" name="he10.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio978" name="he11.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio979" name="he12.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97a" name="he13.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97b" name="he14.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97c" name="he15.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97d" name="he16.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97e" name="he17.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97f" name="he18.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97g" name="he19.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97h" name="he20.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97i" name="he43.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="pio97j" name="he44.png" path="/component/hu_effect/image/" exported="true"/>
     <misc id="f8c37k" name="我们项目的素材.rar" path="/component/hu_effect/"/>
-    <image id="f8c37l" name="he1_3.png" path="/component/hu_effect/image/"/>
-    <image id="f8c37m" name="he_4w.png" path="/component/hu_effect/image/"/>
+    <component id="m21r8i" name="com_huType.xml" path="/component/hu_effect/" exported="true"/>
+    <movieclip id="f8c31a" name="xingxing.jta" path="/component/hu_effect/"/>
   </resources>
   <publish name="Extend_MJ_FuZhou" path="..\wb_unity_pro\Assets\ART\extend\majiang\fuzhou\ui" packageCount="2" maxAtlasSize="4096"/>
 </packageDescription>

wb_new_ui/assets/Extend_MJ_JinXi/package.xml

@@ -195,39 +195,6 @@
     <image id="plau69" name="Head0.png" path="/images/clearing/"/>
     <image id="plau6a" name="icon.png" path="/images/" exported="true"/>
     <component id="k1od6b" name="Gang_tip_choice.xml" path="/component/choose/" exported="true"/>
-    <image id="pio97k" name="he1.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97l" name="he2.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97m" name="he3.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97n" name="he4.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97o" name="he5.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97p" name="he6.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97q" name="he7.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97r" name="he8.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97s" name="he9.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97t" name="he10.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97u" name="he11.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97v" name="he12.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97w" name="he13.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="pio97x" name="he14.png" path="/component/hu_effect/image/" exported="true" atlas="1"/>
-    <image id="shqd7y" name="he15.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="shqd7z" name="he16.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="shqd80" name="he17.png" path="/component/hu_effect/image/" exported="true"/>
-    <image id="amfo81" name="he18.png" path="/component/hu_effect/image/"/>
-    <image id="amfo82" name="he19.png" path="/component/hu_effect/image/"/>
-    <image id="amfo83" name="he1_3.png" path="/component/hu_effect/image/"/>
-    <image id="amfo84" name="he20.png" path="/component/hu_effect/image/"/>
-    <image id="amfo85" name="he21.png" path="/component/hu_effect/image/"/>
-    <image id="amfo86" name="he22.png" path="/component/hu_effect/image/"/>
-    <image id="amfo87" name="he23.png" path="/component/hu_effect/image/"/>
-    <image id="amfo88" name="he24.png" path="/component/hu_effect/image/"/>
-    <image id="amfo89" name="he25.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8a" name="he26.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8b" name="he27.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8c" name="he28.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8d" name="he29.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8e" name="he30.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8f" name="he31.png" path="/component/hu_effect/image/"/>
-    <image id="amfo8g" name="he_4w.png" path="/component/hu_effect/image/"/>
   </resources>
   <publish name="Extend_MJ_JinXi" path="..\wb_unity_pro\Assets\ART\extend\majiang\jinxi\ui" packageCount="2" maxAtlasSize="4096"/>
 </packageDescription>