麻将布局，家族在线协议
parent
121e8a3716
commit
5c6f18656f
|
|
@ -1674,3 +1674,23 @@ function M:FG_Recharge_Diamo(groupId, diamo, callback)
|
|||
callback(res)
|
||||
end)
|
||||
end
|
||||
|
||||
-- 进入亲友圈
|
||||
function M:FG_Get_Online_Member(groupId, callback)
|
||||
local _data = {}
|
||||
_data.id = groupId
|
||||
local _client = ControllerManager.GroupClient
|
||||
_client:send(Protocol.WEB_FG_GET_ONLINE_MEMBER, _data, function(res)
|
||||
callback(res)
|
||||
end)
|
||||
end
|
||||
|
||||
-- 退出亲友圈
|
||||
function M:FG_Get_Offline_Member(groupId, callback)
|
||||
local _data = {}
|
||||
_data.id = groupId
|
||||
local _client = ControllerManager.GroupClient
|
||||
_client:send(Protocol.WEB_FG_GET_OFFLINE_MEMBER, _data, function(res)
|
||||
callback(res)
|
||||
end)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -277,7 +277,10 @@ Protocol = {
|
|||
|
||||
-- 亲友圈房卡充值
|
||||
WEB_FG_RECHARGE_DIAMO = "group/recharge_diamo",
|
||||
|
||||
-- 进入亲友圈
|
||||
WEB_FG_GET_ONLINE_MEMBER = "group/get_online_member",
|
||||
-- 退出亲友圈
|
||||
WEB_FG_GET_OFFLINE_MEMBER = "get_offline_member",
|
||||
-------------- group-log---------------------
|
||||
-- 获取奖励日志
|
||||
WEB_FG_GET_REWARDS_LOG = "group/log/get_reward_log",
|
||||
|
|
|
|||
|
|
@ -23,6 +23,13 @@ FamilyView = {}
|
|||
|
||||
local M = FamilyView
|
||||
|
||||
local function FamilyOnline(groupId)
|
||||
local fgCtr = ControllerManager.GetController(NewGroupController)
|
||||
fgCtr:FG_Get_Online_Member(groupId, function(res)
|
||||
|
||||
end)
|
||||
end
|
||||
|
||||
function FamilyView.new()
|
||||
UIPackage.AddPackage("base/Family/ui/Family")
|
||||
|
||||
|
|
@ -336,6 +343,8 @@ function M:ConnetFamilyRoom(fgCtr, id)
|
|||
pt(res)
|
||||
end)
|
||||
|
||||
FamilyOnline(self._group.id)
|
||||
|
||||
return 1
|
||||
end
|
||||
end)
|
||||
|
|
@ -552,8 +561,7 @@ function M:ConnetFamily(index, groups, isCreate)
|
|||
list_family.itemRenderer = function(i, obj)
|
||||
local j = i + 1
|
||||
obj:GetChild("title").emojies = EmojiDitc.EmojiesDitc
|
||||
--obj.text = ViewUtil.TextOmit(groups[j].name)
|
||||
obj.text = groups[j].name
|
||||
obj.text = Utils.TextOmit(groups[j].name, 6)
|
||||
obj.onClick:Add(function()
|
||||
|
||||
if groups[j].id == self._group.id then
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="666,49" overflow="scroll" scroll="horizontal" extention="Label">
|
||||
<displayList>
|
||||
<text id="n1_in3i" name="title" xy="0,0" size="128,49" font="ui://27vd145bh35o7im7" fontSize="36" color="#ffffff" leading="0" autoClearText="true" text="474747"/>
|
||||
<text id="n1_in3i" name="title" xy="0,0" size="128,49" font="ui://27vd145bh35o7im7" fontSize="36" color="#ad3c3a" leading="0" autoClearText="true" text="474747"/>
|
||||
</displayList>
|
||||
</component>
|
||||
|
|
@ -1,25 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="350,274">
|
||||
<controller name="seat" pages="0,,1,,2,,3," selected="1"/>
|
||||
<controller name="seat" pages="0,,1,,2,,3," selected="0"/>
|
||||
<displayList>
|
||||
<image id="n3_gjnb" name="n3" src="gjnb10c" fileName="Main_new/Main/Image/Group 243.png" xy="58,42" size="231,187">
|
||||
<image id="n3_gjnb" name="n3" src="gjnb10c" fileName="Main_new/Main/Image/Group 243.png" xy="58,41" size="230,187">
|
||||
<relation target="" sidePair="width-width%,height-height%,center-center,middle-middle"/>
|
||||
</image>
|
||||
<image id="n4_gjnb" name="n4" src="gjnb109" fileName="Main_new/Main/Image/Group 240.png" xy="225,0" size="124,274">
|
||||
<image id="n4_gjnb" name="n4" src="xblm1a7" fileName="Main_new/Main/Image/di2.png" xy="225,-53" size="234,381" flip="hz">
|
||||
<gearDisplay controller="seat" pages="1"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,right-right"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
|
||||
</image>
|
||||
<image id="n5_gjnb" name="n5" src="gjnb10a" fileName="Main_new/Main/Image/Group 241.png" xy="0,0" size="350,97">
|
||||
<image id="n5_gjnb" name="n5" src="xblm1a6" fileName="Main_new/Main/Image/di.png" xy="-72,-89" size="495,183" flip="vt">
|
||||
<gearDisplay controller="seat" pages="2"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,top-top"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
|
||||
</image>
|
||||
<image id="n6_gjnb" name="n6" src="gjnb10b" fileName="Main_new/Main/Image/Group 242.png" xy="0,0" size="124,274">
|
||||
<image id="n6_gjnb" name="n6" src="xblm1a7" fileName="Main_new/Main/Image/di2.png" xy="-116,-53" size="234,381">
|
||||
<gearDisplay controller="seat" pages="3"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,left-left"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
|
||||
</image>
|
||||
<image id="n7_gjnb" name="n7" src="gjnb108" fileName="Main_new/Main/Image/Group 244.png" xy="0,176" size="350,97">
|
||||
<image id="n7_gjnb" name="n7" src="xblm1a6" fileName="Main_new/Main/Image/di.png" xy="-71,177" size="495,183">
|
||||
<gearDisplay controller="seat" pages="0"/>
|
||||
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
|
||||
<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">
|
||||
<relation target="" sidePair="center-center,middle-middle"/>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="64,90">
|
||||
<controller name="jing" pages="0,,1," selected="0"/>
|
||||
<controller name="jing" pages="0,,1," selected="1"/>
|
||||
<displayList>
|
||||
<loader id="n0_ckvb" name="icon" xy="0,0" size="64,90" fill="scale">
|
||||
<loader id="n0_ckvb" name="icon" xy="0,0" size="64,90" url="ui://v0j9abjyk0pa11p" align="center" fill="scaleFree" clearOnPublish="true">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<image id="n1_ckvb" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="32,33" aspect="true">
|
||||
<image id="n1_ckvb" name="n1" src="xblm1a5" fileName="Main_new/Main/Image/jing 1.png" xy="5,3" size="59,61" 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%,left-left%,top-top%"/>
|
||||
</image>
|
||||
</displayList>
|
||||
</component>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="2517,186" opaque="false" initName="player_card_info">
|
||||
<component size="2532,186" opaque="false" initName="player_card_info">
|
||||
<controller name="3d" pages="0,,1," selected="0"/>
|
||||
<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="seletedGetCard" pages="0,,1," selected="0"/>
|
||||
<controller name="getCard" pages="0,,1," selected="1"/>
|
||||
<controller name="seletedGetCard" pages="0,,1," selected="1"/>
|
||||
<controller name="tip" pages="0,,1," selected="0"/>
|
||||
<controller name="showGuoHu" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
|
|
@ -24,14 +24,15 @@
|
|||
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
|
||||
</image>
|
||||
<text id="n36_gi99" name="Text_CardInfo" xy="900,258" size="813,973" visible="false" fontSize="30" autoSize="none" text="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b201_",
"Get_Card":"b201_",
"Order":"desc",
"Pos_X":57
}"/>
|
||||
<list id="n33_gi99" name="List_FZ" xy="7,12" size="2517,158" touchable="false" layout="row" selectionMode="none" colGap="16" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
|
||||
<list id="n33_gi99" name="List_FZ" xy="41,24" size="2550,158" touchable="false" layout="row" selectionMode="none" colGap="16" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n32_kxhm" name="List_HandCard" xy="10,0" size="2135,186" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n32_kxhm" name="List_HandCard" xy="40,0" size="2236,186" layout="row" colGap="-2" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
|
|
@ -79,7 +80,7 @@
|
|||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n38_shqd" name="Btn_HandCard" xy="2241,3" size="168,186" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
|
||||
<list id="n38_shqd" name="Btn_HandCard" xy="2302,3" size="168,186" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
|
||||
<gearDisplay controller="getCard" pages="1"/>
|
||||
<item/>
|
||||
</list>
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
<gearDisplay controller="ting" pages="1"/>
|
||||
<gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
|
||||
</image>
|
||||
<text id="n36_gi99" name="Text_CardInfo" xy="5,-1189" size="813,973" visible="false" fontSize="30" autoSize="none" text="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Order":"asc"
}"/>
|
||||
<list id="n37_gi99" name="List_HandCard" xy="125,0" size="1222,99" touchable="false" layout="row" selectionMode="none" colGap="-10" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
|
||||
<text id="n36_gi99" name="Text_CardInfo" xy="122,-1603" size="813,973" visible="false" fontSize="30" autoSize="none" text="{
"FZ_Card":"b202_",
"Out_Card":"b202_",
"Hand_Card":"b202_",
"Get_Card":"b202_",
"Order":"asc"
}"/>
|
||||
<list id="n37_gi99" name="List_HandCard" xy="284,0" size="1061,99" touchable="false" layout="row" selectionMode="none" colGap="-10" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<item/>
|
||||
<item/>
|
||||
|
|
@ -36,13 +36,13 @@
|
|||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n38_gi99" name="List_FZ" xy="18,15" size="1329,85" touchable="false" layout="row" selectionMode="none" colGap="4" defaultItem="ui://v0j9abjygi9910r" align="right" autoClearItems="true">
|
||||
<list id="n38_gi99" name="List_FZ" xy="21,15" size="1329,85" touchable="false" layout="row" selectionMode="none" colGap="4" defaultItem="ui://v0j9abjygi9910r" align="right" autoClearItems="true">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n41_gi99" name="List_OutCard" xy="-84,173" pivot="0.5,0.5" size="2079,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
|
||||
<item/>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<item/>
|
||||
<item/>
|
||||
</list>
|
||||
<list id="n43_nee3" name="Btn_HandCard" xy="0,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
|
||||
<list id="n43_nee3" name="Btn_HandCard" xy="151,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
|
||||
<gearDisplay controller="getCard" pages="1"/>
|
||||
<item/>
|
||||
</list>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="2532,1170">
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
|
||||
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
|
||||
<controller name="sdk" pages="0,,1," selected="0"/>
|
||||
<controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
|
||||
<controller name="3d" pages="0,,1," selected="0"/>
|
||||
<controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
|
||||
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
|
||||
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="1"/>
|
||||
<controller name="more" pages="0,,1," selected="0"/>
|
||||
<controller name="witness" pages="0,,1," selected="1"/>
|
||||
<controller name="witness" pages="0,,1," selected="0"/>
|
||||
<controller name="voice" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<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">
|
||||
|
|
@ -85,7 +85,9 @@
|
|||
<gearDisplay controller="state" pages="0"/>
|
||||
<relation target="" sidePair="center-center,middle-middle"/>
|
||||
</group>
|
||||
<component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
|
||||
<component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="313,40" size="113,124" visible="false" touchable="false">
|
||||
<relation target="n155_gi99" sidePair="left-left"/>
|
||||
</component>
|
||||
<text id="n134_lu84" name="text_time" xy="119,0" size="96,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="22:20"/>
|
||||
<component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="5,4" group="n135_lu84">
|
||||
<ProgressBar value="50" max="100"/>
|
||||
|
|
@ -102,7 +104,7 @@
|
|||
<gearDisplay controller="state" pages="3"/>
|
||||
<Button icon="ui://v0j9abjylj2n17t"/>
|
||||
</component>
|
||||
<component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="385,33">
|
||||
<component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="370,52">
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
</component>
|
||||
<component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="9,975">
|
||||
|
|
@ -122,25 +124,25 @@
|
|||
<group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
|
||||
<relation target="" sidePair="center-center"/>
|
||||
</group>
|
||||
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
|
||||
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
|
||||
<gearDisplay controller="state" pages="0,2"/>
|
||||
<gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
|
||||
<gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
|
||||
<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="739,916" size="153,132">
|
||||
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,796" size="153,132">
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
<gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/>
|
||||
<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,274" size="153,132">
|
||||
<component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
|
||||
<gearDisplay controller="state" pages="0,2"/>
|
||||
<gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/>
|
||||
<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="1901,519" size="153,132">
|
||||
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,82" size="153,132">
|
||||
<gearDisplay controller="state" pages="1,3,4"/>
|
||||
<gearXY controller="state" pages="0,1,3,4" values="1901,519|1834,63|1755,27|1767,43" default="1207,909"/>
|
||||
<gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,82|1740,46|1752,62" default="1192,928"/>
|
||||
<relation target="n155_gi99" sidePair="left-right,top-top"/>
|
||||
</component>
|
||||
<text id="n162_qz7i" name="text_testName" xy="47,178" size="266,49" visible="false" fontSize="36" color="#ffffff" bold="true" text="|一个玩家的名字"/>
|
||||
|
|
@ -238,9 +240,9 @@
|
|||
<relation target="" sidePair="width-width,height-height"/>
|
||||
<Button controller="witness" page="0"/>
|
||||
</component>
|
||||
<component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2097,30">
|
||||
<component id="n185_kzuz" 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="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123"/>
|
||||
<graph id="n188_pbp6" name="n188" xy="0,0" size="2532,1170" group="n191_pbp6" type="rect" lineSize="0" fillColor="#73000000"/>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="168,186" extention="Button">
|
||||
<component size="174,186" extention="Button">
|
||||
<controller name="button" pages="0,up,1,down" selected="0"/>
|
||||
<controller name="jing" pages="0,,1," selected="0"/>
|
||||
<controller name="move" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<loader id="n3_hp0b" name="icon" xy="0,0" size="168,186" url="ui://Main_Majiang/b201_101" fill="scale">
|
||||
<loader id="n3_hp0b" name="icon" xy="0,0" size="174,186" url="ui://Main_Majiang/b201_101" 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="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="95,52" aspect="true">
|
||||
<image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="101,52" aspect="true">
|
||||
<gearDisplay controller="jing" pages="1"/>
|
||||
<gearXY controller="button" pages="0,1" values="3,-1|0,-22" duration=".1"/>
|
||||
<gearXY controller="button" pages="0,1" values="3,-1|0,-22" 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"/>
|
||||
</image>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,25 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<component size="458,158">
|
||||
<controller name="isFour" pages="0,,1," selected="1"/>
|
||||
<component size="468,158">
|
||||
<controller name="isFour" pages="0,,1," selected="0"/>
|
||||
<controller name="seat" pages="0,,1,,2,,3," selected="3"/>
|
||||
<displayList>
|
||||
<component id="n0_gi99" name="Comp_Card1" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="0,0"/>
|
||||
<component id="n1_gi99" name="Comp_Card2" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="150,0" size="158,158"/>
|
||||
<component id="n2_gi99" name="Comp_Card3" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="300,0" size="158,158"/>
|
||||
<component id="n3_gi99" name="Comp_Card4" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="150,-27">
|
||||
<gearDisplay controller="isFour" pages="1"/>
|
||||
<component id="n0_gi99" name="Comp_Card1" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="0,0" size="161,158">
|
||||
<relation target="" sidePair="width-width%,left-left"/>
|
||||
</component>
|
||||
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="216,14" pivot="0.5,0.5" size="30,32" rotation="-90">
|
||||
<gearXY controller="seat" pages="0,1,2,3" values="216,14|216,14|216,14|216,14"/>
|
||||
<component id="n2_gi99" name="Comp_Card3" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="306,0" size="161,158">
|
||||
<relation target="" sidePair="width-width%,right-right"/>
|
||||
</component>
|
||||
<component id="n1_gi99" name="Comp_Card2" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="153,0" size="161,158">
|
||||
<relation target="" sidePair="width-width%,center-center"/>
|
||||
</component>
|
||||
<component id="n3_gi99" name="Comp_Card4" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="153,-27" size="161,158">
|
||||
<gearDisplay controller="isFour" pages="1"/>
|
||||
<relation target="" sidePair="width-width%,center-center"/>
|
||||
</component>
|
||||
<image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="221,14" pivot="0.5,0.5" size="30,32" rotation="-90">
|
||||
<gearXY controller="seat" pages="0,1,2,3" values="221,14|221,14|221,14|221,14"/>
|
||||
<gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
|
||||
<relation target="" sidePair="center-center"/>
|
||||
</image>
|
||||
</displayList>
|
||||
</component>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<component size="158,158">
|
||||
<controller name="jing" pages="0,,1," selected="0"/>
|
||||
<displayList>
|
||||
<loader id="n0_gi99" name="icon" xy="0,0" size="158,158" url="ui://Main_Majiang/b202_101" fill="scale">
|
||||
<loader id="n0_gi99" name="icon" xy="0,0" size="158,158" url="ui://Main_Majiang/b202_101" fill="scaleFree">
|
||||
<relation target="" sidePair="width-width,height-height"/>
|
||||
</loader>
|
||||
<image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="113,67" aspect="true">
|
||||
|
|
|
|||
|
|
@ -1115,7 +1115,7 @@
|
|||
<component id="nee311g" name="Comp_3_HandCard2.xml" path="/Main_new/Main_new_3/Component/"/>
|
||||
<component id="nee311h" name="Player_card_info_3_3.xml" path="/Main_new/Main_new_3/"/>
|
||||
<component id="nee311i" name="Comp_3_HandCard3.xml" path="/Main_new/Main_new_3/Component/"/>
|
||||
<component id="ckvb11l" name="Comp_jing.xml" path="/Main_new/Main/Component/"/>
|
||||
<component id="ckvb11l" name="Comp_jing.xml" path="/Main_new/Main/Component/" exported="true"/>
|
||||
<component id="qz7i11m" name="Btn_Card_jiangxi_show.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
|
||||
<image id="qz7i11n" name="Polygon 7.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="k0pa11o" name="b201_101.png" path="/images/cards3/1/" exported="true"/>
|
||||
|
|
@ -1404,6 +1404,9 @@
|
|||
<image id="u6331a2" name="button_chat.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="u6331a3" name="looker.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="u6331a4" name="button_desk.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="xblm1a5" name="jing 1.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="xblm1a6" name="di.png" path="/Main_new/Main/Image/"/>
|
||||
<image id="xblm1a7" name="di2.png" path="/Main_new/Main/Image/"/>
|
||||
</resources>
|
||||
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
|
||||
</packageDescription>
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 MiB After Width: | Height: | Size: 1.9 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 MiB After Width: | Height: | Size: 4.8 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 MiB After Width: | Height: | Size: 3.4 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 882 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 MiB After Width: | Height: | Size: 1.4 MiB |
Binary file not shown.
|
|
@ -18,6 +18,7 @@ public class Game_UtilsWrap
|
|||
L.RegFunction("LocalAddress", LocalAddress);
|
||||
L.RegFunction("IsGPSEnable", IsGPSEnable);
|
||||
L.RegFunction("DownloadFile", DownloadFile);
|
||||
L.RegFunction("TextOmit", TextOmit);
|
||||
L.EndStaticLibs();
|
||||
}
|
||||
|
||||
|
|
@ -208,5 +209,23 @@ public class Game_UtilsWrap
|
|||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
|
||||
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
|
||||
static int TextOmit(IntPtr L)
|
||||
{
|
||||
try
|
||||
{
|
||||
ToLua.CheckArgsCount(L, 2);
|
||||
string arg0 = ToLua.CheckString(L, 1);
|
||||
int arg1 = (int)LuaDLL.luaL_checknumber(L, 2);
|
||||
string o = Game.Utils.TextOmit(arg0, arg1);
|
||||
LuaDLL.lua_pushstring(L, o);
|
||||
return 1;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return LuaDLL.toluaL_exception(L, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue