出牌箭头提示,位置校准,全部显示。两人显示正常
|
|
@ -269,8 +269,13 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
|
||||||
local outcard = self._view_outCardList:AddItemFromPool()
|
local outcard = self._view_outCardList:AddItemFromPool()
|
||||||
self:fillCard2(outcard, outCardName, outlist[i + 1])
|
self:fillCard2(outcard, outCardName, outlist[i + 1])
|
||||||
if cursor and i == #outlist - 1 then
|
if cursor and i == #outlist - 1 then
|
||||||
outcard:AddChild(cursor)
|
Timer.New(function()
|
||||||
cursor:Center()
|
self._view:AddChild(cursor)
|
||||||
|
-- GRoot.inst:AddChild(cursor)
|
||||||
|
cursor.xy = self._view_outCardList.xy +
|
||||||
|
self._view_outCardList:GlobalToLocal(outcard:LocalToGlobal(Vector2.New(outcard.width * 0.5,
|
||||||
|
outcard.height * 0.5)))
|
||||||
|
end, Time.deltaTime, 1, false):Start()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="117,117" pivot="0.5,0.5">
|
<component size="117,117" pivot="0.5,0.5" overflow="hidden">
|
||||||
<controller name="jing" pages="0,,1," selected="0"/>
|
<controller name="jing" pages="0,,1," selected="0"/>
|
||||||
<displayList>
|
<displayList>
|
||||||
<loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,0" url="ui://Main_Majiang/b202_101" fill="scale">
|
<loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,0" url="ui://Main_Majiang/b202_101" fill="scale">
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,9 @@
|
||||||
<controller name="3d" pages="0,,1," selected="0"/>
|
<controller name="3d" pages="0,,1," selected="0"/>
|
||||||
<controller name="ting" 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="site" pages="0,2-1,1,2-2" selected="0"/>
|
||||||
<controller name="getCard" pages="0,,1," selected="1"/>
|
<controller name="getCard" pages="0,,1," selected="0"/>
|
||||||
<controller name="seletedGetCard" pages="0,,1," selected="0"/>
|
<controller name="seletedGetCard" pages="0,,1," selected="0"/>
|
||||||
<controller name="tip" pages="0,,1," selected="1"/>
|
<controller name="tip" pages="0,,1," selected="0"/>
|
||||||
<controller name="showGuoHu" pages="0,,1," selected="0"/>
|
<controller name="showGuoHu" pages="0,,1," selected="0"/>
|
||||||
<displayList>
|
<displayList>
|
||||||
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
|
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
|
||||||
|
|
@ -46,7 +46,7 @@
|
||||||
<item/>
|
<item/>
|
||||||
<item/>
|
<item/>
|
||||||
</list>
|
</list>
|
||||||
<list id="n35_gi99" name="List_OutCard" xy="304,-555" pivot="0.5,0.5" size="2079,502" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
|
<list id="n35_gi99" name="List_OutCard" xy="304,-555" pivot="0.5,0.5" size="2079,502" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" margin="0,40,0,0" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
|
||||||
<item/>
|
<item/>
|
||||||
<item/>
|
<item/>
|
||||||
<item/>
|
<item/>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
<controller name="3d" pages="0,,1," selected="0"/>
|
<controller name="3d" pages="0,,1," selected="0"/>
|
||||||
<controller name="ting" 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="site" pages="0,2-1,1,2-2" selected="0"/>
|
||||||
<controller name="getCard" pages="0,,1," selected="1"/>
|
<controller name="getCard" pages="0,,1," selected="0"/>
|
||||||
<displayList>
|
<displayList>
|
||||||
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
|
<component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
|
||||||
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
|
<gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
<item/>
|
<item/>
|
||||||
<item/>
|
<item/>
|
||||||
</list>
|
</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">
|
<list id="n41_gi99" name="List_OutCard" xy="-84,133" pivot="0.5,0.5" size="2079,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" margin="40,0,0,0" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
|
||||||
<item/>
|
<item/>
|
||||||
<item/>
|
<item/>
|
||||||
<item/>
|
<item/>
|
||||||
|
|
|
||||||
|
|
@ -243,7 +243,7 @@
|
||||||
</component>
|
</component>
|
||||||
<component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,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"/>
|
<gearDisplay controller="witness" pages="1"/>
|
||||||
<gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
|
<gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123">
|
<component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123">
|
||||||
<relation target="" sidePair="right-right"/>
|
<relation target="" sidePair="right-right"/>
|
||||||
|
|
@ -254,12 +254,12 @@
|
||||||
<group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
|
<group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
|
||||||
<gearDisplay controller="voice" pages="1"/>
|
<gearDisplay controller="voice" pages="1"/>
|
||||||
</group>
|
</group>
|
||||||
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,848" group="n59_v38k">
|
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,847" group="n59_v38k">
|
||||||
<gearDisplay controller="state" pages="3"/>
|
<gearDisplay controller="state" pages="3"/>
|
||||||
</component>
|
</component>
|
||||||
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1140,904" group="n59_v38k">
|
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1140,903" group="n59_v38k">
|
||||||
<relation target="" sidePair="center-center"/>
|
<relation target="" sidePair="center-center"/>
|
||||||
</component>
|
</component>
|
||||||
<group id="n59_v38k" name="huifang" xy="0,848" size="2532,165"/>
|
<group id="n59_v38k" name="huifang" xy="0,847" size="2532,165"/>
|
||||||
</displayList>
|
</displayList>
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<component size="1,1">
|
<component size="1,1" pivot="0.5,0.5">
|
||||||
<displayList>
|
<displayList>
|
||||||
<image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-27,-150" scale="1.5,1.5"/>
|
<image id="n0" name="n0" src="f8c31ek" fileName="images/img_card_arrow.png" xy="-25,-66" size="51,67" aspect="true"/>
|
||||||
</displayList>
|
</displayList>
|
||||||
<transition name="t0" autoPlay="true" autoPlayRepeat="-1">
|
<transition name="t0" autoPlay="true" autoPlayRepeat="-1">
|
||||||
<item time="0" type="Icon" target="n0" value=""/>
|
<item time="0" type="Icon" target="n0" value=""/>
|
||||||
<item time="0" type="XY" target="n0" tween="true" startValue="-27,-110" endValue="-27,-83" duration="12" ease="Linear"/>
|
<item time="0" type="XY" target="n0" tween="true" startValue="-,-108" endValue="-,-81" duration="12" ease="Linear"/>
|
||||||
<item time="12" type="XY" target="n0" tween="true" startValue="-27,-83" endValue="-27,-110" duration="12" ease="Linear"/>
|
<item time="12" type="XY" target="n0" tween="true" startValue="-,-81" endValue="-,-108" duration="12" ease="Linear"/>
|
||||||
<item time="24" type="XY" target="n0" value="-27,-110"/>
|
|
||||||
</transition>
|
</transition>
|
||||||
</component>
|
</component>
|
||||||
|
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 1.5 MiB |
|
Before Width: | Height: | Size: 4.5 MiB After Width: | Height: | Size: 4.3 MiB |
|
Before Width: | Height: | Size: 3.4 MiB After Width: | Height: | Size: 3.9 MiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 2.0 MiB |
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 875 KiB |
|
After Width: | Height: | Size: 1.2 MiB |
|
|
@ -0,0 +1,92 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3ad3937da18bb154e8135801fe276a86
|
||||||
|
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:
|
||||||