master
FPGA 2025-06-06 01:08:50 +08:00
parent 9438918fba
commit a453c2bccb
12 changed files with 124 additions and 94 deletions

View File

@ -89,6 +89,7 @@ function M:SelectedConfigData()
local daniao = _config:GetController('daniao').selectedIndex --多少起胡 0:6,1:10,2:15 local daniao = _config:GetController('daniao').selectedIndex --多少起胡 0:6,1:10,2:15
local fengding = _config:GetController('fengding').selectedIndex+1 --多少起胡 0:6,1:10,2:15
--名堂-- --名堂--
local tiandihu = _config:GetChild('btn_tiandihu').selected local tiandihu = _config:GetChild('btn_tiandihu').selected
local honghu = _config:GetChild('btn_honghu').selected local honghu = _config:GetChild('btn_honghu').selected
@ -128,7 +129,7 @@ function M:SelectedConfigData()
_data['haidiliao'] = haidihu --海底胡 _data['haidiliao'] = haidihu --海底胡
_data['kahu'] = kahu --卡胡 _data['kahu'] = kahu --卡胡
_data['mingwei'] = mingwei --明偎 _data['mingwei'] = mingwei --明偎
_data['fengding'] = fengding
@ -162,6 +163,7 @@ function M:LoadConfigData(data)
_config:GetController('choupai').selectedIndex = data.choupai --抽牌 _config:GetController('choupai').selectedIndex = data.choupai --抽牌
_config:GetController('hunum').selectedIndex = data.hunum --起胡息 _config:GetController('hunum').selectedIndex = data.hunum --起胡息
_config:GetController('daniao').selectedIndex = data.daniao --打鸟 0不打1:10,2:20,3:50 _config:GetController('daniao').selectedIndex = data.daniao --打鸟 0不打1:10,2:20,3:50
_config:GetController('fengding').selectedIndex = data.fengding-1
_config:GetChild('btn_tiandihu').selected = data.tiandihu --天地胡 _config:GetChild('btn_tiandihu').selected = data.tiandihu --天地胡
_config:GetChild('btn_honghu').selected = data.honghu --红胡 _config:GetChild('btn_honghu').selected = data.honghu --红胡
@ -173,6 +175,7 @@ function M:LoadConfigData(data)
_config:GetChild('btn_kahu').selected = data.kahu --卡胡 _config:GetChild('btn_kahu').selected = data.kahu --卡胡
_config:GetChild('btn_mingwei').selected = data.mingwei --明偎 _config:GetChild('btn_mingwei').selected = data.mingwei --明偎
if oldGameVersion==2 then if oldGameVersion==2 then
self.xipaiValueText.text=data.xi_pai_score/1000 self.xipaiValueText.text=data.xi_pai_score/1000
self.xipaiValue=data.xi_pai_score/1000 self.xipaiValue=data.xi_pai_score/1000

View File

@ -729,17 +729,25 @@ function M:__TipAction(context)
local td = data[2] local td = data[2]
local tip_hu = data[3] local tip_hu = data[3]
local list = tip.tip_map_type[td.weight] local list = tip.tip_map_type[td.weight]
printlog("tipaction :")
pt(list)
printlog(list[1]['bi_list']==nil)
if (#list > 1) or td.type == 1 then if (#list > 1) or td.type == 1 then
if list[1]['bi_list']==nil then local chiflag = true
for key, value in pairs(list) do
if value['bi_list'] ~=nil then
chiflag = false
end
end
if #list>1 then
chiflag = false
end
if chiflag then
_gamectr:SendAction(list[1]["id"]) _gamectr:SendAction(list[1]["id"])
self:__CloseTip() self:__CloseTip()
local info = self._player_card_info[1] local info = self._player_card_info[1]
info:UpdateIsOnClick(false) info:UpdateIsOnClick(false)
return return
end end
self:_ChiView( self:_ChiView(
list, list,
tip_hu, tip_hu,

View File

@ -1149,7 +1149,7 @@ local function init(self,cardInhand,index)
self.cardList = membe_clone(cardInhand) self.cardList = membe_clone(cardInhand)
table.sort(self.cardList) table.sort(self.cardList)
if index== nil or index ==0 then if index== nil or index ==0 then
return self:tryPendulumRule2() return self:tryPendulumRule()
elseif index == 1 then elseif index == 1 then
return self:tryPendulumRule() return self:tryPendulumRule()
elseif index == 2 then elseif index == 2 then

View File

@ -11,6 +11,7 @@
<controller name="xipai" pages="0,,1," selected="0"/> <controller name="xipai" pages="0,,1," selected="0"/>
<controller name="daniao" pages="0,,1,,2,,3," selected="0"/> <controller name="daniao" pages="0,,1,,2,,3," selected="0"/>
<controller name="xipaictr" pages="0,,1," selected="0"/> <controller name="xipaictr" pages="0,,1," selected="0"/>
<controller name="fengding" pages="0,,1,,2,,3," selected="0"/>
<displayList> <displayList>
<component id="n39_g92u" name="n39" src="99we5" fileName="component/create_room/di01.xml" xy="0,0" group="n5_mw5l" controller="type,0"> <component id="n39_g92u" name="n39" src="99we5" fileName="component/create_room/di01.xml" xy="0,0" group="n5_mw5l" controller="type,0">
<Button title="局数"/> <Button title="局数"/>
@ -60,83 +61,98 @@
<group id="n428_gtcb" name="n428" xy="0,183" size="907,60" advanced="true"> <group id="n428_gtcb" name="n428" xy="0,183" size="907,60" advanced="true">
<gearDisplay controller="renshu" pages="0"/> <gearDisplay controller="renshu" pages="0"/>
</group> </group>
<component id="n410_gtcb" name="n410" src="99we5" fileName="component/create_room/di01.xml" xy="0,302" size="163,126" group="n413_gtcb" controller="type,0"> <component id="n410_gtcb" name="n410" src="99we5" fileName="component/create_room/di01.xml" xy="0,366" size="163,126" group="n413_gtcb" controller="type,0">
<Button title="规则"/> <Button title="规则"/>
</component> </component>
<component id="n411_gtcb" name="btn_hunum15" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,305" size="227,116" group="n413_gtcb"> <component id="n411_gtcb" name="btn_hunum15" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,369" size="227,116" group="n413_gtcb">
<gearDisplay controller="shoupai" pages="0"/> <gearDisplay controller="shoupai" pages="0"/>
<Button checked="true" title="15胡起胡" controller="hunum" page="0"/> <Button checked="true" title="15胡起胡" controller="hunum" page="0"/>
</component> </component>
<component id="n412_gtcb" name="btn_hunum10" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="433,305" size="227,116" group="n413_gtcb"> <component id="n412_gtcb" name="btn_hunum10" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="433,369" size="227,116" group="n413_gtcb">
<gearDisplay controller="shoupai" pages="0"/> <gearDisplay controller="shoupai" pages="0"/>
<Button title="10胡起胡" controller="hunum" page="1"/> <Button title="10胡起胡" controller="hunum" page="1"/>
</component> </component>
<component id="n431_gtcb" name="btn_hunum6" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,305" size="227,116" group="n413_gtcb"> <component id="n431_gtcb" name="btn_hunum6" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,369" size="227,116" group="n413_gtcb">
<gearDisplay controller="shoupai" pages="1"/> <gearDisplay controller="shoupai" pages="1"/>
<Button title="6胡起胡" controller="hunum" page="2"/> <Button title="6胡起胡" controller="hunum" page="2"/>
</component> </component>
<group id="n413_gtcb" name="n413" xy="0,302" size="660,126" group="n440_gtcb" advanced="true"/> <group id="n413_gtcb" name="n413" xy="0,366" size="660,126" group="n440_gtcb" advanced="true"/>
<component id="n414_gtcb" name="n414" src="99we5" fileName="component/create_room/di01.xml" xy="0,357" size="143,128" group="n416_gtcb" controller="type,0"> <component id="n414_gtcb" name="n414" src="99we5" fileName="component/create_room/di01.xml" xy="0,421" size="143,128" group="n416_gtcb" controller="type,0">
<Button title="名堂"/> <Button title="名堂"/>
</component> </component>
<component id="n415_gtcb" name="btn_tiandihu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="186,365" size="171,120" group="n416_gtcb"> <component id="n415_gtcb" name="btn_tiandihu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="186,429" size="171,120" group="n416_gtcb">
<Button checked="true" title="天地胡"/> <Button checked="true" title="天地胡"/>
</component> </component>
<component id="n417_gtcb" name="btn_honghu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="433,365" size="171,120" group="n416_gtcb"> <component id="n417_gtcb" name="btn_honghu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="433,429" size="171,120" group="n416_gtcb">
<Button checked="true" title="红胡"/> <Button checked="true" title="红胡"/>
</component> </component>
<component id="n418_gtcb" name="btn_shisanhong" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="680,365" size="171,120" group="n416_gtcb"> <component id="n418_gtcb" name="btn_shisanhong" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="680,429" size="171,120" group="n416_gtcb">
<Button checked="true" title="十三红"/> <Button checked="true" title="十三红"/>
</component> </component>
<component id="n419_gtcb" name="btn_wuhu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="186,433" size="171,120" group="n416_gtcb"> <component id="n419_gtcb" name="btn_wuhu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="186,497" size="171,120" group="n416_gtcb">
<Button checked="true" title="乌胡"/> <Button checked="true" title="乌胡"/>
</component> </component>
<component id="n420_gtcb" name="btn_yidianhong" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="433,433" size="171,120" group="n416_gtcb"> <component id="n420_gtcb" name="btn_yidianhong" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="433,497" size="171,120" group="n416_gtcb">
<Button checked="true" title="一点红"/> <Button checked="true" title="一点红"/>
</component> </component>
<component id="n421_gtcb" name="btn_yikuaibian" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="680,433" size="171,120" group="n416_gtcb"> <component id="n421_gtcb" name="btn_yikuaibian" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="680,497" size="171,120" group="n416_gtcb">
<Button checked="true" title="一块扁"/> <Button checked="true" title="一块扁"/>
</component> </component>
<component id="n422_gtcb" name="btn_haidihu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="185,501" size="171,120" group="n416_gtcb"> <component id="n422_gtcb" name="btn_haidihu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="185,565" size="171,120" group="n416_gtcb">
<Button checked="true" title="海底胡"/> <Button checked="true" title="海底胡"/>
</component> </component>
<component id="n423_gtcb" name="btn_kahu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="433,501" size="171,120" group="n416_gtcb"> <component id="n423_gtcb" name="btn_kahu" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="433,565" size="171,120" group="n416_gtcb">
<Button checked="true" title="卡胡"/> <Button checked="true" title="卡胡"/>
</component> </component>
<component id="n424_gtcb" name="btn_mingwei" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="680,501" size="171,120" group="n416_gtcb"> <component id="n424_gtcb" name="btn_mingwei" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="680,565" size="171,120" group="n416_gtcb">
<Button checked="true" title="明偎"/> <Button checked="true" title="明偎"/>
</component> </component>
<group id="n416_gtcb" name="n416" xy="0,357" size="851,264" group="n440_gtcb" advanced="true"/> <group id="n416_gtcb" name="n416" xy="0,421" size="851,264" group="n440_gtcb" advanced="true"/>
<component id="n432_gtcb" name="xipai" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="185,574" size="169,47" group="n439_gtcb"> <component id="n432_gtcb" name="xipai" src="99we7" fileName="component/create_room/Btn_cr_checkbox2.xml" xy="185,638" size="169,47" group="n439_gtcb">
<Button checked="true" title="洗牌"/> <Button checked="true" title="洗牌"/>
</component> </component>
<text id="n433_gtcb" name="n433" xy="372,580" size="200,39" group="n437_gtcb" font="Microsoft YaHei" fontSize="28" color="#b53e19" bold="true" text="设置洗牌积分:"/> <text id="n433_gtcb" name="n433" xy="372,644" size="200,39" group="n437_gtcb" font="Microsoft YaHei" fontSize="28" color="#b53e19" bold="true" text="设置洗牌积分:"/>
<graph id="n434_gtcb" name="n434" xy="577,583" size="93,31" group="n437_gtcb" type="rect" fillColor="#99000000"/> <graph id="n434_gtcb" name="n434" xy="577,647" size="93,31" group="n437_gtcb" type="rect" fillColor="#99000000"/>
<text id="n435_gtcb" name="xipaifen" xy="578,578" size="94,42" group="n437_gtcb" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="1"/> <text id="n435_gtcb" name="xipaifen" xy="578,642" size="94,42" group="n437_gtcb" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="1"/>
<component id="n436_gtcb" name="sdsrbtn" src="99we9" fileName="component/create_room/Btn_Common_Info.xml" xy="682,577" size="109,49" group="n437_gtcb"/> <component id="n436_gtcb" name="sdsrbtn" src="99we9" fileName="component/create_room/Btn_Common_Info.xml" xy="682,641" size="109,49" group="n437_gtcb"/>
<group id="n437_gtcb" name="n437" xy="372,577" size="419,49" group="n439_gtcb" advanced="true"/> <group id="n437_gtcb" name="n437" xy="372,641" size="419,49" group="n439_gtcb" advanced="true"/>
<component id="n438_gtcb" name="n438" src="99we5" fileName="component/create_room/di01.xml" xy="0,573" group="n439_gtcb" controller="type,0"> <component id="n438_gtcb" name="n438" src="99we5" fileName="component/create_room/di01.xml" xy="0,637" group="n439_gtcb" controller="type,0">
<Button title="洗牌"/> <Button title="洗牌"/>
</component> </component>
<group id="n439_gtcb" name="n439" xy="0,573" size="791,60" group="n440_gtcb" advanced="true"/> <group id="n439_gtcb" name="n439" xy="0,637" size="791,60" group="n440_gtcb" advanced="true"/>
<group id="n440_gtcb" name="n440" xy="0,302" size="851,331" advanced="true"> <group id="n440_gtcb" name="n440" xy="0,366" size="851,331" advanced="true">
<gearXY controller="renshu" pages="0,1" values="0,302|0,176"/> <gearXY controller="renshu" pages="0,1" values="0,366|0,176"/>
</group> </group>
<component id="n441_dsxf" name="n441" src="99we5" fileName="component/create_room/di01.xml" xy="0,239" group="n445_dsxf" controller="type,0"> <component id="n441_dsxf" name="n441" src="99we5" fileName="component/create_room/di01.xml" xy="0,303" group="n445_dsxf" controller="type,0">
<Button title="打鸟"/> <Button title="打鸟"/>
</component> </component>
<component id="n442_dsxf" name="btn_noniao" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,242" group="n445_dsxf"> <component id="n442_dsxf" name="btn_noniao" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,306" group="n445_dsxf">
<Button checked="true" title="不打鸟" controller="daniao" page="0"/> <Button checked="true" title="不打鸟" controller="daniao" page="0"/>
</component> </component>
<component id="n443_dsxf" name="btn_niao10" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="358,245" group="n445_dsxf"> <component id="n443_dsxf" name="btn_niao10" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="358,309" group="n445_dsxf">
<Button title="10分" controller="daniao" page="1"/> <Button title="10分" controller="daniao" page="1"/>
</component> </component>
<component id="n444_dsxf" name="btn_niao20" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="535,245" group="n445_dsxf"> <component id="n444_dsxf" name="btn_niao20" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="535,309" group="n445_dsxf">
<Button title="20分" controller="daniao" page="2"/> <Button title="20分" controller="daniao" page="2"/>
</component> </component>
<component id="n446_dsxf" name="btn_niao50" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="712,244" group="n445_dsxf"> <component id="n446_dsxf" name="btn_niao50" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="712,308" group="n445_dsxf">
<Button title="50分" controller="daniao" page="3"/> <Button title="50分" controller="daniao" page="3"/>
</component> </component>
<group id="n445_dsxf" name="n445" xy="0,239" size="939,60" advanced="true"/> <group id="n445_dsxf" name="n445" xy="0,303" size="939,60" advanced="true"/>
<component id="n447_8fpn" name="n447" src="99we5" fileName="component/create_room/di01.xml" xy="0,243" group="n451_8fpn" controller="type,0">
<Button title="封顶"/>
</component>
<component id="n448_8fpn" name="btn_200xi" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="186,246" group="n451_8fpn">
<Button title="200息" controller="fengding" page="0"/>
</component>
<component id="n449_8fpn" name="btn_400xi" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="433,246" group="n451_8fpn">
<Button title="400息" controller="fengding" page="1"/>
</component>
<component id="n450_8fpn" name="btn_800xi" src="99we6" fileName="component/create_room/Btn_cr_checkbox.xml" xy="680,246" group="n451_8fpn">
<Button title="800息" controller="fengding" page="2"/>
</component>
<group id="n451_8fpn" name="n451" xy="0,243" size="907,60" advanced="true">
<gearDisplay controller="fengding" pages="0,1,2"/>
</group>
</displayList> </displayList>
</component> </component>

Binary file not shown.

View File

@ -14,10 +14,10 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_PixelRect: m_PixelRect:
serializedVersion: 2 serializedVersion: 2
x: 1.3333334 x: -44
y: 50 y: 64
width: 876.6667 width: 906
height: 860.6667 height: 854.6667
m_ShowMode: 4 m_ShowMode: 4
m_Title: m_Title:
m_RootView: {fileID: 4} m_RootView: {fileID: 4}
@ -34,24 +34,24 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
m_Name: ConsoleWindow m_Name: ProjectBrowser
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 387 y: 383
width: 877 width: 906
height: 424 height: 422
m_MinSize: {x: 101, y: 121} m_MinSize: {x: 230, y: 271}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 10000, y: 10021}
m_ActualView: {fileID: 9} m_ActualView: {fileID: 11}
m_Panes: m_Panes:
- {fileID: 9} - {fileID: 9}
- {fileID: 10} - {fileID: 10}
- {fileID: 11} - {fileID: 11}
m_Selected: 0 m_Selected: 2
m_LastSelected: 2 m_LastSelected: 0
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
@ -71,10 +71,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 877 width: 906
height: 811 height: 805
m_MinSize: {x: 201, y: 342} m_MinSize: {x: 230, y: 492}
m_MaxSize: {x: 4001, y: 8042} m_MaxSize: {x: 10000, y: 14042}
vertical: 1 vertical: 1
controlID: 35 controlID: 35
--- !u!114 &4 --- !u!114 &4
@ -97,8 +97,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 877 width: 906
height: 861 height: 855
m_MinSize: {x: 875, y: 300} m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &5 --- !u!114 &5
@ -118,7 +118,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 877 width: 906
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
@ -141,10 +141,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 877 width: 906
height: 811 height: 805
m_MinSize: {x: 201, y: 342} m_MinSize: {x: 230, y: 492}
m_MaxSize: {x: 4001, y: 8042} m_MaxSize: {x: 10000, y: 14042}
vertical: 0 vertical: 0
controlID: 34 controlID: 34
--- !u!114 &7 --- !u!114 &7
@ -163,8 +163,8 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 841 y: 835
width: 877 width: 906
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
@ -185,10 +185,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 877 width: 906
height: 387 height: 383
m_MinSize: {x: 201, y: 221} m_MinSize: {x: 200, y: 221}
m_MaxSize: {x: 4001, y: 4021} m_MaxSize: {x: 4000, y: 4021}
m_ActualView: {fileID: 12} m_ActualView: {fileID: 12}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 13}
@ -216,10 +216,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1.3333334 x: 48.666668
y: 467.33334 y: 473.33334
width: 876 width: 906
height: 403 height: 401
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
@ -297,10 +297,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 6 x: -44
y: 464.6667 y: 477.33334
width: 876 width: 906
height: 400 height: 401
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
@ -314,7 +314,8 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SkipHidden: 0 m_SkipHidden: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: [] m_Folders:
- Assets/ART/base/lobby/ui
m_ViewMode: 0 m_ViewMode: 0
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: [] m_LastFolders: []
@ -351,10 +352,10 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_AssetTreeState: m_AssetTreeState:
scrollPos: {x: 0, y: 1380} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000 m_ExpandedIDs: ffffffff00000000e82c0000ac360000f03b0000f23b0000f43b0000f63b0000f83b0000fa3b0000fc3b0000fe3b0000003c0000023c0000043c0000063c0000083c00000a3c00000c3c00000e3c0000103c0000123c0000143c0000163c0000183c00001a3c00001c3c00001e3c0000203c0000223c0000243c0000263c0000283c00002a3c00002c3c00002e3c0000303c0000323c0000343c0000363c0000383c00003a3c00003c3c00003e3c0000403c0000423c0000443c0000463c0000483c00004a3c00004c3c00004e3c0000503c0000523c0000543c0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
@ -431,10 +432,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1.3333334 x: -44
y: 80 y: 94
width: 876 width: 906
height: 366 height: 362
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SerializedViewNames: [] m_SerializedViewNames: []
m_SerializedViewValues: [] m_SerializedViewValues: []
@ -471,7 +472,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0 m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
@ -480,23 +481,23 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 21 y: 21
width: 876 width: 906
height: 345 height: 341
m_Scale: {x: 0.47916666, y: 0.47916666} m_Scale: {x: 0.47361112, y: 0.47361112}
m_Translation: {x: 438, y: 172.5} m_Translation: {x: 453, y: 170.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -914.087 x: -956.48096
y: -360 y: -360
width: 1828.174 width: 1912.9619
height: 720 height: 720
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 0.47916666 m_defaultScale: 0.47361112
m_LastWindowPixelSize: {x: 1314, y: 549} m_LastWindowPixelSize: {x: 1359, y: 543}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000001000000000000 m_LowResolutionForAspectRatios: 00000001000000000000

Binary file not shown.

View File

@ -1 +1 @@
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} {"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

View File

@ -1,2 +1,4 @@
Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines' Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
Cmd: initializeCompiler Cmd: initializeCompiler
Quitting shader compiler process