修改麻将排序,替换个人信息ui
|
|
@ -229,30 +229,55 @@ function M:FillItemData(room, data, item, active_player, niao)
|
||||||
local hand_cards = data["hand_card"]
|
local hand_cards = data["hand_card"]
|
||||||
--table.sort( hand_cards, ViewUtil.HandCardSort)
|
--table.sort( hand_cards, ViewUtil.HandCardSort)
|
||||||
|
|
||||||
-- 癞子(501)排第一,其他牌按 ViewUtil.HandCardSort 规则排序
|
--癞子(501)排第一,字牌风牌排最后,其他牌按 ViewUtil.HandCardSort 规则排序
|
||||||
if hand_cards and #hand_cards > 1 then
|
if hand_cards and #hand_cards > 1 then
|
||||||
table.sort(hand_cards, function(a, b)
|
-- 判断是否为字牌 (东南西北中发白)
|
||||||
local isLaiziA = (a == 501)
|
local function IsZiPai(cardId)
|
||||||
local isLaiziB = (b == 501)
|
-- 排除癞子
|
||||||
-- 1. 如果 A 是癞子,B 不是,A 排前面 (返回 true)
|
if cardId == 501 then return false end
|
||||||
if isLaiziA and not isLaiziB then
|
-- 根据实际项目ID定义判断字牌范围
|
||||||
return true
|
-- 常见定义:31 <= id <= 37
|
||||||
end
|
if cardId >= 401 and cardId <= 503 then
|
||||||
-- 2. 如果 A 不是癞子,B 是,A 排后面 (返回 false)
|
return true
|
||||||
if not isLaiziA and isLaiziB then
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
-- 3. 如果两者都是癞子,或都不是癞子,使用标准排序规则
|
table.sort(hand_cards, function(a, b)
|
||||||
-- 尝试获取比较结果
|
local isLaiziA = (a == 501)
|
||||||
local result = ViewUtil.HandCardSort(a, b)
|
local isLaiziB = (b == 501)
|
||||||
|
-- 1. 癞子永远排第一,如果 A 是癞子,B 不是,A 排前面 (返回 true)
|
||||||
|
if isLaiziA and not isLaiziB then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
-- 2. 如果 A 不是癞子,B 是,A 排后面 (返回 false)
|
||||||
|
if not isLaiziA and isLaiziB then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
local isZiA = IsZiPai(a)
|
||||||
|
local isZiB = IsZiPai(b)
|
||||||
|
|
||||||
-- 兼容处理:如果 ViewUtil.HandCardSort 返回的是数字 (-1, 0, 1)
|
-- 2. 处理字牌与数牌的相对位置
|
||||||
if type(result) == "number" then
|
if isZiA ~= isZiB then
|
||||||
return result < 0
|
-- 字牌在后
|
||||||
end
|
if true then
|
||||||
-- 如果返回的是布尔值,直接返回
|
-- A是字牌,B不是 -> A排后面 (返回 false)
|
||||||
return result
|
if isZiA then return false end
|
||||||
end)
|
-- A不是字牌,B是 -> A排前面 (返回 true)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 3. 如果两者都是癞子,或都不是癞子,使用标准排序规则
|
||||||
|
-- 尝试获取比较结果
|
||||||
|
local result = ViewUtil.HandCardSort(a, b)
|
||||||
|
|
||||||
|
-- 兼容处理:如果 ViewUtil.HandCardSort 返回的是数字 (-1, 0, 1)
|
||||||
|
if type(result) == "number" then
|
||||||
|
return result < 0
|
||||||
|
end
|
||||||
|
-- 如果返回的是布尔值,直接返回
|
||||||
|
return result
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,31 +78,55 @@ function M:SendOutCard(card, callback)
|
||||||
list_remove(p.card_list, card)
|
list_remove(p.card_list, card)
|
||||||
|
|
||||||
--table.sort(p.card_list, ViewUtil.HandCardSort)
|
--table.sort(p.card_list, ViewUtil.HandCardSort)
|
||||||
|
--癞子(501)排第一,字牌风牌排最后,其他牌按 ViewUtil.HandCardSort 规则排序
|
||||||
-- 癞子(501)排第一,其他牌按 ViewUtil.HandCardSort 规则排序
|
|
||||||
if p.card_list and #p.card_list > 1 then
|
if p.card_list and #p.card_list > 1 then
|
||||||
table.sort(p.card_list, function(a, b)
|
-- 判断是否为字牌 (东南西北中发白)
|
||||||
local isLaiziA = (a == 501)
|
local function IsZiPai(cardId)
|
||||||
local isLaiziB = (b == 501)
|
-- 排除癞子
|
||||||
-- 1. 如果 A 是癞子,B 不是,A 排前面 (返回 true)
|
if cardId == 501 then return false end
|
||||||
if isLaiziA and not isLaiziB then
|
-- 根据实际项目ID定义判断字牌范围
|
||||||
return true
|
-- 常见定义:31 <= id <= 37
|
||||||
end
|
if cardId >= 401 and cardId <= 503 then
|
||||||
-- 2. 如果 A 不是癞子,B 是,A 排后面 (返回 false)
|
return true
|
||||||
if not isLaiziA and isLaiziB then
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
-- 3. 如果两者都是癞子,或都不是癞子,使用标准排序规则
|
table.sort(p.card_list, function(a, b)
|
||||||
-- 尝试获取比较结果
|
local isLaiziA = (a == 501)
|
||||||
local result = ViewUtil.HandCardSort(a, b)
|
local isLaiziB = (b == 501)
|
||||||
|
-- 1. 癞子永远排第一,如果 A 是癞子,B 不是,A 排前面 (返回 true)
|
||||||
|
if isLaiziA and not isLaiziB then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
-- 2. 如果 A 不是癞子,B 是,A 排后面 (返回 false)
|
||||||
|
if not isLaiziA and isLaiziB then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
local isZiA = IsZiPai(a)
|
||||||
|
local isZiB = IsZiPai(b)
|
||||||
|
|
||||||
-- 兼容处理:如果 ViewUtil.HandCardSort 返回的是数字 (-1, 0, 1)
|
-- 2. 处理字牌与数牌的相对位置
|
||||||
if type(result) == "number" then
|
if isZiA ~= isZiB then
|
||||||
return result < 0
|
-- 字牌在后
|
||||||
end
|
if true then
|
||||||
-- 如果返回的是布尔值,直接返回
|
-- A是字牌,B不是 -> A排后面 (返回 false)
|
||||||
return result
|
if isZiA then return false end
|
||||||
end)
|
-- A不是字牌,B是 -> A排前面 (返回 true)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 3. 如果两者都是癞子,或都不是癞子,使用标准排序规则
|
||||||
|
-- 尝试获取比较结果
|
||||||
|
local result = ViewUtil.HandCardSort(a, b)
|
||||||
|
|
||||||
|
-- 兼容处理:如果 ViewUtil.HandCardSort 返回的是数字 (-1, 0, 1)
|
||||||
|
if type(result) == "number" then
|
||||||
|
return result < 0
|
||||||
|
end
|
||||||
|
-- 如果返回的是布尔值,直接返回
|
||||||
|
return result
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -158,8 +182,8 @@ function M:OnEventSendCards(evt_data)
|
||||||
end
|
end
|
||||||
if _room.curren_round > 0 then _room.playing = true end
|
if _room.curren_round > 0 then _room.playing = true end
|
||||||
|
|
||||||
printlog("开始发牌===========>>>")
|
-- printlog("开始发牌===========>>>")
|
||||||
pt(evt_data)
|
-- pt(evt_data)
|
||||||
|
|
||||||
local room = DataManager.CurrenRoom
|
local room = DataManager.CurrenRoom
|
||||||
--printlog(evt_data.laiziCard)
|
--printlog(evt_data.laiziCard)
|
||||||
|
|
@ -186,12 +210,23 @@ function M:OnEventSendCards(evt_data)
|
||||||
p.card_list = handcards
|
p.card_list = handcards
|
||||||
self._room.self_player.hand_left_count = #handcards
|
self._room.self_player.hand_left_count = #handcards
|
||||||
--table.sort(handcards, ViewUtil.HandCardSort)
|
--table.sort(handcards, ViewUtil.HandCardSort)
|
||||||
-- 癞子(501)排第一,其他牌按 ViewUtil.HandCardSort 规则排序
|
--癞子(501)排第一,字牌风牌排最后,其他牌按 ViewUtil.HandCardSort 规则排序
|
||||||
if handcards and #handcards > 1 then
|
if handcards and #handcards > 1 then
|
||||||
|
-- 判断是否为字牌 (东南西北中发白)
|
||||||
|
local function IsZiPai(cardId)
|
||||||
|
-- 排除癞子
|
||||||
|
if cardId == 501 then return false end
|
||||||
|
-- 根据实际项目ID定义判断字牌范围
|
||||||
|
-- 常见定义:31 <= id <= 37
|
||||||
|
if cardId >= 401 and cardId <= 503 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
table.sort(handcards, function(a, b)
|
table.sort(handcards, function(a, b)
|
||||||
local isLaiziA = (a == 501)
|
local isLaiziA = (a == 501)
|
||||||
local isLaiziB = (b == 501)
|
local isLaiziB = (b == 501)
|
||||||
-- 1. 如果 A 是癞子,B 不是,A 排前面 (返回 true)
|
-- 1. 癞子永远排第一,如果 A 是癞子,B 不是,A 排前面 (返回 true)
|
||||||
if isLaiziA and not isLaiziB then
|
if isLaiziA and not isLaiziB then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
@ -199,6 +234,20 @@ function M:OnEventSendCards(evt_data)
|
||||||
if not isLaiziA and isLaiziB then
|
if not isLaiziA and isLaiziB then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
local isZiA = IsZiPai(a)
|
||||||
|
local isZiB = IsZiPai(b)
|
||||||
|
|
||||||
|
-- 2. 处理字牌与数牌的相对位置
|
||||||
|
if isZiA ~= isZiB then
|
||||||
|
-- 字牌在后
|
||||||
|
if true then
|
||||||
|
-- A是字牌,B不是 -> A排后面 (返回 false)
|
||||||
|
if isZiA then return false end
|
||||||
|
-- A不是字牌,B是 -> A排前面 (返回 true)
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- 3. 如果两者都是癞子,或都不是癞子,使用标准排序规则
|
-- 3. 如果两者都是癞子,或都不是癞子,使用标准排序规则
|
||||||
-- 尝试获取比较结果
|
-- 尝试获取比较结果
|
||||||
local result = ViewUtil.HandCardSort(a, b)
|
local result = ViewUtil.HandCardSort(a, b)
|
||||||
|
|
@ -218,8 +267,8 @@ end
|
||||||
function M:OnEventOutCard(evt_data)
|
function M:OnEventOutCard(evt_data)
|
||||||
local seat = evt_data["seat"]
|
local seat = evt_data["seat"]
|
||||||
local card = evt_data["card"]
|
local card = evt_data["card"]
|
||||||
printlog("OnEventOutCard----------------------------------------------")
|
-- printlog("OnEventOutCard----------------------------------------------")
|
||||||
pt(evt_data)
|
-- pt(evt_data)
|
||||||
local ting_list = nil
|
local ting_list = nil
|
||||||
local p = self._room:GetPlayerBySeat(seat)
|
local p = self._room:GetPlayerBySeat(seat)
|
||||||
self._cacheEvent:Enqueue(function()
|
self._cacheEvent:Enqueue(function()
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"objectStatus": {
|
||||||
|
"n14_10i2p": {
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
|
"n16_10i2p": {
|
||||||
|
"hidden": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,12 +3,18 @@
|
||||||
"n259_imp5": {
|
"n259_imp5": {
|
||||||
"collapsed": true
|
"collapsed": true
|
||||||
},
|
},
|
||||||
"n78_i7lq": {
|
"n294_ik9v": {
|
||||||
"hidden": true
|
"collapsed": true
|
||||||
},
|
},
|
||||||
"n251_ilon": {
|
"n251_ilon": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
},
|
},
|
||||||
|
"n78_i7lq": {
|
||||||
|
"hidden": true
|
||||||
|
},
|
||||||
|
"n176_mn85": {
|
||||||
|
"collapsed": true
|
||||||
|
},
|
||||||
"n290_ik9v": {
|
"n290_ik9v": {
|
||||||
"hidden": true
|
"hidden": true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,31 +8,35 @@
|
||||||
"ui://v0j9abjygq7m7m",
|
"ui://v0j9abjygq7m7m",
|
||||||
"ui://v0j9abjygq7mgx",
|
"ui://v0j9abjygq7mgx",
|
||||||
"ui://v0j9abjygq7m8f",
|
"ui://v0j9abjygq7m8f",
|
||||||
|
"ui://27vd145bhez87j20",
|
||||||
|
"ui://v0j9abjygq7med",
|
||||||
|
"ui://m7iejg4610snh5j",
|
||||||
|
"ui://m7iejg46e5q7hu2",
|
||||||
|
"ui://2d9xdj6zl0lzb",
|
||||||
|
"ui://2d9xdj6zomkm7cna",
|
||||||
|
"ui://2d9xdj6zxbqujn",
|
||||||
|
"ui://27vd145bst2l7ijp",
|
||||||
|
"ui://2d9xdj6znaupko",
|
||||||
|
"ui://27vd145bhez87j27",
|
||||||
"ui://v0j9abjygq7m8u"
|
"ui://v0j9abjygq7m8u"
|
||||||
],
|
],
|
||||||
"test.device": "iPhone XR",
|
"test.device": "iPhone XR",
|
||||||
"canvasColor": 10066329,
|
"canvasColor": 10066329,
|
||||||
"auxline2": true,
|
"auxline2": true,
|
||||||
"doc.activeDoc": "ui://v0j9abjygq7m8f",
|
"doc.activeDoc": "ui://2d9xdj6zl0lzb",
|
||||||
"libview.twoColumn": false,
|
"libview.twoColumn": false,
|
||||||
"libview.expandedNodes": [
|
"libview.expandedNodes": [
|
||||||
"l0ds4ys6",
|
|
||||||
"/",
|
|
||||||
"l0ds4ys6",
|
|
||||||
"/images/",
|
|
||||||
"l0ds4ys6",
|
|
||||||
"/images/chatMui/",
|
|
||||||
"27vd145b",
|
"27vd145b",
|
||||||
"/",
|
"/",
|
||||||
"27vd145b",
|
"27vd145b",
|
||||||
"/buttons/",
|
|
||||||
"27vd145b",
|
|
||||||
"/images/",
|
"/images/",
|
||||||
"27vd145b",
|
"27vd145b",
|
||||||
"/images/COMMui/",
|
"/images/COMMui/",
|
||||||
"v0j9abjy",
|
"v0j9abjy",
|
||||||
"/",
|
"/",
|
||||||
"v0j9abjy",
|
"v0j9abjy",
|
||||||
|
"/Main_style_2/",
|
||||||
|
"v0j9abjy",
|
||||||
"/buttons/",
|
"/buttons/",
|
||||||
"v0j9abjy",
|
"v0j9abjy",
|
||||||
"/image/",
|
"/image/",
|
||||||
|
|
@ -40,10 +44,18 @@
|
||||||
"/images/",
|
"/images/",
|
||||||
"v0j9abjy",
|
"v0j9abjy",
|
||||||
"/images/MMaJiangMui/",
|
"/images/MMaJiangMui/",
|
||||||
|
"v0j9abjy",
|
||||||
|
"/images/cards/",
|
||||||
|
"v0j9abjy",
|
||||||
|
"/images/cards/1/",
|
||||||
|
"v0j9abjy",
|
||||||
|
"/images/cards/2/",
|
||||||
"m7iejg46",
|
"m7iejg46",
|
||||||
"/",
|
"/",
|
||||||
"m7iejg46",
|
"m7iejg46",
|
||||||
"/NGMui/"
|
"/NGMui/",
|
||||||
|
"m7iejg46",
|
||||||
|
"/images/"
|
||||||
],
|
],
|
||||||
"auxline1": true,
|
"auxline1": true,
|
||||||
"snapToGrid": true,
|
"snapToGrid": true,
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,10 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="325,180" pivot="0.5,0.5" extention="Button">
|
<component size="325,180" pivot="0.5,0.5" extention="Button">
|
||||||
<controller name="button" pages="0,up,1,down" selected="1"/>
|
<controller name="button" pages="0,up,1,down" selected="0"/>
|
||||||
<displayList>
|
<displayList>
|
||||||
<graph id="n5_a1zf" name="n5" xy="0,0" size="325,180" type="rect" lineSize="3" lineColor="#ffffff00" fillColor="#fff5ffc0" corner="20">
|
<graph id="n5_a1zf" name="n5" xy="0,0" size="325,180" type="rect" lineSize="3" lineColor="#ffffff00" fillColor="#fff9ffd9" corner="20">
|
||||||
<gearColor controller="button" pages="1" values="#f5ffc0" default="#f9ffd9"/>
|
<gearColor controller="button" pages="1" values="#f5ffc0" default="#f9ffd9"/>
|
||||||
|
<relation target="" sidePair="width-width,height-height"/>
|
||||||
</graph>
|
</graph>
|
||||||
<loader id="n4_qmc1" name="icon" xy="0,0" size="325,180" url="ui://27vd145bhez87j28" align="center" vAlign="middle" fill="scale">
|
<loader id="n4_qmc1" name="icon" xy="0,0" size="325,180" url="ui://27vd145bhez87j28" align="center" vAlign="middle" fill="scale">
|
||||||
<relation target="" sidePair="width-width,height-height"/>
|
<relation target="" sidePair="width-width,height-height"/>
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,37 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="1500,930">
|
<component size="1342,917">
|
||||||
<controller name="cMissile" pages="0,,1," selected="1">
|
<controller name="cMissile" pages="0,,1," selected="1">
|
||||||
<remark page="1" value="开启互动栏"/>
|
<remark page="1" value="开启互动栏"/>
|
||||||
</controller>
|
</controller>
|
||||||
<displayList>
|
<displayList>
|
||||||
<component id="n14_10i2p" name="n14" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1500,930">
|
<image id="n17_q8fq" name="n17" src="khop7j65" fileName="images/COMMui/Frame 1259.png" xy="0,0" size="1342,917"/>
|
||||||
|
<image id="n19_q8fq" name="n19" src="q8fq7j6y" fileName="images/COMMui/Rectangle 2909(1).png" xy="35,178" size="1271,695"/>
|
||||||
|
<image id="n20_q8fq" name="n20" src="q8fq7j6w" fileName="images/COMMui/Frame 125811.png" xy="405,24" size="529,101"/>
|
||||||
|
<component id="n14_10i2p" name="n14" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1500,930" visible="false">
|
||||||
<Button title="个人信息"/>
|
<Button title="个人信息"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n15_10i2p" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" xy="1407,-14" size="107,107"/>
|
<component id="n15_10i2p" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" xy="1251,-51" size="151,158">
|
||||||
<graph id="n5_qmc1" name="n5" xy="197,225" size="306,306" scale="1.3,1.3" type="rect" lineSize="3" lineColor="#ffffffff" fillColor="#4cffffff" corner="20"/>
|
<Button icon="ui://27vd145bkhop7j64"/>
|
||||||
<loader id="n4_qmc1" name="loader_icon" xy="209,237" size="283,283" scale="1.3,1.3" align="center" vAlign="middle" fill="scaleFree"/>
|
</component>
|
||||||
<text id="n6_qmc1" name="tex_name" xy="617,364" size="829,104" font="Microsoft YaHei" fontSize="80" color="#444444" autoSize="none" text="#43633D"/>
|
<graph id="n5_qmc1" name="n5" xy="221,252" size="253,253" scale="1.3,1.3" type="rect" lineSize="3" lineColor="#ffffffff" fillColor="#4cffffff" corner="20"/>
|
||||||
<text id="n7_qmc1" name="tex_ip" xy="617,488" size="827,104" font="Microsoft YaHei" fontSize="80" color="#444444" autoSize="none" text="9A5F34"/>
|
<loader id="n4_qmc1" name="loader_icon" xy="221,252" size="253,253" scale="1.3,1.3" url="ui://27vd145bdqel7j5o" align="center" vAlign="middle" fill="scaleFree"/>
|
||||||
<text id="n8_qmc1" name="tex_id" xy="617,240" size="832,104" font="Microsoft YaHei" fontSize="80" color="#444444" autoSize="none" text="9A5F34"/>
|
<text id="n6_qmc1" name="tex_name" xy="584,364" size="706,104" font="ui://27vd145bik9v7imf" fontSize="62" color="#317038" vAlign="middle" autoSize="shrink" text="#43633D"/>
|
||||||
<graph id="n16_10i2p" name="n16" xy="43,682" pivot="0.5,0.5" size="1413,211" group="n13_fj6f" type="rect" lineSize="0" lineColor="#ffb8c7a5" fillColor="#ffb8c7a5" corner="30"/>
|
<text id="n7_qmc1" name="tex_ip" xy="584,488" size="704,104" font="ui://27vd145bik9v7imf" fontSize="62" color="#317038" vAlign="middle" autoSize="shrink" text="9A5F34"/>
|
||||||
<component id="n9_qmc1" name="btn_boom" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="62,697" group="n13_fj6f">
|
<text id="n8_qmc1" name="tex_id" xy="584,240" size="709,104" font="ui://27vd145bik9v7imf" fontSize="62" color="#317038" vAlign="middle" autoSize="shrink" text="9A5F34"/>
|
||||||
|
<graph id="n16_10i2p" name="n16" xy="43,682" pivot="0.5,0.5" size="1261,190" group="n13_fj6f" visible="false" type="rect" lineSize="0" lineColor="#ffb8c7a5" fillColor="#ffb8c7a5" corner="30"/>
|
||||||
|
<component id="n9_qmc1" name="btn_boom" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="148,695" size="173,159" group="n13_fj6f">
|
||||||
<Button icon="ui://27vd145bhez87j28"/>
|
<Button icon="ui://27vd145bhez87j28"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n10_qmc1" name="btn_egg" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="412,697" group="n13_fj6f">
|
<component id="n10_qmc1" name="btn_egg" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="438,696" size="173,159" group="n13_fj6f">
|
||||||
<Button icon="ui://27vd145bhez87j29"/>
|
<Button icon="ui://27vd145bhez87j29"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n11_qmc1" name="btn_ring" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="762,697" group="n13_fj6f">
|
<component id="n11_qmc1" name="btn_ring" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="737,696" size="173,159" group="n13_fj6f">
|
||||||
<Button icon="ui://27vd145bhez87j2a"/>
|
<Button icon="ui://27vd145bhez87j2a"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n12_qmc1" name="btn_flower" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="1112,697" group="n13_fj6f">
|
<component id="n12_qmc1" name="btn_flower" src="hez87j27" fileName="component/Component/btn_emoji.xml" xy="1041,696" size="173,159" group="n13_fj6f">
|
||||||
<Button icon="ui://27vd145bhez87j2b"/>
|
<Button icon="ui://27vd145bhez87j2b"/>
|
||||||
</component>
|
</component>
|
||||||
<group id="n13_fj6f" name="n13" xy="43,682" size="1413,211" advanced="true">
|
<group id="n13_fj6f" name="n13" xy="43,682" size="1261,190" advanced="true">
|
||||||
<gearDisplay controller="cMissile" pages="1"/>
|
<gearDisplay controller="cMissile" pages="1"/>
|
||||||
</group>
|
</group>
|
||||||
</displayList>
|
</displayList>
|
||||||
|
|
|
||||||
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 5.4 KiB |
|
After Width: | Height: | Size: 8.9 KiB |
|
|
@ -1107,7 +1107,7 @@
|
||||||
<component id="ik9v7ijw" name="Btn_HeadRound5x.xml" path="/buttons/" exported="true" favorite="true"/>
|
<component id="ik9v7ijw" name="Btn_HeadRound5x.xml" path="/buttons/" exported="true" favorite="true"/>
|
||||||
<image id="ik9v7ik0" name="btn_confirm1.png" path="/images/" exported="true"/>
|
<image id="ik9v7ik0" name="btn_confirm1.png" path="/images/" exported="true"/>
|
||||||
<font id="ik9v7imb" name="fontTitle.fnt" path="/font/fontTitle/" exported="true"/>
|
<font id="ik9v7imb" name="fontTitle.fnt" path="/font/fontTitle/" exported="true"/>
|
||||||
<image id="ik9v7imc" name="bg_window.png" path="/images/" scale="9grid" scale9grid="375,232,750,464"/>
|
<image id="ik9v7imc" name="bg_window.png" path="/images/" exported="true" scale="9grid" scale9grid="375,232,750,464"/>
|
||||||
<image id="ik9v7imd" name="bg_windowTitle.png" path="/images/"/>
|
<image id="ik9v7imd" name="bg_windowTitle.png" path="/images/"/>
|
||||||
<image id="ik9v7ime" name="btn_close.png" path="/images/" exported="true"/>
|
<image id="ik9v7ime" name="btn_close.png" path="/images/" exported="true"/>
|
||||||
<font id="ik9v7imf" name="AlimamaFangYuanTi-MediumRound.ttf" path="/font/" renderMode="" samplePointSize="16"/>
|
<font id="ik9v7imf" name="AlimamaFangYuanTi-MediumRound.ttf" path="/font/" renderMode="" samplePointSize="16"/>
|
||||||
|
|
@ -1631,6 +1631,9 @@
|
||||||
<image id="rdg67j6t" name="Frame 1350.png" path="/images/COMMui/" exported="true"/>
|
<image id="rdg67j6t" name="Frame 1350.png" path="/images/COMMui/" exported="true"/>
|
||||||
<image id="rdg67j6u" name="Frame 1336.png" path="/images/COMMui/" exported="true"/>
|
<image id="rdg67j6u" name="Frame 1336.png" path="/images/COMMui/" exported="true"/>
|
||||||
<image id="rdg67j6v" name="Rectangle 2989.png" path="/images/COMMui/" exported="true"/>
|
<image id="rdg67j6v" name="Rectangle 2989.png" path="/images/COMMui/" exported="true"/>
|
||||||
|
<image id="q8fq7j6w" name="Frame 125811.png" path="/images/COMMui/"/>
|
||||||
|
<image id="q8fq7j6x" name="Rectangle 2909.png" path="/images/COMMui/"/>
|
||||||
|
<image id="q8fq7j6y" name="Rectangle 2909(1).png" path="/images/COMMui/"/>
|
||||||
</resources>
|
</resources>
|
||||||
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
|
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
|
||||||
<atlas name="默认" index="0"/>
|
<atlas name="默认" index="0"/>
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
<component size="1500,930" designImageLayer="1">
|
<component size="1500,930" designImageLayer="1">
|
||||||
<controller name="bind" pages="0,,1," selected="0"/>
|
<controller name="bind" pages="0,,1," selected="0"/>
|
||||||
<displayList>
|
<displayList>
|
||||||
|
<image id="n78_q8fq" name="n78" src="ik9v7imc" fileName="images/bg_window.png" pkg="27vd145b" xy="0,0"/>
|
||||||
<component id="n69_hz87" name="n69" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="-5,2" size="1500,930" visible="false"/>
|
<component id="n69_hz87" name="n69" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="-5,2" size="1500,930" visible="false"/>
|
||||||
<component id="n33_lwcl" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="1369,-12" controller="style,0"/>
|
<component id="n33_lwcl" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="1369,-12" controller="style,0"/>
|
||||||
<component id="n23" name="slider_sound" src="l0lzo" fileName="component/setting/Slider1.xml" xy="225,298" size="470,54" group="n29" visible="false">
|
<component id="n23" name="slider_sound" src="l0lzo" fileName="component/setting/Slider1.xml" xy="225,298" size="470,54" group="n29" visible="false">
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
<controller name="nav" pages="0,,1," selected="0"/>
|
<controller name="nav" pages="0,,1," selected="0"/>
|
||||||
<controller name="load" pages="0,,1," selected="0"/>
|
<controller name="load" pages="0,,1," selected="0"/>
|
||||||
<displayList>
|
<displayList>
|
||||||
|
<image id="n29_q8fq" name="n29" src="ik9v7imc" fileName="images/bg_window.png" pkg="27vd145b" xy="0,0"/>
|
||||||
<component id="n28_hz87" name="n28" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="1500,930" visible="false">
|
<component id="n28_hz87" name="n28" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="1500,930" visible="false">
|
||||||
<Button title="个人信息"/>
|
<Button title="个人信息"/>
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@
|
||||||
<group id="n294_ik9v" name="buttom_choosePlay" xy="0,1003" size="2532,176" advanced="true">
|
<group id="n294_ik9v" name="buttom_choosePlay" xy="0,1003" size="2532,176" advanced="true">
|
||||||
<relation target="" sidePair="bottom-bottom"/>
|
<relation target="" sidePair="bottom-bottom"/>
|
||||||
</group>
|
</group>
|
||||||
<component id="n290_ik9v" name="btn_ReturnGame" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2401,187" visible="false">
|
<component id="n290_ik9v" name="btn_ReturnGame" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="2358,216" size="131,131" visible="false">
|
||||||
<Button icon="ui://m7iejg46wkf87iow"/>
|
<Button icon="ui://m7iejg46wkf87iow"/>
|
||||||
</component>
|
</component>
|
||||||
<image id="n258_imp5" name="n258" src="cv577ird" fileName="images/bg_groupMore.png" xy="2165,163" size="323,196" group="n259_imp5">
|
<image id="n258_imp5" name="n258" src="cv577ird" fileName="images/bg_groupMore.png" xy="2165,163" size="323,196" group="n259_imp5">
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 778 KiB After Width: | Height: | Size: 852 KiB |
|
Before Width: | Height: | Size: 2.6 MiB After Width: | Height: | Size: 2.4 MiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.3 MiB |
|
Before Width: | Height: | Size: 1.3 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 668 KiB After Width: | Height: | Size: 729 KiB |
|
Before Width: | Height: | Size: 328 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 2.6 MiB After Width: | Height: | Size: 2.4 MiB |
|
Before Width: | Height: | Size: 307 KiB After Width: | Height: | Size: 61 KiB |
|
After Width: | Height: | Size: 307 KiB |
|
|
@ -0,0 +1,92 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a1124707ae3e293428b31fbe4219d218
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: -1
|
||||||
|
wrapV: -1
|
||||||
|
wrapW: -1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1013 KiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.2 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.1 MiB |
|
Before Width: | Height: | Size: 951 KiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |