四人同步

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

@@ -1,5 +1,5 @@
 local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView_jiangxi")
-local MJPlayerCardInfoView = import(".MJPlayerCardInfoView_jiangxi")
+local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
 local MJMainView = require("main.majiang.MJMainView")
 local EXClearingView = import(".EXClearingView")
 local TX_GameEvent = import(".GameEvent")
@@ -204,8 +204,6 @@ function M:InitPlayerInfoView()
     local _player_info = self._player_info
     for i = 1, self._room.room_config.people_num do
         local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1))
-        print("lingmengplay", string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1))
-
         _player_info[i] = PlayerInfoView.new(tem, self)
         tem.visible = false
     end
@@ -907,7 +905,6 @@ function M:UpdatePlayerInfoView()
 
     for i = 1, self._room.room_config.people_num do
         local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1))
-        print("lingmengplay", string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1))
         _player_info[i] = PlayerInfoView.new(tem, self)
         _player_info[i]:FillData(list[i])
     end

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

@@ -2,6 +2,7 @@ local EXTEND_MODEL_NAME = ...
 
 local EXGameInfo = import(".EXGameInfo")
 local EXMainView = import(".EXMainView_jaingxi")
+-- local EXMainView = import(".EXMainView")
 local EXGameController = import(".EXGameController")
 local EXRoomConfig = import(".EXRoomConfig")
 local EXPlayBackView = import(".EXPlayBackView")

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

@@ -80,6 +80,9 @@ function M:Clear()
     self._area_handcard_list:RemoveChildren(0, -1, true)
     self._area_outcard_list:RemoveChildren(0, -1, true)
     self._mask_liangpai:RemoveChildren(0, -1, true)
+    self._view_handCardList:RemoveChildrenToPool()
+    self._view_outCardList:RemoveChildrenToPool()
+    self._view_FZList:RemoveChildrenToPool()
 end
 
 -- 获取麻将资源前缀
@@ -126,12 +129,6 @@ function M:UpdateHandCard(getcard, mp)
     getcard = getcard or false
     mp = mp or false
 
-    if self._view_handCardList.numItems > self._player.hand_left_count - 1 then
-        for i = 1, self._view_handCardList.numItems - self._player.hand_left_count + 1 do
-            self._view_handCardList:RemoveChildrenToPool()
-        end
-    end
-
     for i = 0, self._player.hand_left_count - 1 do
         if getcard and i == self._player.hand_left_count - 1 then
             self._ctr_getCard.selectedIndex = 1
@@ -207,7 +204,6 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
     -- outcard = self._view_outCardList:AddItemFromPool()
     -- -- end
     -- self:fillCard2(outcard, outCardName, card_item)
-    self._view_outCardList:RemoveChildrenToPool()
     for i = 0, #outlist - 1 do
         outcard = self._view_outCardList:AddItemFromPool()
         self:fillCard2(outcard, outCardName, outlist[i + 1])

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

@@ -1,5 +1,5 @@
-local MJPlayerSelfCardInfoView = require("main.majiang.MJPlayerSelfCardInfoView")
+local MJPlayerSelfCardInfoView = require("main.majiang.MJPlayerSelfCardInfoView_jiangxi")
-local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
+local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView_jiangxi")
 local CardCheck = import(".CardCheck")
 
 local M = {}

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

@@ -151,10 +151,9 @@ function M:UpdateHandCard(getcard, mp)
     mp = mp or false
 
     local handCardName = self._viewText_cardInfo['Hand_Card']
-    -- if self._view_handCardList.numItems > #card_list - 1 then
+    if self._view_handCardList.numItems > #card_list - 1 then
-    --     self._view_handCardList:RemoveChildrenToPool(#card_list - 1, self._view_handCardList.numItems)
+        self._view_handCardList:RemoveChildrenToPool()
-    -- end
+    end
-    self._view_handCardList:RemoveChildrenToPool()
 
 
     for i = 0, (#card_list) - 1 do
@@ -188,7 +187,6 @@ function M:UpdateHandCard(getcard, mp)
     else
         self._ctr_getCard.selectedIndex = 0
     end
-    print("lingmengself1", self._ctr_getCard.selectedIndex)
     self._view_handCardList.onClickItem:Set(function(context)
         self:__OnClickHandCard(context)
     end)
@@ -214,7 +212,6 @@ function M:UpdateOutCardList(outcard, card_item)
     --         self:fillCard2(outcard, outCardName, outlist[i])
     --     end
     -- end
-    self._view_outCardList:RemoveChildrenToPool()
     for i = 0, #outlist - 1 do
         outcard = self._view_outCardList:AddItemFromPool()
         self:fillCard2(outcard, outCardName, outlist[i + 1])
@@ -372,6 +369,9 @@ function M:Clear(bskip)
     self._area_fz_list:RemoveChildren(0, -1, true)
     self._area_handcard_list:RemoveChildren(0, -1, true)
     self._area_outcard_list:RemoveChildren(0, -1, true)
+    self._view_handCardList:RemoveChildrenToPool()
+    self._view_outCardList:RemoveChildrenToPool()
+    self._view_FZList:RemoveChildrenToPool()
     if bskip == nil or bskip == false then
         self._mask_liangpai:RemoveChildren(0, -1, true)
     end

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

@@ -411,6 +411,7 @@ function M:EventInit()
                 if tem.type > 0 and tem.type < 32 then
                     local com_name = "he" .. tem.type
                     local item = he_list:GetChild("list"):AddItemFromPool("ui://Extend_MJ_NanCheng/" .. com_name)
+                    print("lingmenghe", "ui://Extend_MJ_NanCheng/" .. com_name)
                     coroutine.wait(0.3)
                 end
             end

lua_probject/main_project/main/majiang/MJPlayerCardInfoView_jiangxi.lua

@@ -0,0 +1,635 @@
+AreaOderType = {
+    left_right = 'left_right',
+    right_left = 'right_left',
+    up_down = 'up_down',
+    down_up = 'down_up'
+}
+
+local PlayerCardInfoView = {
+    _view = nil,
+    _mainView = nil,
+    _mask_liangpai = nil,
+    _mask_data = nil,
+    _area_handcard_list = nil,
+    _src_fz_list = nil,
+    _current_card_type = -1
+}
+
+local M = PlayerCardInfoView
+
+--- Create a new PlayerCardInfoView
+function M.new(view, mainView)
+    local self = {}
+    setmetatable(self, { __index = M })
+    self._view = view
+    self._mainView = mainView
+    self:init()
+    return self
+end
+
+function M:init()
+    local view = self._view
+    local _area_mask = view:GetChild('area_mask')
+    local mask = _area_mask.text
+
+    self._mask_data = json.decode(mask)
+    self._area_handcard_list = view:GetChild('area_handcard_list')
+
+    self._area_fz_list = view:GetChild('area_fz_list')
+    self._area_outcard_list = view:GetChild('area_outcard_list')
+    self._src_fz_list =
+        Vector4(self._area_fz_list.x, self._area_fz_list.y, self._area_fz_list.width, self._area_fz_list.height)
+    local c3d = self._view:GetController('3d')
+    if c3d ~= nil then
+        c3d.selectedIndex = 1
+    end
+    self._src_fz_list_3d =
+        Vector4(self._area_fz_list.x, self._area_fz_list.y, self._area_fz_list.width, self._area_fz_list.height)
+    local c3d = self._view:GetController('3d')
+    if c3d ~= nil then
+        c3d.selectedIndex = 0
+    end
+
+    self._mask_liangpai = view:GetChild('mask_liangpai')
+
+    local _gamectr = ControllerManager.GetController(GameController)
+    if _gamectr then
+        _gamectr:AddEventListener(GameEvent.MJModifySzie, handler(self, self.SetMJSize))
+    end
+end
+
+function M:SetMJSize(zS)
+    local tempSzieConfig = {}
+    tempSzieConfig.size = zS
+    local filename = 'mjsize' .. DataManager.SelfUser.account_id
+    Utils.SaveLocalFile(filename, json.encode(tempSzieConfig))
+
+    --ControllerManager.OnConnect(SocketCode.TimeoutDisconnect)
+    ViewManager.refreshGameView()
+end
+
+function M:SetPlayer(p)
+    self._player = p
+end
+
+function M:FillData(begin)
+    if (begin) then
+        for i = 1, #self._player.fz_list do
+            self:UpdateFzList(self._player.fz_list[i], -1)
+        end
+        self:UpdateOutCardList()
+    else
+        self._current_card_type = DataManager.CurrenRoom.card_type
+
+        if self._current_card_type == 2 then
+            local c3d = self._view:GetController('3d')
+            if c3d ~= nil then
+                c3d.selectedIndex = 1
+            end
+        else
+            local c3d = self._view:GetController('3d')
+            if c3d ~= nil then
+                c3d.selectedIndex = 0
+            end
+        end
+    end
+end
+
+function M:Clear()
+    --self._ctr_state.selectedIndex = 0
+    self._area_fz_list.x = self._src_fz_list.x
+    self._area_fz_list.y = self._src_fz_list.y
+    self._area_fz_list.width = self._src_fz_list.z
+    self._area_fz_list.height = self._src_fz_list.w
+
+    self._area_fz_list:RemoveChildren(0, -1, true)
+    self._area_handcard_list:RemoveChildren(0, -1, true)
+    self._area_outcard_list:RemoveChildren(0, -1, true)
+    self._mask_liangpai:RemoveChildren(0, -1, true)
+end
+
+-- 获取麻将资源前缀
+function M:GetPrefix()
+    -- local card_type = DataManager.CurrenRoom.card_type
+    -- local prefix = card_type == 1 and "a" or ""
+    -- return prefix
+    return get_majiang_prefix(DataManager.CurrenRoom.game_id)
+end
+
+function M:fillCard(obj, pos_str, card, use3d)
+    if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing and obj:GetController('jing') then
+        obj:GetController('jing').selectedIndex = 1
+    end
+    if self._current_card_type == 2 and (use3d == nil or use3d == true) then
+        obj.icon = 'ui://MajiangCard3d/' .. 'b' .. pos_str .. card
+    else
+        obj.icon = 'ui://Main_Majiang/' .. self:GetPrefix() .. pos_str .. card
+    end
+end
+
+function M:fillCard2(obj, pos_str, card)
+    if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing and obj:GetController('jing') then
+        obj:GetController('jing').selectedIndex = 1
+    end
+    obj:GetChild("icon").url = 'ui://Main_Majiang/' .. pos_str .. card
+end
+
+function M:getBackCard(card)
+    return 'ui://Main_Majiang/' .. card
+end
+
+function M:GetCard(btn)
+    local pic_name = split(btn.icon, '/')[4]
+    local lst = string.split(pic_name, '_')
+    return tonumber(lst[2] or 0)
+end
+
+function M:UpdateHandCard(getcard, mp)
+    getcard = getcard or false
+    mp = mp or false
+    local handcard_list = self._mask_data['handcard_list']
+    local oder = handcard_list['oder']
+    local _player = self._player
+    -- -- print(vardump(self._player))
+
+    self._area_handcard_list:RemoveChildren(0, -1, true)
+    -- -- print(vardump(_player.card_list))
+    if (not mp) then
+        local comp_back = handcard_list['comp_back']
+        if self._current_card_type == 2 then
+            comp_back = comp_back .. '_3d'
+        end
+
+        for i = 0, _player.hand_left_count - 1 do
+            local obj = UIPackage.CreateObjectFromURL(self:getBackCard(comp_back))
+            local _room = DataManager.CurrenRoom
+            local people_num = _room.room_config.people_num
+            local pos = ViewUtil.GetPos(_room.self_player.seat, _player.seat, people_num)
+            local gap = (pos == 3 and people_num == 4 or pos == 2 and people_num == 2) and 15 or 45
+            local offset = getcard and (i == _player.hand_left_count - 1 and gap or 0)
+            -- local offset = getcard and (i == _player.hand_left_count - 1 and 15 or 0)
+            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
+
+            --改变左右两边的手牌的x值
+            if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
+                obj.x = i * -7.0
+            end
+
+            if (oder == AreaOderType.down_up) then
+                self._area_handcard_list:AddChildAt(obj, 0)
+            else
+                self._area_handcard_list:AddChild(obj)
+            end
+        end
+    else
+        local outcard_list = self._mask_data['outcard_list']
+        local comp = handcard_list['comp']
+        local card = outcard_list['card']
+        ---- print("comp"..comp)
+        -- -- print(vardump(_player.card_list))
+
+        if self._current_card_type == 2 then
+            comp = comp .. '_3d'
+        end
+
+        for i = 0, #_player.card_list - 1 do
+            local obj = UIPackage.CreateObject('Main_Majiang', comp)
+
+            self:fillCard(obj, card, _player.card_list[i + 1])
+            -- obj.icon = UIPackage.GetItemURL("Main_Majiang", card .. _player.card_list[i+1])
+
+            local offset = getcard and (i == _player.hand_left_count - 1 and 0 or 0)
+
+            ViewUtil.CardPos(obj, self._area_handcard_list, oder, i, offset)
+
+            --改变左右两边的手牌的x值
+            if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
+                obj.x = i * -7
+            end
+
+            if (oder == AreaOderType.down_up) then
+                self._area_handcard_list:AddChildAt(obj, 0)
+            else
+                self._area_handcard_list:AddChild(obj)
+            end
+        end
+    end
+end
+
+-- 获取麻将图片资源位置，可以在扩展中复写
+function M:GetCardPicPack()
+    -- if DataManager.CurrenRoom.card_type == 2 then
+    --     return "MajiangCard3d"
+    -- else
+    return 'Main_Majiang'
+    -- end
+end
+
+function M:adjust3dOutPut(obj, area, oder, num, index)
+    if index >= num then
+        local row = 1 + math.floor(((index - num) / (num + 2)))
+        local col = ((index - num) % (num + 2))
+
+        if oder == AreaOderType.left_right then
+            obj.x = obj.x + math.floor((area.width - obj.width * (num + 2)) / 2)
+        elseif oder == AreaOderType.right_left then
+            obj.x = obj.x - math.floor((area.width - obj.width * (num + 2)) / 2)
+        elseif oder == AreaOderType.up_down then
+            obj.y = obj.y + math.floor((area.height - obj.height * (num + 2)) / 2)
+            obj.x = obj.x - col * 7 + 7 * (row + 1)
+        elseif oder == AreaOderType.down_up then
+            obj.y = obj.y - math.floor((area.height - obj.height * (num + 2)) / 2)
+            obj.x = obj.x - col * 7 - 7 * (row - 1)
+        end
+    else
+        if oder == AreaOderType.left_right then
+            obj.x = obj.x + math.floor((area.width - obj.width * num) / 2)
+        elseif oder == AreaOderType.right_left then
+            obj.x = obj.x - math.floor((area.width - obj.width * num) / 2)
+        elseif oder == AreaOderType.up_down then
+            obj.y = obj.y + math.floor((area.height - obj.height * num) / 2)
+            obj.x = obj.x - index * 7
+        elseif oder == AreaOderType.down_up then
+            obj.y = obj.y - math.floor((area.height - obj.height * num) / 2)
+            obj.x = obj.x - index * 7
+        end
+    end
+end
+
+function M:UpdateOutCardList(outcard, card_item, cursor)
+    outcard = outcard or nil
+    card_item = card_item or 0
+    cursor = cursor or nil
+
+    local outlist = self._player.outcard_list
+    if (outcard) then
+        outcard:SetPivot(0.5, 0.5, true)
+        outcard.touchable = false
+        -- outcard.icon = "ui://Main_Majiang/" .. self:GetPrefix() .. "202_" .. card_item
+        outcard.icon = string.format('ui://%s/%s202_%s', self:GetCardPicPack(), self:GetPrefix(), card_item)
+        self._mask_liangpai:AddChild(outcard)
+    end
+
+    local outcard_list = self._mask_data['outcard_list']
+    local oder = outcard_list['oder']
+    local comp = outcard_list['comp']
+    local card = outcard_list['card']
+    local multi_oder = outcard_list['multi_oder']
+    local num = outcard_list['num']
+    local multi_draw_oder = 0
+    local sortStart = 0
+    local sortType = 0
+    local sortStep = 0
+    if (outcard_list['multi_draw_oder']) then
+        multi_draw_oder = outcard_list['multi_draw_oder']
+    end
+
+    if self._current_card_type == 2 then
+        comp = comp .. '_3d'
+        num = outcard_list['num3d']
+        multi_oder = outcard_list['multi_oder3d']
+        sortType = outcard_list['sorting_order3d']
+        card = outcard_list['card3d']
+        if sortType == 1 then
+            sortStart = 1
+            sortStep = 1
+        elseif sortType == -1 then
+            sortStart = #outlist
+            sortStep = -1
+        end
+    end
+
+    local obj = nil
+    self._area_outcard_list:RemoveChildren(0, -1, true)
+    for i = 0, #outlist - 1 do
+        obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
+        local row = math.floor(i / num)
+        local col = math.floor(i % num)
+
+        if self._current_card_type == 2 then
+            if i >= num then
+                row = 1 + math.floor(((i - num) / (num + 2)))
+                col = ((i - num) % (num + 2))
+            end
+        end
+        if DataManager.CurrenRoom.room_config.people_num == 2 then
+            ViewUtil.CardPos(obj, self._area_outcard_list, oder, col, nil, nil, -6)
+            ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row, nil, nil, -12)
+        elseif DataManager.CurrenRoom.room_config.people_num == 4 then
+            ViewUtil.CardPos(obj, self._area_outcard_list, oder, col, nil, nil, -6)
+            ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row, nil, nil, -12)
+        else
+            ViewUtil.CardPos(obj, self._area_outcard_list, oder, col)
+            ViewUtil.CardPos(obj, self._area_outcard_list, multi_oder, row)
+        end
+
+
+        if self._current_card_type == 2 then
+            self:adjust3dOutPut(obj, self._area_outcard_list, oder, num, i)
+        end
+
+        self:fillCard(obj, card, outlist[i + 1])
+        -- 添加角标
+        self:AddFlag(i + 1, outlist[i], obj)
+        -- obj.icon = "ui://Main_Majiang/"..card .. outlist[i+1]
+        sortStart = sortStart + sortStep
+        obj.sortingOrder = sortStart
+        obj.data = outlist[i + 1]
+
+        if (oder == AreaOderType.down_up or (multi_draw_oder == 1)) then
+            self._area_outcard_list:AddChildAt(obj, 0)
+        else
+            self._area_outcard_list:AddChild(obj)
+        end
+    end
+    if (obj and cursor) then
+        cursor.xy = Vector2(obj.width / 2, obj.height / 2)
+        obj:AddChild(cursor)
+        obj:GetController('color').selectedIndex = 1
+    end
+end
+
+-- 设置添加角标的方法
+function M:SetAddFlag(cb)
+    self.__addFlag = cb
+end
+
+-- 给麻将牌添加flag
+function M:AddFlag(index, card, btn)
+    if not self.__addFlag then
+        return
+    end
+    local str_flag = self.__addFlag(index, card, btn)
+    btn:GetController('hun').selectedIndex = str_flag == '' and 0 or 1
+    btn:GetChild('flag').icon = str_flag
+end
+
+local function getPos(my_seat, other_seat, total)
+    local pos = 0
+    pos = other_seat - my_seat + 1
+    if pos <= 0 then
+        pos = pos + total
+    end
+    if total ~= 4 and pos == total then
+        pos = total + 1
+    end
+    return pos
+end
+
+function M:UpdateFzList(fz, index, show_card)
+    local gn = 3
+    if fz.type == FZType.Gang or fz.type == FZType.Gang_An or fz.type == FZType.Gang_Peng then
+        gn = 4
+    end
+
+    local fz_list = self._mask_data['fz_list']
+    local oder = fz_list['oder']
+    local comp = fz_list['comp'] .. gn
+    local card = fz_list['card']
+    local card3d = ''
+    local adjust3d = 0
+    if self._current_card_type == 2 then
+        comp = comp .. '_3d'
+        oder = fz_list['oder3d']
+        adjust3d = fz_list['adjust3d']
+        card = fz_list['card3d']
+        card3d = 'b'
+    end
+
+    local obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp)
+    -- print("============================================pengpengpeng", comp)
+
+    local _area_fz_list = self._area_fz_list
+    local _area_outcard_list = self._area_outcard_list
+
+    if (index == -1) then
+        local num = _area_fz_list.numChildren
+
+        if (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
+            _area_fz_list.height = _area_fz_list.height + obj.height
+            if (oder == AreaOderType.down_up) then
+                local tem1 = obj.height
+                for i = 1, num do
+                    local tem = _area_fz_list:GetChildAt(num - i)
+                    tem.y = tem.y + tem1
+                end
+                _area_fz_list.y = _area_fz_list.y - obj.height
+            else
+                ViewUtil.CardPos(obj, _area_outcard_list, oder, num)
+            end
+        elseif (oder == AreaOderType.left_right or oder == AreaOderType.right_left) then
+            _area_fz_list.width = _area_fz_list.width + obj.width
+            if (oder == AreaOderType.right_left) then
+                local tem1 = obj.width
+                for i = 1, num do
+                    local tem = _area_fz_list:GetChildAt(num - i)
+                    tem.x = tem.x + tem1
+                end
+                _area_fz_list.x = _area_fz_list.x - obj.width
+            else
+                ViewUtil.CardPos(obj, _area_outcard_list, oder, num)
+            end
+        end
+        _area_fz_list:AddChild(obj)
+
+        if self._current_card_type == 2 and (oder == AreaOderType.down_up or oder == AreaOderType.up_down) then
+            num = _area_fz_list.numChildren
+            for i = 1, num do
+                local tem = _area_fz_list:GetChildAt(i - 1)
+                tem.x = adjust3d * (i - 1)
+            end
+        end
+    else
+        local obj1 = _area_fz_list:RemoveChildAt(index)
+        obj1:Dispose()
+        obj.xy = obj1.xy
+        _area_fz_list:AddChildAt(obj, index)
+    end
+
+    -- 显示fz的牌
+    local obj_show
+    if show_card then
+        obj_show = UIPackage.CreateObjectFromURL('ui://Main_Majiang/Fz_0_' .. gn)
+    end
+
+    for i = 1, gn do
+        local _oc = obj:GetChild('card_' .. i)
+        local _oc2 = nil
+
+        if show_card then
+            _oc2 = obj_show:GetChild('card_' .. i)
+        end
+
+        if (fz.type == FZType.Gang_An and i == gn) then
+            if self._current_card_type == 2 then
+                _oc.icon = UIPackage.GetItemURL('MajiangCard3d', card3d .. card .. '00')
+            else
+                _oc.icon = UIPackage.GetItemURL(self:GetCardPicPack(), card3d .. card .. '00')
+            end
+
+            if show_card then
+                _oc2.icon = UIPackage.GetItemURL('Main_Majiang', '202_00')
+            end
+        else
+            if (fz.type == FZType.Chi) then
+                local index = i
+                if oder == AreaOderType.right_left or oder == AreaOderType.down_up then
+                    index = gn - i + 1
+                end
+
+                self:fillCard(_oc, card, fz.opcard[index])
+
+                if show_card then
+                    self:fillCard(_oc2, '202_', fz.opcard[index], false)
+                end
+            else
+                self:fillCard(_oc, card, fz.card)
+
+                if show_card then
+                    self:fillCard(_oc2, '202_', fz.card, false)
+                end
+            end
+        end
+    end
+
+    obj.touchable = false
+
+    if show_card then
+        obj_show.touchable = false
+        obj_show:SetPivot(0.5, 0.5, true)
+        obj_show:SetScale(0.8, 0.8)
+        self._mask_liangpai:AddChildAt(obj_show, 0)
+        coroutine.start(
+            function()
+                coroutine.wait(2)
+                obj_show:Dispose()
+            end
+        )
+    end
+
+    -- -- 标记碰牌对象
+    -- local num = self._area_fz_list.numChildren
+    -- if num == 0 then return end
+    -- if index == -1 then
+    --     -- local obj = self._area_fz_list:GetChildAt(num - 1)
+    --     local pic_arrow = UIPackage.CreateObjectFromURL("ui://Main_Majiang/com_arrow")
+    --     obj:AddChild(pic_arrow)
+    --     pic_arrow:Center()
+    --     local my_seat = self._player.seat
+    --     if fz.from_seat ~= my_seat then
+    --         pic_arrow:GetController("show").selectedIndex = 1
+    --         pic_arrow:GetController("pos").selectedIndex = getPos(DataManager.CurrenRoom.self_player.seat, fz.from_seat, #DataManager.CurrenRoom.player_list)
+    --         pic_arrow:SetPivot(0.5, 0.5)
+    --         if DataManager.CurrenRoom.self_player.seat ~= self._player.seat then
+    --             pic_arrow.scaleX = 0.5
+    --             pic_arrow.scaleY = 0.5
+    --         end
+    --     end
+    -- end
+end
+
+function M:GetOutCardByIndex(index)
+    local outcard_list = self._mask_data['outcard_list']
+    local oder = outcard_list['oder']
+    local multi_draw_oder = 0
+    if (outcard_list['multi_draw_oder']) then
+        multi_draw_oder = outcard_list['multi_draw_oder']
+    end
+
+    if (oder == AreaOderType.down_up or (multi_draw_oder == 1)) then
+        return self._area_outcard_list:GetChildAt(self._area_outcard_list.numChildren - index)
+    else
+        return self._area_outcard_list:GetChildAt(index - 1)
+    end
+end
+
+function M:ResetFzList()
+    for i = 1, #self._player.fz_list do
+        local fz = self._player.fz_list[i]
+        -- if fz.type ~= FZType.Gang_Peng then
+        self:UpdateFzList(fz, -1)
+        -- else
+        --   self:UpdateFzList(fz, i)
+        -- end
+    end
+end
+
+local function replace_card(obj, prefix)
+    local url = obj.icon
+    if url then
+        local len = string.len(url)
+        local pos = string.len('ui://Main_Majiang/') + 1
+        local head_char = string.sub(url, pos, pos)
+        local card = string.sub(url, pos, len)
+        if head_char >= 'a' then
+            card = string.sub(card, 2, len)
+        end
+        obj.icon = 'ui://Main_Majiang/' .. prefix .. card
+    end
+end
+
+function M:ResetCardType()
+    local old_card_type = self._current_card_type
+    self._current_card_type = DataManager.CurrenRoom.card_type
+
+    --设置3d标志
+    if self._current_card_type == 2 then
+        local c3d = self._view:GetController('3d')
+        if c3d ~= nil then
+            c3d.selectedIndex = 1
+
+            self._area_fz_list.x = self._src_fz_list_3d.x
+            self._area_fz_list.y = self._src_fz_list_3d.y
+            self._area_fz_list.width = self._src_fz_list_3d.z
+            self._area_fz_list.height = self._src_fz_list_3d.w
+        end
+    else
+        local c3d = self._view:GetController('3d')
+        if c3d ~= nil then
+            c3d.selectedIndex = 0
+            self._area_fz_list.x = self._src_fz_list.x
+            self._area_fz_list.y = self._src_fz_list.y
+            self._area_fz_list.width = self._src_fz_list.z
+            self._area_fz_list.height = self._src_fz_list.w
+        end
+    end
+
+    local change2d = false
+    if old_card_type == 2 and self._current_card_type ~= 2 then
+        change2d = true
+    end
+
+    local change3d = false
+    if old_card_type ~= 2 and self._current_card_type == 2 then
+        change3d = true
+    end
+
+    if change2d == false and change3d == false and self._current_card_type ~= 2 then
+        local prefix = self:GetPrefix()
+
+        --更新已出牌
+        for i = 1, self._area_outcard_list.numChildren do
+            local obj = self._area_outcard_list:GetChildAt(i - 1)
+            replace_card(obj, prefix)
+        end
+
+        --更新手牌
+        for i = 1, self._area_handcard_list.numChildren do
+            local obj = self._area_handcard_list:GetChildAt(i - 1)
+            replace_card(obj, prefix)
+        end
+
+        --更新放子牌
+        for i = 1, self._area_fz_list.numChildren do
+            local com = self._area_fz_list:GetChildAt(i - 1)
+            for j = 1, 4 do
+                local obj = com:GetChild('card_' .. j)
+                if obj then
+                    replace_card(obj, prefix)
+                end
+            end
+        end
+    end
+end
+
+return M

lua_probject/main_project/main/majiang/MJPlayerSelfCardInfoView_jiangxi.lua

@@ -0,0 +1,267 @@
+local MJPlayerCardInfoView = import(".MJPlayerCardInfoView")
+
+local CardView = {
+    card = nil,
+    -- 牌序号
+    card_item = 0,
+    -- 索引
+    index = 0,
+    -- 原始位置
+    old_postion = Vector2.zero
+}
+
+local function NewCardView(card, cardItem)
+    local self = {}
+    setmetatable(self, { __index = CardView })
+    self.card = card
+    self.card_item = cardItem
+    return self
+end
+
+local PlayerSelfView = {
+    _dragCom = nil,
+    _carViewList = {}
+}
+
+local M = PlayerSelfView
+
+function PlayerSelfView.new(view, mainView)
+    setmetatable(M, { __index = MJPlayerCardInfoView })
+    local self = setmetatable({}, { __index = M })
+    self._view = view
+    self._mainView = mainView
+    self:init()
+    return self
+end
+
+function M:init()
+    MJPlayerCardInfoView.init(self)
+
+    local filename = 'mjsize' .. DataManager.SelfUser.account_id
+    local json_data = Utils.LoadLocalFile(filename)
+    if json_data then
+        local _data = json.decode(json_data)
+        if _data.size == 0 then
+            self._area_handcard_list:SetScale(1, 1.1)
+            self._area_fz_list:SetScale(0.6, 0.6)
+        elseif _data.size == 1 then
+            self._area_handcard_list:SetScale(1, 1)
+            self._area_fz_list:SetScale(1, 1)
+        elseif _data.size == 2 then
+            self._area_handcard_list:SetScale(0.8, 0.8)
+            self._area_fz_list:SetScale(0.8, 0.8)
+        end
+    end
+end
+
+function M:setHandCardPos(btn_card, i, getcard)
+    if DataManager.CurrenRoom.room_config.people_num == 2 then
+        btn_card.x = i * (btn_card.width - 12) + (getcard and 20 or 0)
+    elseif DataManager.CurrenRoom.room_config.people_num == 4 then
+        btn_card.x = i * (btn_card.width - 12) + (getcard and 20 or 0)
+    else
+        btn_card.x = i * btn_card.width * 1.05 + (getcard and 20 or 0)
+    end
+end
+
+function M:UpdateHandCard(getcard, mp)
+    print("==========================UpdateHandCardold", getcard, mp)
+    if self.outcard_button then
+        self.outcard_button:Dispose()
+        self.outcard_button = nil
+    end
+    getcard = getcard or false
+    mp = mp or false
+    local pv = self
+    local _carViewList = self._carViewList
+
+    local _lit = pv._area_handcard_list
+    for i = 1, #_carViewList do
+        _carViewList[i].card:Dispose()
+    end
+    _carViewList = {}
+    local _dragCom = self._dragCom
+    if (_dragCom == nil) then
+        _dragCom = UIPackage.CreateObject("Common", "UIPanel")
+        _dragCom.size = Vector2(1, 1)
+        pv._view:AddChild(_dragCom)
+    end
+    _dragCom.xy = pv._area_handcard_list.xy
+    self._dragCom = _dragCom
+    self._carViewList = _carViewList
+
+    local b3d = ""
+    if self._current_card_type == 2 then
+        b3d = "_3d"
+    end
+
+    local _room = DataManager.CurrenRoom
+    local cards = _room.self_player.card_list
+
+    if (not mp) then
+        for i = 0, (#cards) - 1 do
+            local tem_card = cards[i + 1]
+            local btn_card = nil
+            if _room.room_config.people_num == 2 then
+                btn_card = UIPackage.CreateObject(self:GetCardObjPack(), "Btn_Card_jiangxi" .. b3d)
+            elseif _room.room_config.people_num == 4 then
+                btn_card = UIPackage.CreateObject(self:GetCardObjPack(), "Btn_Card_new_4" .. b3d)
+            else
+                btn_card = UIPackage.CreateObject(self:GetCardObjPack(), "Btn_Card" .. b3d)
+                btn_card:SetScale(1.05, 1.05)
+            end
+
+            -- btn_card.icon = UIPackage.GetItemURL("Main_Majiang", "201_" .. tem_card)
+            self:fillCard(btn_card, "201_", tem_card)
+            self:setHandCardPos(btn_card, i, i == #cards - 1 and getcard)
+            local c_v = NewCardView(btn_card, tem_card)
+            c_v.index = i
+            c_v.old_postion = btn_card.xy
+            _carViewList[#_carViewList + 1] = c_v
+
+            _lit:AddChild(btn_card)
+
+            if (not self._player.auto_out_card) then
+                btn_card.data = c_v
+                -- btn_card.draggable = true;
+                -- btn_card.onDragStart:Set(function(evt)
+                --     local _agent = evt.sender
+                --     _agent:RemoveFromParent()
+                --     _dragCom:AddChild(_agent)
+                --     if self.__OnDragStart then
+                --     	self:__OnDragStart(evt)
+                --     end
+                --     _agent.onDragEnd:Set(self.__OnDragEnd,self)
+                -- end)
+                btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin))
+                btn_card.onTouchMove:Set(handler(self, self.onTouchMove))
+                btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd))
+                btn_card.onClick:Set(self.__OnClickHandCard, self)
+            else
+                btn_card:GetChild("icon").color = Color(0.5, 0.5, 0.5)
+                btn_card.touchable = false
+            end
+        end
+    else
+        for i = 0, (#cards) - 1 do
+            local mp_card = UIPackage.CreateObject("Main_Majiang", "Mp_self_card" .. b3d)
+            -- mp_card.icon = UIPackage.GetItemURL("Main_Majiang", "202_" .. cards[i+1])
+            self:fillCard(mp_card, "202_", cards[i + 1])
+            mp_card:SetScale(1.05, 1.05)
+            -- mp_card.x = i * mp_card.width + (i == #cards - 1 and getcard and 20 or 0)
+            self:setHandCardPos(mp_card, i, i == #cards - 1 and getcard)
+            _lit:AddChild(mp_card)
+        end
+    end
+
+    local handCardName = self._viewText_cardInfo['Hand_Card']
+    if self._view_handCardList.numItems > #cards - 1 then
+        self._view_handCardList:RemoveChildrenToPool()
+    end
+
+
+    for i = 0, (#cards) - 1 do
+        local tem_card = cards[i + 1]
+        local btn_card
+        if getcard and i == (#cards) - 1 then
+            btn_card = self._viewBtn_getCard
+            btn_card.onClick:Set(function(context)
+                self:__OnClickGetCard(context)
+            end)
+        else
+            if i >= self._view_handCardList.numItems then
+                btn_card = self._view_handCardList:AddItemFromPool()
+            else
+                btn_card = self._view_handCardList:GetChildAt(i)
+            end
+        end
+        self:fillCard2(btn_card, handCardName, tem_card)
+        local c_v = NewCardView(btn_card, tem_card)
+        c_v.index = i
+        c_v.old_postion = btn_card.xy
+        _carViewList[#_carViewList + 1] = c_v
+        btn_card.data = c_v
+        btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin))
+        btn_card.onTouchMove:Set(handler(self, self.onTouchMove))
+        btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd))
+    end
+
+    if getcard then
+        self._ctr_getCard.selectedIndex = 1
+    else
+        self._ctr_getCard.selectedIndex = 0
+    end
+    self._view_handCardList.onClickItem:Set(function(context)
+        self:__OnClickHandCard(context)
+    end)
+end
+
+function M:onTouchBegin(context)
+    local button = context.sender
+    local card = button.data
+    local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
+    card.touch_pos = xy - button.xy
+    if self.__OnDragStart then
+        self:__OnDragStart(card.card_item)
+    end
+end
+
+function M:onTouchMove(context)
+    local button = context.sender
+    local card = button.data
+    local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
+    button.xy = xy - card.touch_pos
+end
+
+function M:__OnDragEnd(context)
+    if self.outcard_button then
+        self.outcard_button:Dispose()
+        self.outcard_button = nil
+    end
+    local button = context.sender
+    -- button.onDragEnd:Set(nil)
+    --button:RemoveFromParent()
+    local card = button.data
+    local _room = DataManager.CurrenRoom
+    if not _room or _room:GetReloadStatus() then return end
+
+    -- -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat)
+    if (button.y < -150 and _room.curren_outcard_seat == _room.self_player.seat) then
+        self._mainView:OutCard(card.card_item)
+        button.touchable = false
+        self.outcard_button = buttond
+    else
+        self._area_handcard_list:AddChildAt(button, card.index)
+        button:TweenMove(card.old_postion, 0.2)
+    end
+end
+
+function M:__OnClickHandCard(context)
+    local button = context.sender
+    local _carViewList = self._carViewList
+    for i = 1, #_carViewList do
+        if (_carViewList[i].card ~= button) then
+            _carViewList[i].card.selected = false
+        end
+    end
+    local _room = DataManager.CurrenRoom
+    if (Utils.IsDoubleClick(context) and _room.curren_outcard_seat == _room.self_player.seat) then
+        local card = button.data
+        self._mainView:OutCard(card.card_item)
+    end
+end
+
+-- 获取手牌资源位置，可以在扩展中复写
+function M:GetCardObjPack()
+    return "Main_Majiang"
+end
+
+function M:Clear()
+    MJPlayerCardInfoView.Clear(self)
+    for i = 1, #self._carViewList do
+        self._carViewList[i].card:Dispose()
+    end
+    self._carViewList = {}
+end
+
+return M