管理员解散房间
罗家炜
parent
5e70f28a72
commit
a58a000bb7
|
|
@ -598,36 +598,22 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
end
|
||||
local all_num = #playList + #roomList
|
||||
list_room.itemRenderer = function(index, obj)
|
||||
if index < #roomList then
|
||||
if index < #readyRoom then
|
||||
local newIndex = index + 1
|
||||
local playInfo = self._group:getPlay(roomList[newIndex].pid)
|
||||
-- self:FillSameRoomInfo(newIndex, obj, 1, playInfo)
|
||||
local gameId = playInfo.gameId
|
||||
local config = ExtendManager.GetExtendConfig(gameId)
|
||||
local mode = config:GetGameInfo()
|
||||
local gamePlay = mode:LoadConfigToDetail(playInfo.config, playInfo.hpData)
|
||||
obj:GetChild('Label_gameRule').title = gamePlay
|
||||
local roomName = playInfo.name
|
||||
roomName = Utils.TextOmit(roomName, 6, "")
|
||||
obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
|
||||
obj:GetChild('game_type').text = string.format("（%s）%s", playInfo.game_name, roomName)
|
||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
|
||||
obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2
|
||||
-- if self._group.isWatch == 1 then
|
||||
-- 允许观战
|
||||
obj:GetController('type').selectedIndex = self._group.isWatch or 1
|
||||
-- end
|
||||
local plist = roomList[newIndex].plist
|
||||
self:FillSameRoomInfo(obj, 1, playInfo)
|
||||
local plist = readyRoom[newIndex].plist
|
||||
local insertName = ""
|
||||
for i = 1, #plist do
|
||||
ImageLoad.Load(plist[i].portrait, obj:GetChild(string.format("player%d", i))._iconObject)
|
||||
insertName = string.format("%s、%s", plist[i].nick, insertName)
|
||||
end
|
||||
obj:GetChild('Label_joinPlayers').text = insertName
|
||||
obj:GetChild('text_playerNum').text = string.format("%s/%s", #plist, playInfo.maxPlayers)
|
||||
obj:GetChild('btn_joinGame').onClick:Set(function()
|
||||
roomCtr:PublicJoinRoom(
|
||||
Protocol.WEB_FG_JOIN_ROOM,
|
||||
roomList[newIndex].id,
|
||||
readyRoom[newIndex].id,
|
||||
id,
|
||||
function(response)
|
||||
if (response.ReturnCode == -1) then
|
||||
|
|
@ -643,11 +629,11 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
else
|
||||
UpdateBeat:Remove(self.OnUpdate, self)
|
||||
FamilyView.lastId = self._group.id
|
||||
ViewManager.ChangeView(ViewManager.View_Main, gameId, { _flag_showTip = true })
|
||||
ViewManager.ChangeView(ViewManager.View_Main, playInfo.gameId, { _flag_showTip = true })
|
||||
end
|
||||
end,
|
||||
id,
|
||||
roomList[newIndex].pid
|
||||
readyRoom[newIndex].pid
|
||||
)
|
||||
end)
|
||||
obj:GetChild('btn_watch').onClick:Set(function()
|
||||
|
|
@ -669,29 +655,88 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
else
|
||||
UpdateBeat:Remove(self.OnUpdate, self)
|
||||
FamilyView.lastId = self._group.id
|
||||
ViewManager.ChangeView(ViewManager.View_Witness, gameId)
|
||||
ViewManager.ChangeView(ViewManager.View_Witness, playInfo.gameId)
|
||||
end
|
||||
end,
|
||||
gameId,
|
||||
playInfo.gameId,
|
||||
roomList[newIndex].pid
|
||||
)
|
||||
end)
|
||||
obj:GetChild('btn_jiesan').onClick:Set(function()
|
||||
local _curren_msg =
|
||||
MsgWindow.new(
|
||||
self._root_view,
|
||||
'确定要解散该房间吗？',
|
||||
MsgWindow.MsgMode.OkAndCancel
|
||||
)
|
||||
_curren_msg.onOk:Add(
|
||||
function()
|
||||
ViewUtil.ShowModalWait(self._root_view)
|
||||
local fgCtr = ControllerManager.GetController(NewGroupController)
|
||||
|
||||
fgCtr:FG_RemoveRoom(
|
||||
id,
|
||||
readyRoom[newIndex].id,
|
||||
function(res)
|
||||
if self._is_destroy then
|
||||
return
|
||||
end
|
||||
ViewUtil.CloseModalWait()
|
||||
if res.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorTip(res.ReturnCode, '删除房间失败！')
|
||||
return
|
||||
end
|
||||
end
|
||||
)
|
||||
end
|
||||
)
|
||||
_curren_msg:Show()
|
||||
end)
|
||||
elseif index >= all_num - #startRoom then
|
||||
local newIndex = index - #readyRoom - #playList + 1
|
||||
local playInfo = self._group:getPlay(startRoom[newIndex].pid)
|
||||
self:FillSameRoomInfo(obj, 2, playInfo)
|
||||
local plist = startRoom[newIndex].plist
|
||||
local insertName = ""
|
||||
for i = 1, #plist do
|
||||
ImageLoad.Load(plist[i].portrait, obj:GetChild(string.format("player%d", i))._iconObject)
|
||||
insertName = string.format("%s、%s", plist[i].nick, insertName)
|
||||
end
|
||||
obj:GetChild('Label_joinPlayers').text = insertName
|
||||
obj:GetChild('text_playerNum').text = string.format("%s/%s", playInfo.maxPlayers, playInfo.maxPlayers)
|
||||
obj:GetChild('text_roundNum').text = string.format("%s/%s", startRoom[newIndex].round,
|
||||
startRoom[newIndex].times)
|
||||
obj:GetChild('btn_joinGame').onClick:Clear()
|
||||
obj:GetChild('btn_watch').onClick:Set(function()
|
||||
roomCtr:PublicWitnessRoom(
|
||||
Protocol.WEB_FG_Witness_ROOM,
|
||||
roomList[newIndex].id,
|
||||
id,
|
||||
function(response)
|
||||
if (response.ReturnCode == -1) then
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, 'response.ReturnCode == -1')
|
||||
-- RestartGame()
|
||||
return
|
||||
end
|
||||
|
||||
if response.ReturnCode ~= 0 then
|
||||
ViewUtil.ErrorMsg(self._root_view, response.ReturnCode, '进入房间失败')
|
||||
-- ViewManager.ChangeView(ViewManager.View_Lobby)
|
||||
return
|
||||
else
|
||||
UpdateBeat:Remove(self.OnUpdate, self)
|
||||
FamilyView.lastId = self._group.id
|
||||
ViewManager.ChangeView(ViewManager.View_Witness, playInfo.gameId)
|
||||
end
|
||||
end,
|
||||
playInfo.gameId,
|
||||
roomList[newIndex].pid
|
||||
)
|
||||
-- self._gamectr = ControllerManager.GetController(GameController)
|
||||
-- self._gamectr:WitnessGame(DataManager.SelfUser.account_id, id, roomList[newIndex].id)
|
||||
end)
|
||||
-- elseif index >= all_num - #startRoom then
|
||||
else
|
||||
local newIndex = index - #readyRoom + 1
|
||||
local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId)
|
||||
local mode = config:GetGameInfo()
|
||||
local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config, playList[newIndex].hpData)
|
||||
obj:GetChild('Label_gameRule').title = gamePlay
|
||||
local roomName = Utils.TextOmit(playList[newIndex].name, 6, "")
|
||||
roomName = string.format("（%s）%s", playList[newIndex].game_name, roomName)
|
||||
obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
|
||||
obj:GetChild('game_type').text = roomName
|
||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 0
|
||||
obj:GetController('type').selectedIndex = 0
|
||||
obj:GetController('num').selectedIndex = playList[newIndex].maxPlayers - 2
|
||||
local playInfo = playList[newIndex]
|
||||
self:FillSameRoomInfo(obj, 0, playInfo)
|
||||
obj:GetChild('Label_joinPlayers').text = ""
|
||||
for i = 1, 4 do
|
||||
local btn = obj:GetChild(string.format("player%d", i))
|
||||
|
|
@ -725,6 +770,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
playList[newIndex].id
|
||||
)
|
||||
end)
|
||||
obj:GetChild('btn_watch').onClick:Clear()
|
||||
end
|
||||
end
|
||||
-- print("=================================================list_room", list_room, list_room.numItems, all_num)
|
||||
|
|
@ -739,22 +785,22 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
|||
end
|
||||
end
|
||||
|
||||
function M:FillSameRoomInfo(newIndex, obj, type, playInfo)
|
||||
--房间渲染
|
||||
function M:FillSameRoomInfo(obj, type, playInfo)
|
||||
local gameId = playInfo.gameId
|
||||
local config = ExtendManager.GetExtendConfig(gameId)
|
||||
local mode = config:GetGameInfo()
|
||||
local gamePlay = mode:LoadConfigToDetail(playInfo.config, playInfo.hpData)
|
||||
obj:GetChild('Label_gameRule').title = gamePlay
|
||||
|
||||
local roomName = playInfo.name
|
||||
roomName = Utils.TextOmit(roomName, 6, "")
|
||||
obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
|
||||
obj:GetChild('game_type').text = string.format("（%s）%s", playInfo.game_name, roomName)
|
||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = 1
|
||||
obj:GetController('num').selectedIndex = roomList[newIndex].maxPlayers - 2
|
||||
-- if self._group.isWatch == 1 then
|
||||
-- 允许观战
|
||||
obj:GetController('type').selectedIndex = self._group.isWatch or 1
|
||||
-- end
|
||||
obj:GetChild('btn_joinGame'):GetController('type').selectedIndex = type
|
||||
obj:GetController('type').selectedIndex = type
|
||||
obj:GetController('isWatch').selectedIndex = (self._group.isWatch and self._group.isWatch == 1) and type or 0
|
||||
obj:GetController('num').selectedIndex = playInfo.maxPlayers - 2
|
||||
end
|
||||
|
||||
function M:ReflashFamilyList()
|
||||
|
|
|
|||
|
|
@ -164,6 +164,11 @@ function M:UpdateHandCard(getcard, mp)
|
|||
getcard = getcard or false
|
||||
mp = mp or false
|
||||
|
||||
--存在back_columnGap字段则调控列表间距
|
||||
if self._viewText_cardInfo['back_columnGap'] and self._view_handCardList.columnGap ~= tonumber(self._viewText_cardInfo['back_columnGap']) then
|
||||
self._view_handCardList.columnGap = tonumber(self._viewText_cardInfo['back_columnGap'])
|
||||
end
|
||||
|
||||
self._view_handCardList:RemoveChildren()
|
||||
self._view_getCard:RemoveChildren()
|
||||
local btn_card
|
||||
|
|
@ -489,7 +494,10 @@ function M:ShowHand(cards)
|
|||
list = self._view:GetChild('List_HandCard2')
|
||||
cardType = self._viewText_cardInfo["Hand_Card"]
|
||||
end
|
||||
|
||||
--存在show_columnGap字段则调控列表间距
|
||||
if self._viewText_cardInfo['show_columnGap'] and list.columnGap ~= tonumber(self._viewText_cardInfo['show_columnGap']) then
|
||||
list.columnGap = tonumber(self._viewText_cardInfo['show_columnGap'])
|
||||
end
|
||||
list:RemoveChildren()
|
||||
--list:RemoveChildren()
|
||||
local passcard = false
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="300,174" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
|
||||
<controller name="type" homePageType="specific" homePage="4" pages="0,进入玩法,1,进入房间,4,正在游戏" selected="1"/>
|
||||
<controller name="type" homePageType="specific" homePage="1" pages="0,进入玩法,1,进入房间,4,正在游戏" selected="2"/>
|
||||
<displayList>
|
||||
<image id="n5_jrro" name="n5" src="jrro7cy7" fileName="Main/Image/btn_mainListJoin.png" xy="0,0">
|
||||
<gearDisplay controller="type" pages="1"/>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<component size="1620,180">
|
||||
<controller name="type" pages="0,玩法匹配,1,加入房间,6,正在游戏" selected="2"/>
|
||||
<controller name="num" pages="0,,1,,2," selected="0"/>
|
||||
<controller name="isWatch" pages="0,,1,,5," selected="1"/>
|
||||
<displayList>
|
||||
<image id="n23_jrro" name="n23" src="q2iu7d5k" fileName="Main/Image/bg_mainListChild(1).png" xy="0,0" size="1326,180">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
|
|
@ -10,9 +11,13 @@
|
|||
<relation target="" sidePair="right-right"/>
|
||||
</component>
|
||||
<component id="n28_o8k8" name="btn_watch" src="ayfr7cwq" fileName="Main/Component/btn_watch.xml" xy="1148,3" size="160,63">
|
||||
<gearDisplay controller="type" pages="1,6"/>
|
||||
<gearDisplay controller="isWatch" pages="1,5"/>
|
||||
<relation target="" sidePair="right-right"/>
|
||||
</component>
|
||||
<component id="n33_ofwa" name="btn_jiesan" src="jydr7d3q" fileName="Main/Component/btn_mul.xml" xy="967,3" size="160,63">
|
||||
<gearDisplay controller="type" pages="1,6"/>
|
||||
<Button icon="ui://htcn7v3rofwa7d6j"/>
|
||||
</component>
|
||||
<component id="n15_in3i" name="player1" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="12,51" size="90,75" group="n29_q2iu">
|
||||
<gearDisplay controller="num" pages="0,1,2"/>
|
||||
<gearXY controller="num" pages="0,1" values="12,51|62,12" default="12,12"/>
|
||||
|
|
@ -28,28 +33,28 @@
|
|||
<gearDisplay controller="num" pages="1,2"/>
|
||||
</component>
|
||||
<group id="n29_q2iu" name="n29" xy="12,51" size="186,111"/>
|
||||
<richtext id="n2_in3i" name="game_type" xy="205,3" size="938,72" group="n30_q2iu" font="FZLanTingHeiS-R-GB" fontSize="54" vAlign="middle" leading="0" autoSize="none" bold="true" text="（抚州麻将）123123456">
|
||||
<richtext id="n2_in3i" name="game_type" xy="206,3" size="754,72" group="n30_q2iu" font="FZLanTingHeiS-R-GB" fontSize="54" vAlign="middle" leading="0" autoSize="none" bold="true" text="（抚州麻将）123123456">
|
||||
<relation target="" sidePair="width-width"/>
|
||||
</richtext>
|
||||
<text id="n3_in3i" name="n3" xy="239,71" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#4c4c4c" leading="0" autoSize="none" text="玩法：12316"/>
|
||||
<text id="n5_in3i" name="n5" xy="223,115" size="124,49" group="n30_q2iu" font="ui://27vd145bh35o7im7" fontSize="36" color="#4c4c4c" leading="0" text="已加入:"/>
|
||||
<component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,71" size="969,49" group="n30_q2iu">
|
||||
<text id="n3_in3i" name="n3" xy="240,71" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#4c4c4c" leading="0" autoSize="none" text="玩法：12316"/>
|
||||
<text id="n5_in3i" name="n5" xy="224,115" size="124,49" group="n30_q2iu" font="ui://27vd145bh35o7im7" fontSize="36" color="#4c4c4c" leading="0" text="已加入:"/>
|
||||
<component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="345,71" size="969,49" group="n30_q2iu">
|
||||
<relation target="" sidePair="width-width"/>
|
||||
<Label titleColor="#a01f21"/>
|
||||
</component>
|
||||
<component id="n8_in3i" name="Label_joinPlayers" src="in3i7cuk" fileName="Main/Component/Label_joinPlayers.xml" xy="351,115" size="952,49" group="n30_q2iu">
|
||||
<component id="n8_in3i" name="Label_joinPlayers" src="in3i7cuk" fileName="Main/Component/Label_joinPlayers.xml" xy="352,115" size="952,49" group="n30_q2iu">
|
||||
<relation target="" sidePair="width-width"/>
|
||||
</component>
|
||||
<group id="n30_q2iu" name="n30" xy="205,3" size="1108,161" advanced="true">
|
||||
<group id="n30_q2iu" name="n30" xy="206,3" size="1108,161" advanced="true">
|
||||
<relation target="" sidePair="left-left"/>
|
||||
</group>
|
||||
<text id="n31_ofwa" name="text_playerNum" xy="1456,118" size="64,52" font="Microsoft YaHei" fontSize="38" color="#ffffff" text="1/3">
|
||||
<gearDisplay controller="type" pages="1,6"/>
|
||||
<gearXY controller="type" pages="1,6" values="1456,100|1456,118" default="1456,100"/>
|
||||
<relation target="" sidePair="center-center,top-top%"/>
|
||||
<gearXY controller="type" pages="0,1,6" values="1456,100,0.899,0.556|1456,100,0.899,0.556|1456,118,0.899,0.656" positionsInPercent="true"/>
|
||||
<relation target="" sidePair="center-center,bottom-bottom%"/>
|
||||
</text>
|
||||
<text id="n32_ofwa" name="text_roundNum" xy="1447,10" size="64,52" font="Microsoft YaHei" fontSize="38" color="#ffffff" text="1/3">
|
||||
<gearDisplay controller="type" pages="1,6"/>
|
||||
<gearDisplay controller="type" pages="6"/>
|
||||
<gearXY controller="type" pages="1,6" values="1456,100|1447,10" default="1456,100"/>
|
||||
<relation target="" sidePair="center-center,top-top%"/>
|
||||
</text>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 9.1 KiB |
|
|
@ -406,6 +406,7 @@
|
|||
<image id="jzul7d6f" name="hall_club_BG_landiyuan.png" path="/NumberRecord/Image/" scale="9grid" scale9grid="17,9,34,18"/>
|
||||
<image id="ofwa7d6g" name="效果图.png" path="/ChatRoom/Component/"/>
|
||||
<image id="ofwa7d6h" name="ting_corner_icon.png" path="/ChatRoom/Component/"/>
|
||||
<image id="ofwa7d6j" name="dismiss1.png" path="/Main/Image/"/>
|
||||
</resources>
|
||||
<publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
|
||||
</packageDescription>
|
||||
|
|
@ -2,12 +2,12 @@
|
|||
<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://v0j9abjyk0pa13h" align="center" fill="scaleFree" clearOnPublish="true">
|
||||
<loader id="n0_ckvb" name="icon" xy="0,0" size="174,186" url="ui://Main_Majiang/b202_303" align="center" fill="scaleFree" clearOnPublish="true">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<image id="n1_ckvb" name="n1" src="ofwa1gm" fileName="Main_new/Main/Image/jing 1.png" xy="61,-18" size="108,154" aspect="true">
|
||||
<image id="n1_ckvb" name="n1" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="57,-16" size="112,160" aspect="true">
|
||||
<gearDisplay controller="jing" pages="1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,right-right%,top-top%"/>
|
||||
</image>
|
||||
</displayList>
|
||||
</component>
|
||||
|
|
@ -3,11 +3,12 @@
|
|||
<controller name="button" pages="0,up,1,down" selected="0"/>
|
||||
<controller name="jing" pages="0,,1," selected="1"/>
|
||||
<displayList>
|
||||
<loader id="n3_hp0b" name="icon" xy="-3,2" size="200,225" url="ui://Main_Majiang/b201_101" fill="scale">
|
||||
<loader id="n3_hp0b" name="icon" xy="-3,2" size="200,225" url="ui://Main_Majiang/b201_303" fill="scale">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<image id="n12_k1od" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/Group 38.png" xy="90,39" size="102,71" aspect="true">
|
||||
<image id="n12_k1od" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="74,15" size="119,170" aspect="true">
|
||||
<gearDisplay controller="jing" pages="1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,right-right%,top-top%"/>
|
||||
</image>
|
||||
<graph id="n13_rw7j" name="n13" xy="0,0" size="176,249" type="rect" lineSize="0" fillColor="#99000000">
|
||||
<gearDisplay controller="button" pages="1"/>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<controller name="ting" pages="0,,1," selected="0"/>
|
||||
<controller name="site" pages="0,2-1,1,2-2" selected="0"/>
|
||||
<controller name="getCard" pages="0,,1," selected="0"/>
|
||||
<controller name="cStie" exported="true" pages="0,,1,,2," selected="1">
|
||||
<controller name="cStie" exported="true" pages="0,,1,,2," selected="2">
|
||||
<remark page="0" value="2人"/>
|
||||
<remark page="1" value="3人"/>
|
||||
<remark page="2" value="4人"/>
|
||||
|
|
@ -22,9 +22,6 @@
|
|||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n38_gi99" name="List_FZ" xy="454,18" size="1329,103" touchable="false" layout="row" selectionMode="none" colGap="7" defaultItem="ui://v0j9abjygi9910r" autoItemSize="false" align="right" vAlign="bottom" autoClearItems="true">
|
||||
<relation target="" sidePair="width-width%,height-height%,top-top"/>
|
||||
|
|
@ -33,7 +30,7 @@
|
|||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n41_gi99" name="List_OutCard" xy="324,103" size="1217,502" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" autoClearItems="true">
|
||||
<list id="n41_gi99" name="List_OutCard" xy="833,148" size="887,502" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" autoClearItems="true">
|
||||
<gearXY controller="cStie" pages="0,1,2" values="265,150|324,103|833,148"/>
|
||||
<gearSize controller="cStie" pages="1,2" values="1217,502,1,1|887,502,1,1" default="2097,502,1,1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,top-top"/>
|
||||
|
|
@ -81,10 +78,10 @@
|
|||
<gearDisplay controller="ting" pages="1"/>
|
||||
<gearXY controller="3d" pages="0" values="-1732,-1096" default="616,100"/>
|
||||
</image>
|
||||
<text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Get_Card":"100",
"Pos_Y":-28,
"Order":"asc"
}">
|
||||
<gearText controller="cStie" default="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Get_Card":"100",
"Pos_Y":-28,
"Order":"asc"
}"/>
|
||||
<text id="n53_ogwn" name="Text_CardInfo" xy="-1881,281" size="813,973" visible="false" fontSize="30" autoSize="none" text="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Get_Card":"100",
"Pos_Y":-28,
"Order":"asc",
"back_columnGap":"-9",
"show_columnGap":"-6 "
}">
|
||||
<gearText controller="cStie" pages="0,1,2" values="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Get_Card":"100",
"Pos_Y":-28,
"Order":"asc",
"back_columnGap":"-9",
"show_columnGap":"-3"
}|{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Get_Card":"100",
"Pos_Y":-28,
"Order":"asc",
"back_columnGap":"-9",
"show_columnGap":"-3"
}|{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Get_Card":"100",
"Pos_Y":-28,
"Order":"asc",
"back_columnGap":"-9",
"show_columnGap":"-6 "
}"/>
|
||||
</text>
|
||||
<list id="n54_jzul" name="list_HuEffect" xy="0,33" size="2532,420" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
|
||||
<list id="n54_jzul" name="list_HuEffect" xy="0,33" size="2532,420" touchable="false" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyxqxr1eq" autoItemSize="false" align="center" vAlign="middle" autoClearItems="true">
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<component size="91,94">
|
||||
<controller name="jing" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<loader id="n0_gi99" name="icon" xy="0,0" size="91,94" url="ui://v0j9abjyvum113z" align="center" vAlign="middle" fill="scaleFree">
|
||||
<loader id="n0_gi99" name="icon" xy="0,0" size="91,94" url="ui://Main_Majiang/b201_0" align="center" vAlign="middle" fill="scaleFree">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<image id="n1_g9ft" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing 1.png" xy="27,-6" size="63,51" aspect="true">
|
||||
<image id="n1_g9ft" name="jing" src="ofwa1gm" fileName="Main_new/Main/Image/jing.png" xy="32,-8" size="55,78" aspect="true">
|
||||
<gearDisplay controller="jing" pages="1"/>
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,right-right%,top-top%"/>
|
||||
</image>
|
||||
</displayList>
|
||||
</component>
|
||||
|
|
@ -1167,7 +1167,7 @@
|
|||
<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"/>
|
||||
<image id="ofwa1gm" name="jing.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="ofwa1gm" name="jing.png" path="/Main_new/Main/Image/" disableTrim="true"/>
|
||||
<image id="ofwa1gq" name="jing.png" path="/Main_new/Clearing/Component/"/>
|
||||
<image id="ofwa1gr" name="ting_corner_icon.png" path="/Main_new/Clearing/Component/"/>
|
||||
<image id="ofwa1gs" name="jing(1).png" path="/Main_new/Clearing/Component/"/>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 MiB After Width: | Height: | Size: 4.7 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 2.2 MiB |
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 4.0 MiB After Width: | Height: | Size: 4.0 MiB |
Binary file not shown.
|
|
@ -1,109 +1,109 @@
|
|||
[
|
||||
{
|
||||
"lua_path": "/tolua_project,/base_project,/main_project",
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "base_script",
|
||||
"check": true,
|
||||
"bundle": "base/base_script",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "common",
|
||||
"check": true,
|
||||
"bundle": "base/common",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "login",
|
||||
"check": true,
|
||||
"bundle": "base/login",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "lobby",
|
||||
"check": true,
|
||||
"bundle": "base/lobby",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "Family",
|
||||
"check": true,
|
||||
"bundle": "base/Family",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "chat",
|
||||
"check": true,
|
||||
"bundle": "base/chat",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "newgroup",
|
||||
"check": true,
|
||||
"bundle": "base/newgroup",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "rank",
|
||||
"check": true,
|
||||
"version": "1.0.7",
|
||||
"version": "1.0.6",
|
||||
"bundle": "base/rank"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "main_majiang",
|
||||
"check": true,
|
||||
"version": "1.0.7",
|
||||
"version": "1.0.6",
|
||||
"bundle": "base/main_majiang"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "main_poker",
|
||||
"check": true,
|
||||
"version": "1.0.7",
|
||||
"version": "1.0.6",
|
||||
"bundle": "base/main_poker"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "main_zipai",
|
||||
"check": true,
|
||||
"version": "1.0.7",
|
||||
"version": "1.0.6",
|
||||
"bundle": "base/main_zipai"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "static",
|
||||
"check": true,
|
||||
"bundle": "base/static",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"is_res": true,
|
||||
"name": "embed",
|
||||
"check": true,
|
||||
"bundle": "base/embed",
|
||||
"version": "1.0.7"
|
||||
"version": "1.0.6"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "main_pokemajiang",
|
||||
"check": true,
|
||||
"version": "1.0.7",
|
||||
"version": "1.0.6",
|
||||
"bundle": "base/main_pokemajiang"
|
||||
},
|
||||
{
|
||||
"ver": "1.0.7",
|
||||
"ver": "1.0.6",
|
||||
"name": "main_zipaimajiang",
|
||||
"check": true,
|
||||
"version": "1.0.7",
|
||||
"version": "1.0.6",
|
||||
"bundle": "base/main_zipaimajiang"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue