金溪同步

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

@@ -1,6 +1,7 @@
 local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
-local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
+local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView_jiangxi")
 local MJMainView = require("main.majiang.MJMainView")
+local TableBG = require("Game.Data.TableBG")
 local EXClearingView = import(".EXClearingView")
 local TX_GameEvent = import(".GameEvent")
 local HuTipView = import("main.majiang.HuTipView")
@@ -8,6 +9,13 @@ local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
 local M = {}
 
+
+local bg_config = {
+    { id = 1, url = "extend/majiang/jinxi/bg/bg1", thumb = "ui://Extend_MJ_JinXi/bg1" },
+    { id = 2, url = "extend/majiang/jinxi/bg/bg2", thumb = "ui://Extend_MJ_JinXi/bg2" },
+    { id = 3, url = "extend/majiang/jinxi/bg/bg3", thumb = "ui://Extend_MJ_JinXi/bg3" },
+    { id = 4, url = "extend/majiang/jinxi/bg/bg4", thumb = "ui://Extend_MJ_JinXi/bg4" }
+}
 --- Create a new ZZ_MainView
 function M.new()
     setmetatable(M, { __index = MJMainView })
@@ -25,15 +33,19 @@ function M:InitView(url)
     self._gps_style = 1
     self._full = true
     UIPackage.AddPackage("extend/majiang/jinxi/ui/Extend_MJ_JinXi")
-    if self._room.room_config.people_num == 2 then
+    -- if self._room.room_config.people_num == 2 then
-        MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)
+    --     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)
-    else
+    -- else
-        MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
+    --     MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
+    -- end
+    local use_custom_bg = true
+    MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num),
+        use_custom_bg)
+    if use_custom_bg then
+        TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config)
     end
     self._hu_tip = HuTipView.new(self)
 
-    self._view:GetChild('wanfa_text').text = room.room_config.people_num .. '人个旧麻将 ' .. room.score_times .. '倍'
-
     self.selectLaiziBtn = self._view:GetChild('selectlaizi')
     self.Laizi1Btn = self._view:GetChild('selectgang1')
     self.Laizi2Btn = self._view:GetChild('selectgang2')
@@ -46,8 +58,15 @@ function M:InitView(url)
     --[[
     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)
     --]]
+    local config = ExtendManager.GetExtendConfig(room.game_id)
+    local mode = config:GetGameInfo()
+    local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
+    self._view:GetChild('wanfa_text').text = gamePlay
 
     self.jing = self._view:GetChild('jing')
+    self._state.onChanged:Add(function()
+        self:UpdatePlayerInfoView()
+    end)
 
     local showNextCtr = self._view:GetController('showNext')
     local ShowNextConfrimCtr = self._view:GetController('showNextConfrim')
@@ -84,49 +103,49 @@ function M:InitView(url)
         showNextList.selectedIndex = -1
         self._showNextName = nil
     end)
-    if self._room.room_config.people_num == 2 then
-        local btn_closeRoom = self._view:GetChild("btn_setting")
 
-        self._view:GetChild('btn_closeRoom').onClick:Set(function()
+    local btn_closeRoom = self._view:GetChild("btn_setting")
-            ---[[
+
-            --旧
+    self._view:GetChild('btn_closeRoom').onClick:Set(function()
-            local tip_owner = '您是否退出房间？\n（退出房间后房间将解散）'
+        ---[[
-            local tip = '您是否退出房间？' -- \n (请注意,申请洗牌后退出,不会返还洗牌分)
+        --旧
-            local tipStr = ''
+        local tip_owner = '您是否退出房间？\n（退出房间后房间将解散）'
-            if self._room.agent then
+        local tip = '您是否退出房间？' -- \n (请注意,申请洗牌后退出,不会返还洗牌分)
-                tipStr = '您是否退出房间？'
+        local tipStr = ''
-            else
+        if self._room.agent then
-                tipStr = self._room.owner_id == self._room.self_player.self_user.account_id and tip_owner or tip
+            tipStr = '您是否退出房间？'
-            end
+        else
-            local _curren_msg = MsgWindow.new(self._root_view, tipStr, MsgWindow.MsgMode.OkAndCancel)
+            tipStr = self._room.owner_id == self._room.self_player.self_user.account_id and tip_owner or tip
-            _curren_msg.onOk:Add(
+        end
-                function()
+        local _curren_msg = MsgWindow.new(self._root_view, tipStr, MsgWindow.MsgMode.OkAndCancel)
-                    if self._state.selectedIndex > 0 and self._state.selectedIndex < 3 then
+        _curren_msg.onOk:Add(
-                        ViewUtil.ErrorTip(nil, '房间已开始,无法退出游戏。')
+            function()
-                    else
+                if self._state.selectedIndex > 0 and self._state.selectedIndex < 3 then
-                        ViewUtil.ShowModalWait(self._root_view)
+                    ViewUtil.ErrorTip(nil, '房间已开始,无法退出游戏。')
-                        self._gamectr:LevelRoom(
+                else
-                            function(res)
+                    ViewUtil.ShowModalWait(self._root_view)
-                                ViewUtil.CloseModalWait()
+                    self._gamectr:LevelRoom(
-                                if res.ReturnCode == 0 then
+                        function(res)
-                                    ViewManager.ChangeView(ViewManager.View_Family)
+                            ViewUtil.CloseModalWait()
-                                else
+                            if res.ReturnCode == 0 then
-                                    ViewUtil.ErrorTip(res.ReturnCode)
+                                ViewManager.ChangeView(ViewManager.View_Family)
-                                end
+                            else
+                                ViewUtil.ErrorTip(res.ReturnCode)
                             end
-                        )
+                        end
-                    end
+                    )
                 end
-            )
+            end
-            _curren_msg:Show()
+        )
-            --]]
+        _curren_msg:Show()
-        end)
+        --]]
+    end)
+
+    btn_closeRoom.onClick:Add(handler(self, function()
+        local settingView = SettingView.new(self)
+        settingView:Show()
+    end))
 
-        btn_closeRoom.onClick:Add(handler(self, function()
-            local settingView = SettingView.new(self)
-            settingView:Show()
-        end))
-    end
 
     --------
     self:PlayerChangeLineState()
@@ -186,13 +205,8 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    if self._room.room_config.people_num == 2 then
+    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
-        self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+        self._room.room_config.round)
-            self._room.room_config.round)
-    else
-        self._view:GetChild("tex_round1").text = self._room.curren_round
-        self._view:GetChild("tex_round2").text = self._room.room_config.round
-    end
 end
 
 function M:ShowJing()
@@ -212,12 +226,24 @@ function M:InitPlayerInfoView()
     self._player_info = {}
     local _player_info = self._player_info
     for i = 1, self._room.room_config.people_num do
-        local tem = self._view:GetChild("player_info" .. i)
+        local tem = self._view:GetChild(string.format("player_info%d_%d", i, (self._state.selectedIndex % 2) + 1))
         _player_info[i] = PlayerInfoView.new(tem, self)
         tem.visible = false
     end
 end
 
+function M:UpdatePlayerInfoView()
+    self._player_info = {}
+    local _player_info = self._player_info
+    local list = self._room.player_list
+
+    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))
+        _player_info[i] = PlayerInfoView.new(tem, self)
+        _player_info[i]:FillData(list[i])
+    end
+end
+
 function M:NewMJPlayerCardInfoView(view, index)
     if index == 1 then
         return MJPlayerSelfCardInfoView.new(view, self)
@@ -443,16 +469,16 @@ function M:EventInit()
         local liuju = result.liuju
         local data = result.info_list
         local niao = result.niao
-        if liuju then
+        -- if liuju then
-            local le = UIPackage.CreateObjectFromURL("ui://Main_Majiang/LiuJu")
+        --     local le = UIPackage.CreateObjectFromURL("ui://Main_Majiang/LiuJu")
-            self._view:AddChild(le)
+        --     self._view:AddChild(le)
-            le:Center()
+        --     le:Center()
-            le:GetTransition("t0"):Play()
+        --     le:GetTransition("t0"):Play()
-            coroutine.start(function()
+        --     coroutine.start(function()
-                coroutine.wait(1)
+        --         coroutine.wait(1)
-                le:Dispose()
+        --         le:Dispose()
-            end)
+        --     end)
-        end
+        -- end
         self:RemoveCursor()
         if self._clearingView == nil then
             self._clearingView = EXClearingView.new(self._root_view)
@@ -496,7 +522,7 @@ function M:EventInit()
                 self._clearingView = nil
             end)
         end
-        self._player_card_info[1]:ShowHuTip()
+        -- self._player_card_info[1]:ShowHuTip()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
@@ -563,59 +589,119 @@ function M:OutCard(card)
     end
 end
 
+-- function M:__FangziTip(tip, weight)
+--     printlog("__FangziTip")
+--     local _gamectr = self._gamectr
+--     local _chipeng_tip = UIPackage.CreateObject("Main_Majiang", "Gcm_action_tips")
+--     _chipeng_tip:GetController("hide_bg").selectedIndex = 1
+--     self._chipeng_tip = _chipeng_tip
+--     local p = self._room.self_player
+--     -- self._player_card_info[self:GetPos(p.seat)]
+
+--     local _lit_fanzi = _chipeng_tip:GetChild("lit_fanzi")
+--     _lit_fanzi:RemoveChildrenToPool()
+--     local _tlist = table.keys(tip.tip_map_type)
+--     printlog(tip.tip_map_type)
+--     pt(_tlist)
+--     local tip_hu = false
+--     local count = #_tlist
+--     table.sort(_tlist)
+--     local isHu = false
+--     for k = 1, #_tlist do
+--         local td = tip.tip_map_type[_tlist[k]][1]
+--         local url = "ui://Main_Majiang/Btn_fztip"
+--         local td_weight = td.weight
+--         if td_weight == 16 then td_weight = 8 end
+--         if td_weight == 8 then url = "ui://Main_Majiang/Btn_hu" end
+--         local btn_t = _lit_fanzi:AddItemFromPool(url)
+--         btn_t.icon = "ui://Main_Majiang/fztip_" .. td_weight
+--         btn_t.data = { tip, td }
+--         btn_t.onClick:Add(self.__TipAction, self)
+--     end
+
+--     -- if not (tonumber(weight) >= 16) then
+--     local _btn_pass = _lit_fanzi:AddItemFromPool("ui://Main_Majiang/Btn_pass")
+--     -- local _btn_pass = _chipeng_tip:GetChild("btn_pass")
+--     _btn_pass.onClick:Set(function()
+--         if tonumber(weight) >= 8 then
+--             local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel)
+--             guo_msg.onOk:Add(function()
+--                 _gamectr:SendAction(0)
+--                 _chipeng_tip:Dispose()
+--                 self._chipeng_tip = nil
+--                 guo_msg:Close()
+--             end)
+--             guo_msg:Show()
+--         else
+--             _gamectr:SendAction(0)
+--             _chipeng_tip:Dispose()
+--             self._chipeng_tip = nil
+--         end
+--     end)
+--     -- end
+
+--     self._view:AddChild(_chipeng_tip)
+--     _chipeng_tip:Center()
+-- end
+
 function M:__FangziTip(tip, weight)
     printlog("__FangziTip")
     local _gamectr = self._gamectr
-    local _chipeng_tip = UIPackage.CreateObject("Main_Majiang", "Gcm_action_tips")
+    local info = self._player_card_info[1]
-    _chipeng_tip:GetController("hide_bg").selectedIndex = 1
+    local _chipeng_tip = info._view_FZTips
-    self._chipeng_tip = _chipeng_tip
+    local _ctr_tips = info._ctr_tip
-    local p = self._room.self_player
-    -- self._player_card_info[self:GetPos(p.seat)]
 
-    local _lit_fanzi = _chipeng_tip:GetChild("lit_fanzi")
+    local _lit_fanzi = _chipeng_tip:GetChild("list")
-    _lit_fanzi:RemoveChildrenToPool()
+    _lit_fanzi:SetVirtual()
-    local _tlist = table.keys(tip.tip_map_type)
+    local _tlist = tip.tip_map_id
-    printlog(tip.tip_map_type)
+    _lit_fanzi.itemRenderer = function(index, obj)
-    pt(_tlist)
+        local type = obj:GetController('type')
-    local tip_hu = false
+        if index == tip.tip_num then
-    local count = #_tlist
+            type.selectedIndex = 0
-    table.sort(_tlist)
+            obj.onClick:Set(function()
-    local isHu = false
+                local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel)
-    for k = 1, #_tlist do
+                guo_msg.onOk:Add(function()
-        local td = tip.tip_map_type[_tlist[k]][1]
+                    _gamectr:SendAction(0)
-        local url = "ui://Main_Majiang/Btn_fztip"
+                    _ctr_tips.selectedIndex = 0
-        local td_weight = td.weight
+                    guo_msg:Close()
-        if td_weight == 16 then td_weight = 8 end
+                end)
-        if td_weight == 8 then url = "ui://Main_Majiang/Btn_hu" end
+                guo_msg:Show()
-        local btn_t = _lit_fanzi:AddItemFromPool(url)
-        btn_t.icon = "ui://Main_Majiang/fztip_" .. td_weight
-        btn_t.data = { tip, td }
-        btn_t.onClick:Add(self.__TipAction, self)
-    end
-
-    -- if not (tonumber(weight) >= 16) then
-    local _btn_pass = _lit_fanzi:AddItemFromPool("ui://Main_Majiang/Btn_pass")
-    -- local _btn_pass = _chipeng_tip:GetChild("btn_pass")
-    _btn_pass.onClick:Set(function()
-        if tonumber(weight) >= 8 then
-            local guo_msg = MsgWindow.new(self._root_view, "确定要点过吗？", MsgWindow.MsgMode.OkAndCancel)
-            guo_msg.onOk:Add(function()
-                _gamectr:SendAction(0)
-                _chipeng_tip:Dispose()
-                self._chipeng_tip = nil
-                guo_msg:Close()
             end)
-            guo_msg:Show()
         else
-            _gamectr:SendAction(0)
+            index = index + 1
-            _chipeng_tip:Dispose()
+            if _tlist[index].type == FZType.HU then
-            self._chipeng_tip = nil
+                type.selectedIndex = 4
+                obj:GetChild('btn_Card1').icon = string.format('ui://Main_Majiang/202_%d', _tlist[index].card)
+            elseif _tlist[index].type == FZType.Chi then
+                type.selectedIndex = FZType.Chi
+                for i = 1, 3 do
+                    obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d',
+                        _tlist[index].opcard[i])
+                end
+            elseif _tlist[index].type == FZType.Peng then
+                type.selectedIndex = FZType.Peng
+                for i = 1, 3 do
+                    obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d',
+                        _tlist[index].card)
+                end
+            else
+                for i = 1, 4 do
+                    obj:GetChild(string.format('btn_Card%d', i)).icon = string.format('ui://Main_Majiang/202_%d',
+                        _tlist[index].card)
+                end
+                type.selectedIndex = FZType.Gang
+                if _tlist[index].type == FZType.Gang_An then
+                    obj:GetChild('btn_Card4').icon = 'ui://Main_Majiang/202_00'
+                end
+            end
+            obj.onClick:Set(function()
+                _gamectr:SendAction(_tlist[index].id)
+                _ctr_tips.selectedIndex = 0
+            end)
         end
-    end)
+    end
-    -- end
+    _ctr_tips.selectedIndex = 1
-
+    _lit_fanzi.numItems = tip.tip_num + 1
-    self._view:AddChild(_chipeng_tip)
-    _chipeng_tip:Center()
 end
 
 function M:__TipAction(context)
@@ -722,7 +808,7 @@ function M:OnFangziAction(...)
     end
     effect.touchable = false
     effect:GetTransition("t2"):Play()
-    pNode:AddChild(effect)
+    -- pNode:AddChild(effect)
     coroutine.start(function()
         coroutine.wait(0.3)
         self._popEvent = true

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

@@ -17,14 +17,7 @@ function M.new(view, mainView)
 end
 
 function M:init()
-    if self._main_view._room.room_config.people_num ~= 2 then
+    PlayerInfoView_copy.init(self)
-        PlayerInfoView.init(self)
-        self._tex_score = self._view:GetChild("info"):GetChild("tex_score1")
-        self._tex_score2 = self._view:GetChild("info"):GetChild("tex_score2")
-        self._ct_score = self._view:GetChild("info"):GetController("score")
-    else
-        PlayerInfoView_copy.init(self)
-    end
 end
 
 function M:ShowInteraction(type, str)
@@ -57,12 +50,7 @@ function M:UpdateRemainCard(card_num, hide)
 end
 
 function M:FillData(player)
-    if self._main_view._room.room_config.people_num == 2 then
+    PlayerInfoView_copy.FillData(self, player)
-        PlayerInfoView_copy.FillData(self, player)
-    else
-        PlayerInfoView.FillData(self, player)
-        self:UpdateScore(player.total_score)
-    end
 end
 
 function M:UpdateScore()

lua_probject/extend_project/extend/majiang/jinxi/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 = {}
@@ -15,196 +15,197 @@ function M.new(view, mainView)
     return self
 end
 
-function M:ShowHuTip(card_list)
+-- function M:ShowHuTip(card_list)
-    printlog("ShowHuTip")
+--     printlog("ShowHuTip")
-    local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui,
+--     local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true, DataManager.CurrenRoom.room_config.Qidui,
-        DataManager.CurrenRoom.room_config.Laizi)
+--         DataManager.CurrenRoom.room_config.Laizi)
-    if #tingList > 0 then
+--     if #tingList > 0 then
-        if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
+--         if DataManager.CurrenRoom.laiziInfo and #DataManager.CurrenRoom.laiziInfo > 0 then
-            for i = 1, #DataManager.CurrenRoom.laiziInfo do
+--             for i = 1, #DataManager.CurrenRoom.laiziInfo do
-                if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then
+--                 if IsHasDictionary(DataManager.CurrenRoom.laiziInfo[i], tingList) == false then
-                    table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i])
+--                     table.insert(tingList, DataManager.CurrenRoom.laiziInfo[i])
-                end
+--                 end
-            end
+--             end
-        end
+--         end
-    end
+--     end
-    self._mainView._hu_tip:FillData(tingList)
+--     self._mainView._hu_tip:FillData(tingList)
-end
+-- end
 
 function M:UpdateHandCard(getcard, mp)
     MJPlayerSelfCardInfoView.UpdateHandCard(self, getcard, mp)
-    local _carViewList = self._carViewList
+    -- local _carViewList = self._carViewList
 
-    if DataManager.CurrenRoom.laiziInfo and #self._carViewList > 0 then
+    -- if DataManager.CurrenRoom.laiziInfo and #self._carViewList > 0 then
-        for i = 1, #self._carViewList do
+    --     for i = 1, #self._carViewList do
-            local obj = self._carViewList[i]
+    --         local obj = self._carViewList[i]
-            if obj and obj.card then
+    --         if obj and obj.card then
-                if IsHasDictionary(obj.card_item, DataManager.CurrenRoom.laiziInfo) then
+    --             if IsHasDictionary(obj.card_item, DataManager.CurrenRoom.laiziInfo) then
-                    if obj.card.GetController then
+    --                 if obj.card.GetController then
-                        if obj.card:GetController("laizi") then
+    --                     if obj.card:GetController("laizi") then
-                            obj.card:GetController("laizi").selectedIndex = 1
+    --                         obj.card:GetController("laizi").selectedIndex = 1
-                        end
+    --                     end
-                    end
+    --                 end
-                else
+    --             else
-                    if obj.card.GetController then
+    --                 if obj.card.GetController then
-                        if obj.card:GetController("laizi") then
+    --                     if obj.card:GetController("laizi") then
-                            obj.card:GetController("laizi").selectedIndex = 0
+    --                         obj.card:GetController("laizi").selectedIndex = 0
-                        end
+    --                     end
-                    end
+    --                 end
-                end
+    --             end
-            end
+    --         end
-        end
+    --     end
-    end
+    -- end
 
 
-    local card_list = DataManager.CurrenRoom.self_player.card_list
+    -- local card_list = DataManager.CurrenRoom.self_player.card_list
-    -- self:ShowHuTip(card_list)
+    -- -- self:ShowHuTip(card_list)
-    if getcard then
+    -- if getcard then
-        self._out_card = true
+    --     self._out_card = true
-        local card_list = membe_clone(DataManager.CurrenRoom.self_player.card_list)
+    --     local card_list = membe_clone(DataManager.CurrenRoom.self_player.card_list)
-        -- 记录需要标记听牌提示的牌
+    --     -- 记录需要标记听牌提示的牌
-        local lst_mark = {}
+    --     local lst_mark = {}
-        local total_num = 0
+    --     local total_num = 0
-        for i = 1, #_carViewList do
+    --     for i = 1, #_carViewList do
-            local btn = _carViewList[i].card
+    --         local btn = _carViewList[i].card
-            local card = self:GetCard(btn)
+    --         local card = self:GetCard(btn)
-            list_remove(card_list, card)
+    --         list_remove(card_list, card)
-            local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true,
+    --         local tingList = CardCheck.MuiltiplteCaculateTingPai(card_list, true,
-                DataManager.CurrenRoom.room_config.Qidui, DataManager.CurrenRoom.room_config.Laizi)
+    --             DataManager.CurrenRoom.room_config.Qidui, DataManager.CurrenRoom.room_config.Laizi)
-            if #tingList > 0 then
+    --         if #tingList > 0 then
-                local count = 0
+    --             local count = 0
-                for j = 1, #tingList do
+    --             for j = 1, #tingList do
-                    count = count + self._mainView:CountCardLeftNum(tingList[j])
+    --                 count = count + self._mainView:CountCardLeftNum(tingList[j])
-                end
+    --             end
-                local tem = {}
+    --             local tem = {}
-                tem.item = btn
+    --             tem.item = btn
-                tem.count = count
+    --             tem.count = count
-                total_num = total_num + count
+    --             total_num = total_num + count
-                table.insert(lst_mark, tem)
+    --             table.insert(lst_mark, tem)
-            end
+    --         end
-            table.insert(card_list, card)
+    --         table.insert(card_list, card)
-        end
+    --     end
-        table.sort(lst_mark, function(a, b)
+    --     table.sort(lst_mark, function(a, b)
-            return a.count > b.count
+    --         return a.count > b.count
-        end)
+    --     end)
-        -- 如果几张牌的可胡牌数一致，也只显示'三角'，可胡牌数不一致才显示'多'
+    --     -- 如果几张牌的可胡牌数一致，也只显示'三角'，可胡牌数不一致才显示'多'
-        local all_same = #lst_mark ~= 0 and lst_mark[1].count == total_num / #lst_mark or false
+    --     local all_same = #lst_mark ~= 0 and lst_mark[1].count == total_num / #lst_mark or false
-        for i = 1, #lst_mark do
+    --     for i = 1, #lst_mark do
-            local tem = lst_mark[i]
+    --         local tem = lst_mark[i]
-            if all_same or tem.count < lst_mark[1].count then
+    --         if all_same or tem.count < lst_mark[1].count then
-                tem.item:GetController("mark_ting").selectedIndex = 1
+    --             tem.item:GetController("mark_ting").selectedIndex = 1
-            else
+    --         else
-                tem.item:GetController("mark_ting").selectedIndex = 2
+    --             tem.item:GetController("mark_ting").selectedIndex = 2
-            end
+    --         end
-        end
+    --     end
-    else
+    -- else
-        for i = 1, #_carViewList do
+    --     for i = 1, #_carViewList do
-            local btn = _carViewList[i].card
+    --         local btn = _carViewList[i].card
-            if btn:GetController("mark_ting").selectedIndex ~= 0 then
+    --         if btn:GetController("mark_ting").selectedIndex ~= 0 then
-                btn:GetController("mark_ting").selectedIndex = 0
+    --             btn:GetController("mark_ting").selectedIndex = 0
-            end
+    --         end
-        end
+    --     end
-        self._out_card = false
+    --     self._out_card = false
-    end
+    -- end
 end
 
-function M:__OnClickHandCard(context)
+-- function M:__OnClickHandCard(context)
-    local button = context.sender
+--     local button = context.sender
-    local _carViewList = self._carViewList
+--     local _carViewList = self._carViewList
-    local refresh = true
+--     local refresh = true
-    local card_list = {}
+--     local card_list = {}
-    for i = 1, #_carViewList do
+--     for i = 1, #_carViewList do
-        local btn = _carViewList[i].card
+--         local btn = _carViewList[i].card
-        local card = self:GetCard(btn)
+--         local card = self:GetCard(btn)
-        if btn ~= button and btn.selected == true then
+--         if btn ~= button and btn.selected == true then
-            if button.data.card_item == card then
+--             if button.data.card_item == card then
-                refresh = false
+--                 refresh = false
-            else
+--             else
-                self._mainView:markOutCards(false, card)
+--                 self._mainView:markOutCards(false, card)
-            end
+--             end
-            btn.selected = false
+--             btn.selected = false
-        end
+--         end
-        if not btn.selected then
+--         if not btn.selected then
-            table.insert(card_list, card)
+--             table.insert(card_list, card)
-        end
+--         end
-    end
+--     end
 
-    if self._out_card then
+--     if self._out_card then
-        -- self:ShowHuTip(card_list)
+--         -- self:ShowHuTip(card_list)
-    end
+--     end
 
-    -- 标记出牌
+--     -- 标记出牌
-    if refresh then
+--     if refresh then
-        if button.selected then
+--         if button.selected then
-            self._mainView:markOutCards(true, button.data.card_item)
+--             self._mainView:markOutCards(true, button.data.card_item)
-        else
+--         else
-            self._mainView:markOutCards(false, button.data.card_item)
+--             self._mainView:markOutCards(false, button.data.card_item)
-        end
+--         end
-    end
+--     end
 
-    local _room = DataManager.CurrenRoom
+--     local _room = DataManager.CurrenRoom
-    if not button.selected and _room.curren_outcard_seat == _room.self_player.seat then
+--     if not button.selected and _room.curren_outcard_seat == _room.self_player.seat then
-        local card = button.data
+--         local card = button.data
-        self._mainView:OutCard(card.card_item)
+--         self._mainView:OutCard(card.card_item)
-    end
+--     end
-end
+-- end
 
-function M:__OnDragStart(card)
+-- function M:__OnDragStart(card)
-    local card_list = membe_clone(DataManager.CurrenRoom.self_player.card_list)
+--     local card_list = membe_clone(DataManager.CurrenRoom.self_player.card_list)
-    list_remove(card_list, card)
+--     list_remove(card_list, card)
-    -- self:ShowHuTip(card_list)
+--     -- self:ShowHuTip(card_list)
-end
+-- end
 
-function M:__OnDragEnd(context)
+-- function M:__OnDragEnd(context)
-    if self.outcard_button then
+--     if self.outcard_button then
-        self.outcard_button:Dispose()
+--         self.outcard_button:Dispose()
-        self.outcard_button = nil
+--         self.outcard_button = nil
-    end
+--     end
-    local button = context.sender
+--     local button = context.sender
 
-    --button:RemoveFromParent()
+--     --button:RemoveFromParent()
-    local card = button.data
+--     local card = button.data
-    local _room = DataManager.CurrenRoom
+--     local _room = DataManager.CurrenRoom
 
-    -- -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat)
+--     -- -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat)
-    if (button.y - card.old_postion.y < -50 and _room.curren_outcard_seat == _room.self_player.seat and card.card_item ~= 0) then
+--     if (button.y - card.old_postion.y < -50 and _room.curren_outcard_seat == _room.self_player.seat and card.card_item ~= 0) then
-        self._mainView:OutCard(card.card_item)
+--         self._mainView:OutCard(card.card_item)
-        button.touchable = false
+--         button.touchable = false
-        self.outcard_button = button
+--         self.outcard_button = button
-    else
+--     else
-        self._area_handcard_list:AddChildAt(button, card.index)
+--         self._area_handcard_list:AddChildAt(button, card.index)
-        button:TweenMove(card.old_postion, 0.2)
+--         button:TweenMove(card.old_postion, 0.2)
-    end
+--     end
-end
+-- end
 
-function M:CheckPlayerOnlineState()
+-- function M:CheckPlayerOnlineState()
-    local room = DataManager.CurrenRoom
+--     local room = DataManager.CurrenRoom
-    for i = 1, #room.player_list do
+--     for i = 1, #room.player_list do
-        if room.player_list[i].line_state == 0 then
+--         if room.player_list[i].line_state == 0 then
-            return false
+--             return false
-        end
+--         end
-    end
+--     end
-    return true
+--     return true
-end
+-- end
 
 function M:Clear(bskip)
+    MJPlayerSelfCardInfoView.Clear(self)
     --self._ctr_state.selectedIndex = 0
-    self._area_fz_list.x = self._src_fz_list.x
+    -- self._area_fz_list.x = self._src_fz_list.x
-    self._area_fz_list.y = self._src_fz_list.y
+    -- self._area_fz_list.y = self._src_fz_list.y
-    self._area_fz_list.width = self._src_fz_list.z
+    -- self._area_fz_list.width = self._src_fz_list.z
-    self._area_fz_list.height = self._src_fz_list.w
+    -- self._area_fz_list.height = self._src_fz_list.w
 
-    self._area_fz_list:RemoveChildren(0, -1, true)
+    -- self._area_fz_list:RemoveChildren(0, -1, true)
-    self._area_handcard_list:RemoveChildren(0, -1, true)
+    -- self._area_handcard_list:RemoveChildren(0, -1, true)
-    self._area_outcard_list:RemoveChildren(0, -1, true)
+    -- self._area_outcard_list:RemoveChildren(0, -1, true)
-    if bskip == nil or bskip == false then
+    -- if bskip == nil or bskip == false then
-        self._mask_liangpai:RemoveChildren(0, -1, true)
+    --     self._mask_liangpai:RemoveChildren(0, -1, true)
-    end
+    -- end
 
-    for i = 1, #self._carViewList do
+    -- for i = 1, #self._carViewList do
-        self._carViewList[i].card:Dispose()
+    --     self._carViewList[i].card:Dispose()
-    end
+    -- end
-    self._carViewList = {}
+    -- self._carViewList = {}
 end
 
 return M

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

@@ -66,7 +66,6 @@ function M:InitView(url)
     self.jing = self._view:GetChild('jing')
 
     self._state.onChanged:Add(function()
-        print("==============================UpdatePlayerInfoView1")
         self:UpdatePlayerInfoView()
     end)
 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/bg.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 87d7fc3670e6b36498a357362fae71c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/bg/bg1.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 66c7db2e1c5f05849ac8a767d69e5e36
+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: extend/majiang/nancheng/60d044d2ede2d00358b3d465fc27d91c
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/bg/bg2.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: de5b953b762e9e1418765daebdc2c795
+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: extend/majiang/nancheng/2e4412a0aeb9e7e81c153e616ebf7517
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/bg/bg3.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 1fbd06e118a52ea43b3bb1a16bee39de
+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: extend/majiang/nancheng/3e2e653e8e4c54e5e3c213f7564eea03
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/bg/bg4.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ac2938c0ef133934c9da59200c0c41e5
+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: extend/majiang/nancheng/4204d0c24664f759d226d34f9ebdc855
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/jinxi/bg.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ebcd19c72c8f83741a2328ea43cfa8d9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/jinxi/bg/bg1.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 2f279b41799f44e4e9662c939983cbbf
+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: extend/majiang/nancheng/60d044d2ede2d00358b3d465fc27d91c
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/jinxi/bg/bg2.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 18fa5cf2e2fbcfe42adef03a9b6c5f69
+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: extend/majiang/nancheng/2e4412a0aeb9e7e81c153e616ebf7517
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/jinxi/bg/bg3.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 134fea87ea6a7534fb31347c950e609e
+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: extend/majiang/nancheng/3e2e653e8e4c54e5e3c213f7564eea03
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/jinxi/bg/bg4.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 54ebca4d1bcf78c4c880ce664275e48f
+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: extend/majiang/nancheng/4204d0c24664f759d226d34f9ebdc855
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 764a1d686736b144eb8b72e83da47909
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg1.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 9531e3650ab5b92419e517370225168a
+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: extend/majiang/nancheng/60d044d2ede2d00358b3d465fc27d91c
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg2.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: b7385ed3e449a7a438b97ed6327e7f23
+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: extend/majiang/nancheng/2e4412a0aeb9e7e81c153e616ebf7517
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg3.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 15a2e959dfb645e44954cc08a9eeb504
+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: extend/majiang/nancheng/3e2e653e8e4c54e5e3c213f7564eea03
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/lichuan/bg/bg4.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 2eed2964f6170e74e872ef53fba453ef
+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: extend/majiang/nancheng/4204d0c24664f759d226d34f9ebdc855
+  assetBundleVariant: