成员战绩新协议

lua_probject/base_project/Game/Controller/GameController.lua

@@ -166,6 +166,7 @@ function M:ExitWitnessGame(pid, gid, rid)
     _data["gid"] = gid
     _data["room_id"] = rid
     _client:send(Protocol.GAME_Exit_WITNESS_ROOM, _data)
+    _client:destroy()
 end
 
 --聊天

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -897,6 +897,23 @@ function M:FG_GetMemberRank(group_id, pid, limit, num, begin_time, end_time, typ
     end)
 end
 
+-- 排行筛选游戏，江西用于成员战绩
+function M:FG_GetMemberRank_2(group_id, pid, limit, num, begin_time, end_time, gameId, limitScore, callback)
+    local _client   = ControllerManager.GroupClient
+    local data      = {}
+    data.id         = group_id
+    data.pid        = pid
+    data.beginTime  = begin_time
+    data.endTime    = end_time
+    data.limit      = limit
+    data.num        = num
+    data.gameId     = gameId
+    data.limitScore = limitScore
+    _client:send(Protocol.WEB_FG_MEMBER_RANK_2, data, function(res)
+        callback(res)
+    end)
+end
+
 -- 局数统计
 function M:FG_GetRoundStat(group_id, pid, callback)
     local _client = ControllerManager.GroupClient

lua_probject/base_project/Game/Protocol.lua

@@ -311,6 +311,8 @@ Protocol = {
     WEB_FG_GET_REWARDS_STATISTIC    = "group/log/get_reward_count",
     -- 获取成员排名
     WEB_FG_MEMBER_RANK              = "group/log/get_member_rank",
+    -- 获取带筛选游戏的排名
+    WEB_FG_MEMBER_RANK_2            = "group/log/get_member_rank_2",
     -- 获取局数统计
     WEB_FG_GET_ROUND_STATISTIC      = "group/log/get_round_count",
     -- 成员体力值详情

lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua

@@ -96,8 +96,7 @@ function FamilyNumberRecord.New(root, page)
     end)
 
     box_type.onChanged:Set(function()
-        -- self._data_seletedType = box_type.value
+        self._data_seletedType = box_type.value
-        self._data_seletedType = 0
         self:OnClickSortType()
     end)
 
@@ -234,7 +233,7 @@ end
 
 function M:InitBoxType()
     local items = { "扑克", "麻将" }
-    local values = { "1", "2" }
+    local values = { "0", "1" }
 
     local games = DataManager.SelfUser.games
     for i = 1, #games do
@@ -453,14 +452,15 @@ function M:NumverRankRenderer(groupId)
 end
 
 function M:OnClickSortType()
-    print("lingmengOnClickSortType")
     self.rank = {}
     local fgCtr = ControllerManager.GetController(NewGroupController)
     self:RecursionGetNumberRank(fgCtr, 0, 0, 0, 0)
 end
 
 function M:RecursionGetNumberRank(fgCtr, index, round, win, cost)
-    fgCtr:FG_GetMemberRank(self.group_id, 0, index * 2, 2, self._data_leftTime, self._data_rightTime, nil, function(res)
+    fgCtr:FG_GetMemberRank_2(self.group_id, 0, index * 2, 2, self._data_leftTime, self._data_rightTime,
+        self._data_seletedType, self._data_sortType,
+        function(res)
             if res.ReturnCode ~= 0 then
                 ViewUtil.ErrorTip(res.ReturnCode, "获取排行榜失败")
                 return

lua_probject/base_project/Game/View/MainView.lua

@@ -377,6 +377,7 @@ function M:InitView(url, isHideIpAdds)
     self:EventInit()
     self._popEvent = true
     self._left_time = 0
+    print("lingmeng _left_time1", self._left_time)
     self.dismiss_room_cd_time = 0
     local btn_back_exit = _view:GetChild('btn_back_exit')
     --btn_back_exit.displayObject.gameObject:SetActive(false)
@@ -896,6 +897,7 @@ function M:EventInit()
             local arg = { ... }
             local p = arg[1]
             local info = self._player_info[self:GetPos(p.seat)]
+            self._left_time = tonumber(arg[3]) or 0
 
             if info and info.IsShowTGTips then
                 info:IsShowTGTips(arg[2], arg[3])
@@ -1347,23 +1349,25 @@ function M:OnUpdate()
         _left_time = _left_time - deltaTime
         _left_time = math.max(0, _left_time)
         local leftTime = math.floor(_left_time)
-        if leftTime < 10 then
+        --旧的拼接方式
-            self._tex_leftTime.text = '0' .. tostring(leftTime)
+        -- if leftTime < 10 then
-            for i = 2, 4 do
+        --     self._tex_leftTime.text = '0' .. tostring(leftTime)
-                local text = self["_tex_leftTime" .. i]
+        --     for i = 2, 4 do
-                if text then
+        --         local text = self["_tex_leftTime" .. i]
-                    text.text = '0' .. tostring(leftTime)
+        --         if text then
-                end
+        --             text.text = '0' .. tostring(leftTime)
-            end
+        --         end
-        else
+        --     end
-            self._tex_leftTime.text = tostring(leftTime)
+        -- else
-            for i = 2, 4 do
+        --     self._tex_leftTime.text = tostring(leftTime)
-                local text = self["_tex_leftTime" .. i]
+        --     for i = 2, 4 do
-                if text then
+        --         local text = self["_tex_leftTime" .. i]
-                    text.text = tostring(leftTime)
+        --         if text then
-                end
+        --             text.text = tostring(leftTime)
-            end
+        --         end
-        end
+        --     end
+        -- end
+        self._tex_leftTime.text = string.format("%02d", _left_time)
         self._left_time = _left_time
         -- 桌面計時器聲音
         if not self._curtime then

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -68,14 +68,16 @@ function M:IsShowTGTips(isShow, time)
     if time == nil then time = 0 end
 
     self.isShowTGTimer = isShow
-    if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
+    -- if self.PlayerTGTips and self.PlayerTGTips.displayObject.gameObject then
-        self.PlayerTGTips.displayObject.gameObject:SetActive(isShow)
+    --     self.PlayerTGTips.displayObject.gameObject:SetActive(isShow)
-    end
+    -- end
     self.currentTime = 0
     if isShow then
-        if self.PlayerTGTips then
+        --关闭头像上的显示倒计时，在页面中显示
-            self.PlayerTGTips.text = "开启托管剩余时间" .. time .. "s"
+        -- if self.PlayerTGTips then
-        end
+        --     self.PlayerTGTips.text = "开启托管剩余时间" .. time .. "s"
+        -- end
+        --显示在中间转盘里
         self.totalTime = time
         TimerManager.AddTimer(self.OnUpdate, self)
     else
@@ -91,9 +93,12 @@ function M:OnUpdate()
             self.currentTime = 0
             self.totalTime = self.totalTime - 1
             --printlog("当前计时器===>>>",self.totalTime)
-            if self.PlayerTGTips then
+            --关闭头像上的显示倒计时，在页面中显示
-                self.PlayerTGTips.text = "开启托管剩余时间" .. self.totalTime .. "s"
+            -- if self.PlayerTGTips then
-            end
+            --     self.PlayerTGTips.text = "开启托管剩余时间" .. self.totalTime .. "s"
+            -- end
+
+
 
             if self.totalTime <= 0 then
                 self.isShowTGTimer = false
@@ -170,7 +175,6 @@ function M:FillData(player)
 end
 
 function M:UpdateScore(score, doAnimation)
-
     local lastScore = tonumber(self._tex_score.text)
 
     if not score then
@@ -368,7 +372,6 @@ function M:Destroy()
 end
 
 function M:ScoreAnimation(score)
-
     if score == 0 then
         return
     end

lua_probject/base_project/Game/View/WitnessView.lua

@@ -1,5 +1,6 @@
 local MJSettingView = require("main.majiang.MJSettingViewNew")
 local TableBG = require("Game.Data.TableBG")
+local MJMainView = require("main.majiang.MJMainView")
 
 local bg_config = {
     { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
@@ -15,7 +16,6 @@ function WitnessView:init()
 end
 
 function WitnessView:InitView()
-    
     self.btn_setting = self._view:GetChild("btn_setting")
 
     self.com_logocType = self._view:GetChild("com_logo"):GetController("cType")
@@ -27,6 +27,38 @@ function WitnessView:InitView()
 
     local default_bg = 1
     TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
+
+    self.com_notice = self._view:GetChild("com_notice")
+end
+
+function WitnessView:Show()
+    getmetatable(WitnessView).__index.Show(self)
+    self:DoNoticeAnimation()
+end
+
+function WitnessView:DoNoticeAnimation()
+    self.noticeIndex = self.noticeIndex or 1
+    if not DataManager.GameNotice or #DataManager.GameNotice == 0 then
+        return
+    end
+
+    local text_notice = self.com_notice:GetChild("text_notice")
+    text_notice.text = DataManager.GameNotice[self.noticeIndex]
+    local speed = 44
+    local time = text_notice.width / speed
+
+    text_notice.x = self.com_notice.width
+
+    local tween = text_notice:TweenMove(Vector2(-text_notice.width, text_notice.y), time):OnComplete(function()
+        self:DoNoticeAnimation()
+    end)
+
+    tween:SetEase(EaseType.Linear)
+
+    self.noticeIndex = self.noticeIndex + 1
+    if self.noticeIndex > #DataManager.GameNotice then
+        self.noticeIndex = 1
+    end
 end
 
 return WitnessView

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

@@ -173,15 +173,15 @@ function M:LoadConfigData(data)
     self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
 end
 
-function M:LoadConfigToDetail(data, hpdata)
+function M:LoadConfigToDetail(data)
     local configData = data
     if type(data) == 'string' then
         configData = json.decode(data)
     end
 
-    local hpData = hpdata
+    local hpData = data.hpData
-    if type(hpdata) == 'string' then
+    if type(hpData) == 'string' then
-        hpData = json.decode(hpdata)
+        hpData = json.decode(hpData)
     end
 
     local returnString = string.format("人数%s人", configData.maxPlayers)

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

@@ -169,12 +169,16 @@ function M:LoadConfigData(data)
     self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
 end
 
-function M:LoadConfigToDetail(data, hpData)
+function M:LoadConfigToDetail(data)
     local configData = data
     if type(data) == 'string' then
         configData = json.decode(data)
     end
 
+    local hpData = data.hpData
+    if type(hpData) == 'string' then
+        hpData = json.decode(hpData)
+    end
 
     local returnString = string.format("人数%s人", configData.maxPlayers)
     if configData.jiangma then

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

@@ -157,6 +157,10 @@ function M:LoadConfigToDetail(data)
         configData = json.decode(data)
     end
 
+    local hpData = data.hpData
+    if type(hpData) == 'string' then
+        hpData = json.decode(hpData)
+    end
 
     local returnString = string.format("人数%s人,%s,%s,%s", configData.maxPlayers,
         configData.zimo == 0 and "只能自摸" or "自摸可点炮",

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

@@ -250,7 +250,7 @@ function M:EventInit()
     end)
     _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
         local arg = { ... }
-        self._left_time = 15
+        -- self._left_time = 15
         local seat = arg[1]
         self:UpdateCardBox(self:GetPos(seat))
         -- if seat == self._room.self_player.seat then
@@ -267,7 +267,8 @@ function M:EventInit()
     local _gcm_outcard_url = "ui://Main_Majiang/Gcm_OutCard"
     _gamectr:AddEventListener(TX_GameEvent.OutCard, function(...)
         self:__CloseTip()
-        self._left_time = 0
+
+
         local arg = { ... }
         local p = arg[1]
         local card = arg[2]
@@ -492,6 +493,7 @@ function M:EventInit()
         self:PlayMJSound("end_music.mp3")
         self:UnmarkSelfTuoguan()
         self._left_time = 0
+
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }

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

@@ -192,7 +192,7 @@ function M:EventInit()
     _gamectr:AddEventListener(TX_GameEvent.EventTurn, function(...)
         print("lingmeng witness EventTurn")
         local arg = { ... }
-        self._left_time = 15
+        -- self._left_time = 15
         local seat = arg[1]
         self:UpdateCardBox(self:GetPos(seat))
         local playerInfo = self._player_info[self:GetPos(seat)]
@@ -252,13 +252,12 @@ function M:EventInit()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult1, function(...)
-        print("lingmeng witness ZPResult1")
+        local _room = self._room
-        self._popEvent = false
         self._left_time = 0
         self:UpdateCardBox(0)
         self._ctr_cardbox.selectedIndex = 0
         local arg = { ... }
-        self:ShowHand(arg)
+        MJMainView.ShowHand(self, arg)
         local result = arg[1]
         local liuju = result.liuju
         local data = result.info_list
@@ -274,55 +273,21 @@ function M:EventInit()
         --     end)
         -- end
         self:RemoveCursor()
-        if self._clearingView == nil then
         self._clearingView = EXClearingView.new(self._root_view)
         coroutine.start(function()
             coroutine.wait(0.5)
             self._clearingView:Show()
             self._popEvent = true
         end)
-        end
-        print("lingmeng witness ZPResult2")
 
         if _room.curren_round ~= _room.room_config.round then
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
-            for i = 1, #data do
-                local p = _room:GetPlayerBySeat(data[i].seat)
-                if p then
-                    p.total_score = data[i].total_score
-                    local card_info = self._player_card_info[self:GetPos(p.seat)]
-                    local info = self._player_info[self:GetPos(p.seat)]
-                    card_info:Clear()
-                    card_info:ResetCardType()
-                    if _room:checkHpNonnegative() then
-                        p.cur_hp = data[i].hp_info.cur_hp
-                    end
-                    -- info:UpdateScore()
-                    info._view:GetChild("zhanji").visible = true
-                    local num = data[i].hp_info.total_score
-                    if num >= 0 then
-                        info._view:GetController("text_color").selectedIndex = 0
-                        info._view:GetChild("text_jifen").text = "+" .. num --d2ad(num)
-                    else
-                        info._view:GetController("text_color").selectedIndex = 1
-                        info._view:GetChild("text_jifen").text = num --d2ad(num)
-                    end
-
-                    info._view:GetChild("mask_piao").title = ""
-                    info._view:GetController("piao_niao").selectedIndex = 0
-                    p.fz_list = {}
-                end
-            end
-
             self._clearingView:InitData(0, _room, result, nil, function(...)
                 DataManager.CurrenRoom.self_player.card_list = {}
                 self._ctr_state.selectedIndex = 2
                 self._clearingView = nil
-            end, 1)
+            end)
         end
-        print("lingmeng witness ZPResult3")
-
-        -- self._player_card_info[1]:ShowHuTip()
     end)
 
     _gamectr:AddEventListener(TX_GameEvent.ZPResult2, function(...)
@@ -344,6 +309,7 @@ function M:EventInit()
         ControllerManager.ChangeController(LoddyController)
     end)
 
+
     _gamectr:AddEventListener(TX_GameEvent.EvnetPiaoTip, function()
         print("lingmeng witness EvnetPiaoTip")
     end)
@@ -436,6 +402,7 @@ function M:OnUpdate()
             else
                 print("witness error")
                 print(result)
+                error(result)
                 -- self._gamectr = ControllerManager.GetController(GameController)
                 -- if self._gamectr then
                 --     self._gamectr:ResetConnect()

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

@@ -184,6 +184,10 @@ function M:LoadConfigToDetail(data)
         configData = json.decode(data)
     end
 
+    local hpData = data.hpData
+    if type(hpData) == 'string' then
+        hpData = json.decode(hpData)
+    end
 
     local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers,
         configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖",

lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua

@@ -65,13 +65,13 @@ function M:init()
         self._view_getCard = self._view:GetChild('Btn_HandCard2')
     end
 
-    -- if self.direction == "S" then
+    if self.direction == "S" then
-    --     self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_left2right_bottom2top
+        self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_left2right_bottom2top
-    -- elseif self.direction == "N" then
+    elseif self.direction == "N" then
-    --     self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_right2left_top2bottom
+        self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowHorizontal_right2left_top2bottom
-    -- elseif self.direction == "E" then
+    elseif self.direction == "E" then
-    --     self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowVertical_right2left_bottom2top
+        self._view_outCardList.layout = FairyGUI.ListLayoutType.FlowVertical_right2left_bottom2top
-    -- end
+    end
 end
 
 function M:SetPlayer(p)
@@ -477,8 +477,6 @@ function M:ResetCardType()
 end
 
 function M:ShowHand(cards)
-    self._view_handCardList:RemoveChildren()
-
     local list = self._view_handCardList
     local cardType = self._viewText_cardInfo["Out_Card"]
     if self._viewText_cardInfo['IS_SIDE'] == "true" then
@@ -486,6 +484,7 @@ function M:ShowHand(cards)
         cardType = self._viewText_cardInfo["Hand_Card"]
     end
 
+    list:RemoveChildren()
     --list:RemoveChildren()
     local passcard = false
     for _, card in pairs(cards) do

lua_probject/main_project/main/majiang/MJSettingViewNew.lua

@@ -25,7 +25,7 @@ function M:Reflash()
         self.cBtn.selectedIndex = 1
     end
 
-    if self.flag_witness then
+    if self._flag_witness then
         self.cBtn.selectedIndex = 0
     end
 

wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml

@@ -21,7 +21,7 @@
       <gearDisplay controller="seat" pages="0"/>
       <relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
     </image>
-    <text id="n8_gjnb" name="Text_Time" xy="140,109" size="69,56" font="ui://27vd145bh35o7ik0" fontSize="42" color="#ff9500" bold="true" text="120">
+    <text id="n8_gjnb" name="Text_Time" xy="98,101" size="154,71" font="ui://v0j9abjyfwqx1gl" fontSize="42" color="#ff9500" align="center" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="120">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/Comp_jing.xml

@@ -2,10 +2,10 @@
 <component size="174,186">
   <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n0_ckvb" name="icon" xy="0,0" size="174,186" url="ui://v0j9abjyk0pa126" align="center" fill="scaleFree" clearOnPublish="true">
+    <loader id="n0_ckvb" name="icon" xy="0,0" size="174,186" url="ui://v0j9abjyk0pa13h" align="center" fill="scaleFree" clearOnPublish="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_ckvb" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="15,10" size="160,144">
+    <image id="n1_ckvb" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="61,-18" size="108,154" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Component/com_OutCard_Vertical.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="117,117">
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n3_wcy5" name="icon" xy="0,0" size="117,117" url="ui://v0j9abjyk0pa12m" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n4_wcy5" name="n4" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="50,-9" size="62,72">
+    <image id="n4_wcy5" name="n4" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="43,-10" size="70,101" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml

@@ -15,12 +15,14 @@
   <displayList>
     <graph id="n40_ckvb" name="area_allDown" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <list id="n33_gi99" name="List_FZ" xy="58,950" size="2468,214" touchable="false" layout="row" selectionMode="none" colGap="-4" defaultItem="ui://v0j9abjygi9910f" autoItemSize="false" vAlign="bottom" autoClearItems="true">
+      <relation target="" sidePair="bottom-bottom"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
     <list id="n32_kxhm" name="List_HandCard" xy="37,975" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
+      <relation target="" sidePair="bottom-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -38,6 +40,7 @@
     <list id="n35_gi99" name="List_OutCard" xy="283,606" size="2097,312" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" renderOrder="descent" autoClearItems="true">
       <gearXY controller="cStie" pages="0,1,2" values="283,606|324,612|832,608"/>
       <gearSize controller="cStie" pages="0,1,2" values="2097,312,1,1|1217,312,1,1|887,312,1,1"/>
+      <relation target="" sidePair="bottom-bottom"/>
       <item/>
       <item/>
       <item/>
@@ -74,10 +77,12 @@
     </list>
     <list id="n38_shqd" name="Btn_HandCard" xy="2295,976" size="175,191" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
       <item/>
     </list>
     <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="184,657">
       <gearDisplay controller="tip" pages="1"/>
+      <relation target="" sidePair="bottom-bottom"/>
     </component>
     <image id="n41_kzuz" name="n41" src="kzuz142" fileName="Main_new/Main/Image/opt_hu_tips.png" xy="457,809" size="1314,208" group="n48_kzuz" aspect="true"/>
     <component id="n45_kzuz" name="btn_guohu" src="kzuz148" fileName="Main_new/Main/Component/btn_guohu.xml" xy="2248,859" size="200,107" group="n48_kzuz" aspect="true">

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -18,10 +18,15 @@
       <relation target="" sidePair="center-center"/>
       <relation target="n169_gmbn" sidePair="bottom-top"/>
     </component>
+    <component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="689,125" size="1169,63"/>
+    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
+      <gearDisplay controller="state" pages="1,3"/>
+      <gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
+    </component>
     <component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml" xy="0,0" size="2532,1170" controller="cStie,0">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,0" size="2532,1170" controller="cStie,0">
+    <component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,-1" size="2532,1170" controller="cStie,0">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="width-width,bottom-bottom"/>
     </component>
@@ -29,37 +34,32 @@
       <gearDisplay controller="state" pages="0,2"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,787" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="1,3,4" values="87,788|64,-191|62,-201" default="730,-59"/>
+      <gearXY controller="state" pages="1,3,4" values="87,787|64,-192|62,-202" default="730,-60"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
     <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1865,29" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1866,28" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="0,1,3,4" values="2701,486|1865,29|2555,-6|2567,10" default="2007,876"/>
+      <gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,28|2555,-6|2567,10" default="2007,876"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
     </component>
-    <component id="n206_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
+    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="741,-1172" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
-    <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
+    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="1,-887" group="n90_8sat"/>
-      <gearDisplay controller="state" pages="1,3"/>
+    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2483,-384" size="110,75" group="n90_8sat" scale="2,2">
-      <gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
-    </component>
-    <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="743,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
-    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="3,-885" group="n90_8sat"/>
-    <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2485,-382" size="110,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="265,-887" group="n90_8sat">
+    <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="263,-889" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <group id="n90_8sat" name="n90" xy="3,-1170" size="2592,863" advanced="true">
+    <group id="n90_8sat" name="n90" xy="1,-1172" size="2592,863" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1596,-344" visible="false" touchable="false">
+    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="1594,-344" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>
@@ -141,14 +141,14 @@
     <text id="n176_eqmd" name="remaining_card" xy="769,516" size="358,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#ffffff" align="right" vAlign="middle" letterSpacing="5" autoSize="none" text="余98张">
       <gearDisplay controller="state" pages="1,3"/>
     </text>
-    <text id="n177_eqmd" name="wanfa_text" xy="418,605" pivot="0.5,0" size="1696,56" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
+    <text id="n177_eqmd" name="wanfa_text" xy="418,645" pivot="0.5,0" size="1696,56" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <relation target="" sidePair="center-center"/>
+      <relation target="n159_ckvb" sidePair="center-center,top-bottom"/>
     </text>
     <text id="n178_eqmd" name="text_round" xy="1404,516" size="364,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="55" color="#ffffff" vAlign="middle" letterSpacing="5" autoSize="none" text="局数:1\81">
       <gearDisplay controller="state" pages="1,3,4"/>
     </text>
-    <group id="n179_eqmd" name="center_text" xy="418,516" size="1696,145" advanced="true">
+    <group id="n179_eqmd" name="center_text" xy="418,516" size="1696,185" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1102,406" size="335,270" group="n169_gmbn">
@@ -185,8 +185,9 @@
     <group id="n138_lu84" name="top_right" xy="2031,18" size="477,461" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
-    <graph id="n146_l15a" name="btn_showNext" xy="1162,409" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
+    <graph id="n146_l15a" name="btn_showNext" xy="1161,453" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="state" pages="1"/>
+      <relation target="n159_ckvb" sidePair="center-center,middle-middle"/>
     </graph>
     <graph id="n163_qz7i" name="n163" xy="-125,-102" size="2832,1436" group="n168_qz7i" type="rect" lineSize="0" fillColor="#80000000"/>
     <list id="n164_qz7i" name="list_showNext" xy="131,52" size="2264,1084" group="n168_qz7i" layout="flow_hz" overflow="scroll" lineGap="26" colGap="32" defaultItem="ui://v0j9abjyqz7i11m" autoClearItems="true">

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -23,7 +23,7 @@
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <component id="n218_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,0" controller="cStie,1">
+    <component id="n218_ogwn" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml" xy="0,-2" controller="cStie,1">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml

@@ -3,16 +3,16 @@
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="jing" pages="0,,1," selected="1"/>
   <controller name="move" pages="0,,1," selected="0"/>
-  <controller name="out" pages="0,,1," selected="1"/>
+  <controller name="out" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" url="ui://Main_Majiang/b202_101" fill="scaleFree">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="175,191" url="ui://Main_Majiang/b201_203" fill="scaleFree">
       <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="14,-14" size="161,131">
+    <image id="n12_k1od" name="jing" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="71,12" size="101,145" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <gearXY controller="out" pages="0,1" values="14,6|14,-14" duration=".1"/>
+      <gearXY controller="out" pages="0,1" values="71,12|14,-14" duration="0.1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
       <relation target="" sidePair="width-width,height-height"/>
       <relation target="n3_hp0b" sidePair="top-top"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="80,85">
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
     <loader id="n0_gi99" name="icon" xy="0,0" size="80,85" url="ui://v0j9abjyk0pa13c" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="22,-9" size="55,69" aspect="true">
+    <image id="n1_gi99" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="22,-7" size="55,69" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -37,6 +37,7 @@
     </component>
     <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="87,788" size="153,132">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
@@ -44,6 +45,7 @@
     </component>
     <component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2311,292" size="153,132">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="left-right,bottom-middle"/>
     </component>
     <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
@@ -51,6 +53,7 @@
     </component>
     <component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1865,29" size="153,132">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="top-top"/>
     </component>
     <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="491,519" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
@@ -58,6 +61,7 @@
     </component>
     <component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="91,521" size="153,132">
       <gearDisplay controller="state" pages="1,3,5"/>
+      <relation target="" sidePair="left-left,top-middle"/>
     </component>
     <component id="n371_kikc" name="com_notice" src="kikc1g4" fileName="Main_new/com_notice.xml" xy="567,124"/>
     <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5">
@@ -163,28 +167,28 @@
       <relation target="" sidePair="right-right"/>
       <Button icon="ui://v0j9abjyu63319u"/>
     </component>
-    <component id="n335_ogwn" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2191,20" size="141,117" group="n341_ogwn"/>
+    <component id="n335_ogwn" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2189,20" size="141,117" group="n341_ogwn"/>
-    <component id="n336_ogwn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2400,18" pivot="0.5,0.5" size="108,96" group="n341_ogwn">
+    <component id="n336_ogwn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2398,18" pivot="0.5,0.5" size="108,96" group="n341_ogwn">
       <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
       <Button icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
     </component>
-    <component id="n337_ogwn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,47" pivot="0.5,0.5" size="102,91" group="n341_ogwn">
+    <component id="n337_ogwn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2029,47" pivot="0.5,0.5" size="102,91" group="n341_ogwn">
       <gearDisplay controller="more" pages="1"/>
       <Button checked="true" icon="ui://v0j9abjyu6331a4"/>
     </component>
-    <component id="n338_ogwn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n341_ogwn">
+    <component id="n338_ogwn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2092,198" pivot="0.5,0.5" size="150,78" group="n341_ogwn">
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjyu6331a1"/>
     </component>
-    <component id="n339_ogwn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,319" pivot="0.5,0.5" size="126,106" group="n341_ogwn">
+    <component id="n339_ogwn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2206,319" pivot="0.5,0.5" size="126,106" group="n341_ogwn">
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjyu6331a2"/>
     </component>
-    <component id="n340_ogwn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,367" pivot="0.5,0.5" size="126,112" group="n341_ogwn">
+    <component id="n340_ogwn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2371,367" pivot="0.5,0.5" size="126,112" group="n341_ogwn">
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjyu6331a3"/>
     </component>
-    <group id="n341_ogwn" name="top_right" xy="2031,18" size="477,461" advanced="true">
+    <group id="n341_ogwn" name="top_right" xy="2029,18" size="477,461" advanced="true">
       <relation target="" sidePair="right-right,top-top"/>
     </group>
     <graph id="n342_ogwn" name="btn_showNext" xy="1162,409" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
@@ -250,7 +254,7 @@
     </component>
     <component id="n352_ogwn" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
     <component id="n353_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
       <relation target="" sidePair="right-right"/>

wb_new_ui/assets/Main_Majiang/Main_new/com_notice.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1398,63" mask="n2_kikc">
   <displayList>
-    <graph id="n2_kikc" name="n2" xy="0,0" size="1398,63" type="rect"/>
+    <graph id="n2_kikc" name="n2" xy="0,0" size="1398,63" type="rect">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <image id="n0_kikc" name="n0" src="kikc1g5" fileName="component/notice_old/result_tips_bg.png" xy="0,0" size="1398,63" aspect="true">
       <relation target="" sidePair="width-width,height-height"/>
     </image>

wb_new_ui/assets/Main_Majiang/images/centerFont/centerFont.fnt

@@ -0,0 +1,11 @@
+info size=20 resizable=true colored=false
+char id=48 img=fwqx1gb xoffset=0 yoffset=0 xadvance=0
+char id=49 img=fwqx1gc xoffset=0 yoffset=0 xadvance=0
+char id=50 img=fwqx1gd xoffset=0 yoffset=0 xadvance=0
+char id=51 img=fwqx1ge xoffset=0 yoffset=0 xadvance=0
+char id=52 img=fwqx1gf xoffset=0 yoffset=0 xadvance=0
+char id=53 img=fwqx1gg xoffset=0 yoffset=0 xadvance=0
+char id=54 img=fwqx1gh xoffset=0 yoffset=0 xadvance=0
+char id=55 img=fwqx1gi xoffset=0 yoffset=0 xadvance=0
+char id=56 img=fwqx1gj xoffset=0 yoffset=0 xadvance=0
+char id=57 img=fwqx1gk xoffset=0 yoffset=0 xadvance=0

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1544,6 +1544,17 @@
     <component id="wcy51g8" name="com_OutCard_Vertical.xml" path="/Main_new/Main_new_2/Component/NewHandCard/Component/"/>
     <image id="dlc41g9" name="GameCommon54.png" path="/Main_new/Chat/Image/"/>
     <component id="dlc41ga" name="Comp_VoiceBegin.xml" path="/Main_new/Chat/Component/"/>
+    <image id="fwqx1gb" name="0.png" path="/images/centerFont/"/>
+    <image id="fwqx1gc" name="1.png" path="/images/centerFont/"/>
+    <image id="fwqx1gd" name="2.png" path="/images/centerFont/"/>
+    <image id="fwqx1ge" name="3.png" path="/images/centerFont/"/>
+    <image id="fwqx1gf" name="4.png" path="/images/centerFont/"/>
+    <image id="fwqx1gg" name="5.png" path="/images/centerFont/"/>
+    <image id="fwqx1gh" name="6.png" path="/images/centerFont/"/>
+    <image id="fwqx1gi" name="7.png" path="/images/centerFont/"/>
+    <image id="fwqx1gj" name="8.png" path="/images/centerFont/"/>
+    <image id="fwqx1gk" name="9.png" path="/images/centerFont/"/>
+    <font id="fwqx1gl" name="centerFont.fnt" path="/images/centerFont/" exported="true"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/Modules/FairyGUI/Scripts/UI/GList.cs

@@ -2611,6 +2611,102 @@ namespace FairyGUI
 					ch = Mathf.CeilToInt(maxHeight);
 				}
 			}
+			else if (_layout == ListLayoutType.FlowHorizontal_left2right_bottom2top)
+			{
+				curY = viewHeight;
+				for (i = 0; i < cnt; i++)
+				{
+					child = GetChildAt(i);
+					if (foldInvisibleItems && !child.visible)
+						continue;
+
+					if (curX != 0)
+						curX += _columnGap;
+
+					if (_columnCount != 0 && j >= _columnCount
+						|| _columnCount == 0 && curX + child.width > viewWidth && maxHeight != 0)
+					{
+						//new line
+						curX = 0;
+						curY -= Mathf.CeilToInt(maxHeight) + _lineGap;
+						maxHeight = 0;
+						j = 0;
+					}
+					child.SetXY(curX, curY - child.height);
+					curX += Mathf.CeilToInt(child.width);
+					if (curX > maxWidth)
+						maxWidth = curX;
+					if (child.height > maxHeight)
+						maxHeight = child.height;
+					j++;
+				}
+				ch = viewHeight;//curY + Mathf.CeilToInt(maxHeight);
+				cw = viewWidth;//Mathf.CeilToInt(maxWidth);
+			}
+			else if (_layout == ListLayoutType.FlowHorizontal_right2left_top2bottom)
+			{
+				curX = viewWidth;   //curX = 0;
+
+				for (i = 0; i < cnt; i++)
+				{
+					child = GetChildAt(i);
+					if (foldInvisibleItems && !child.visible)
+						continue;
+
+					if (curX != viewWidth)      //if (curX != 0)
+						curX -= _columnGap;     //curX += _columnGap;
+												//if (_columnCount != 0 && j >= _columnCount || _columnCount == 0 && curX + child.width > viewWidth && maxHeight != 0)
+					if (_columnCount != 0 && j >= _columnCount || _columnCount == 0 && curX - child.width < 0 && maxHeight != 0)
+					{
+						//new line
+						curX = viewWidth;   //curX = 0;
+						curY += Mathf.CeilToInt(maxHeight) + _lineGap;
+						maxHeight = 0;
+						j = 0;
+					}
+					child.SetXY(curX - child.width, curY);
+					curX -= Mathf.CeilToInt(child.width);   //curX += Mathf.CeilToInt(child.width);
+					if (viewWidth - curX > maxWidth)    //if (curX > maxWidth)
+						maxWidth = viewWidth - curX;    //maxWidth = curX;
+					if (child.height > maxHeight)
+						maxHeight = child.height;
+					j++;
+				}
+				ch = viewHeight;//curY + Mathf.CeilToInt(maxHeight);
+				cw = viewWidth;//Mathf.CeilToInt(maxWidth);
+			}
+			else if (_layout == ListLayoutType.FlowVertical_right2left_bottom2top) 
+			{
+				curY = viewHeight;
+				curX = viewWidth;
+				for (i = 0; i < cnt; i++)
+				{
+					child = GetChildAt(i);
+					if (foldInvisibleItems && !child.visible)
+						continue;
+
+					if (curY != viewHeight)  //if (curY != 0)
+						curY -= _lineGap;	//
+
+					if (_lineCount != 0 && j >= _lineCount
+						|| _lineCount == 0 && curY - child.height < 0 && maxWidth != 0)
+					{
+						curY = viewHeight;   //curY = 0;
+						curX -= Mathf.CeilToInt(maxWidth) + _columnGap; //curX += Mathf.CeilToInt(maxWidth) + _columnGap;
+						maxWidth = 0;
+						j = 0;
+					}
+					child.SetXY(curX - child.width, curY - child.height);	//
+					curY -= child.height;   //curY += child.height;
+					if (viewHeight - curY > maxHeight)   //if (curY > maxHeight)
+						maxHeight = viewHeight - curY;
+					if (child.width > maxWidth)
+						maxWidth = child.width;
+					j++;
+				}
+				cw = viewWidth;//viewWidth - curX + Mathf.CeilToInt(maxWidth);
+				ch = viewHeight;//Mathf.CeilToInt(maxHeight);
+			}
 			else //pagination
 			{
 				int page = 0;

wb_unity_pro/Assets/Scripts/Editor/CustomSettings.cs

@@ -230,6 +230,7 @@ public static class CustomSettings
 		_GT(typeof(FairyGUI.TextField)),
         _GT(typeof(EmojiDitc)),
         _GT(typeof(EaseType)),
+        _GT(typeof(ListLayoutType)),
     };
 
     public static List<Type> dynamicList = new List<Type>()

wb_unity_pro/Assets/Source/Generate/LuaBinder.cs

@@ -136,6 +136,7 @@ public static class LuaBinder
 		FairyGUI_ImageWrap.Register(L);
 		FairyGUI_TextFieldWrap.Register(L);
 		FairyGUI_EaseTypeWrap.Register(L);
+		FairyGUI_ListLayoutTypeWrap.Register(L);
 		FairyGUI_GearBaseWrap.Register(L);
 		FairyGUI_BaseFontWrap.Register(L);
 		L.RegFunction("GTweenCallback", FairyGUI_GTweenCallback);