hengyang
/
hengyang_client
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并ui前提交

master
罗家炜 2025-08-28 16:26:26 +08:00
parent 5dbe82c654
commit 481dc0a1e5
14 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua_probject/base_project/Game/View/MainView.lua
View File

@ -713,11 +713,13 @@ function M:__RecordTouchEnd()
if self._record_time < 0.3 then
self:__SetRecordEnable()
end
self.__runwait_record = nil
self._ctr_voice.selectedIndex = 0
GameApplication.Instance.StopMusic = GameApplication.Instance.StopMusic - 1
self._chat_Talk.onTouchEnd:Remove(self.__RecordTouchEnd, self)
local room = self._room
if self._record_view_ctr.selectedIndex == 0 then
Voice.EndRecord(
room.room_id,
DataManager.SelfUser.account_id,
@ -727,6 +729,7 @@ function M:__RecordTouchEnd()
end
)
end
end
function M:__WaitRecord()
coroutine.wait(20)

3
lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
View File

@ -110,6 +110,9 @@ function M:Clear()
self._view_outCardList:RemoveChildren(0, -1, true)
self._view_FZList:RemoveChildren(0, -1, true)
self._view_getCard:RemoveChildren(0, -1, true)
if self._view:GetChild('List_HandCard2') then
self._view:GetChild('List_HandCard2'):RemoveChildren(0, -1, true)
end
self._view_handCardList.selectedIndex = -1
self._click_index = self._view_handCardList.selectedIndex

9
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_E.xml
View File

@ -6,14 +6,16 @@
<controller name="getCard" pages="0,,1," selected="0"/>
<displayList>
<list id="n57_j6yy" name="Btn_HandCard2" xy="2172,118" size="99,79" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjylj2n19b" autoItemSize="false" autoClearItems="true" scrollItemToViewOnClick="false">
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
</list>
<list id="n52_j6yy" name="List_FZ" xy="2257,404" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" vAlign="bottom" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/>
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
<item/>
</list>
<list id="n53_j6yy" name="List_OutCard" xy="1599,192" size="556,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" align="right" renderOrder="descent" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
<item/>
<item/>
@ -51,10 +53,11 @@
</list>
<list id="n54_j6yy" name="Btn_HandCard" xy="2191,192" size="63,117" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
</list>
<list id="n55_j6yy" name="List_HandCard" xy="2191,265" size="63,676" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
<relation target="" sidePair="width-width,height-height"/>
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
<item/>
<item/>
@ -70,7 +73,7 @@
<item/>
</list>
<list id="n56_j6yy" name="List_HandCard2" xy="2171,197" size="101,711" touchable="false" selectionMode="none" lineGap="-26" defaultItem="ui://v0j9abjylj2n19b" align="center" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
<relation target="" sidePair="width-width,height-height"/>
<relation target="" sidePair="width-width%,height-height%,right-right"/>
<item/>
<item/>
<item/>

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_N.xml
View File

@ -4,13 +4,14 @@
<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="0">
<remark page="0" value="2人"/>
<remark page="1" value="3人"/>
<remark page="2" value="4人"/>
</controller>
<displayList>
<list id="n37_gi99" name="List_HandCard" xy="687,31" size="1076,99" touchable="false" layout="row" selectionMode="none" colGap="-9" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,top-top"/>
<item/>
<item/>
<item/>
@ -26,14 +27,16 @@
<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"/>
<item/>
<item/>
<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="265,150" size="2097,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"/>
<item/>
<item/>
<item/>
@ -61,6 +64,7 @@
</list>
<list id="n43_nee3" name="Btn_HandCard" xy="565,31" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<relation target="" sidePair="width-width%,height-height%,top-top"/>
<item/>
</list>
<component id="n44_ogwn" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-2500,-1150" size="2022,111">

8
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
View File

@ -15,14 +15,14 @@
<displayList>
<graph id="n40_ckvb" name="area_allDown" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#00ffffff"/>
<list id="n33_gi99" name="List_FZ" xy="58,950" size="2468,214" touchable="false" layout="row" selectionMode="none" colGap="-4" defaultItem="ui://v0j9abjygi9910f" autoItemSize="false" vAlign="bottom" autoClearItems="true">
<relation target="" sidePair="bottom-bottom"/>
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
<item/>
<item/>
<item/>
</list>
<list id="n32_kxhm" name="List_HandCard" xy="37,975" size="2234,191" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
<relation target="" sidePair="bottom-bottom"/>
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
<item/>
<item/>
@ -40,7 +40,7 @@
<list id="n35_gi99" name="List_OutCard" xy="283,606" size="2097,312" pageController="ting" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" renderOrder="descent" autoClearItems="true">
<gearXY controller="cStie" pages="0,1,2" values="283,606|324,612|832,608"/>
<gearSize controller="cStie" pages="0,1,2" values="2097,312,1,1|1217,312,1,1|887,312,1,1"/>
<relation target="" sidePair="bottom-bottom"/>
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
<item/>
<item/>
@ -77,7 +77,7 @@
</list>
<list id="n38_shqd" name="Btn_HandCard" xy="2295,976" size="175,191" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
<gearDisplay controller="getCard" pages="1"/>
<relation target="" sidePair="bottom-bottom"/>
<relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
<item/>
</list>
<component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="184,657">

3
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_W.xml
View File

@ -5,7 +5,7 @@
<controller name="site" pages="0,2-1,1,2-2" selected="0"/>
<controller name="getCard" pages="0,,1," selected="0"/>
<displayList>
<list id="n52_j6yy" name="List_HandCard" xy="288,192" pivot="1,1" size="76,675" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910w" align="center" vAlign="bottom" autoClearItems="true">
<list id="n52_j6yy" name="List_HandCard" xy="263,192" pivot="1,1" size="76,675" touchable="false" selectionMode="none" lineGap="-69" defaultItem="ui://v0j9abjygi9910w" align="center" vAlign="bottom" autoClearItems="true">
<item/>
<item/>
<item/>
@ -26,6 +26,7 @@
<item/>
</list>
<list id="n54_j6yy" name="List_OutCard" xy="406,192" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-7" defaultItem="ui://v0j9abjywcy51g8" autoItemSize="true" autoClearItems="true">
<relation target="" sidePair="width-width%,height-height%,left-left"/>
<item/>
<item/>
<item/>

12
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
View File

@ -8,7 +8,7 @@
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<controller name="more" pages="0,,1," selected="0"/>
<controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="1"/>
<controller name="cHuCardEffect" pages="0,,1," selected="0">
<remark page="0" value="关"/>
<remark page="1" value="开"/>
@ -254,12 +254,6 @@
<component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
<relation target="" sidePair="right-right"/>
</component>
<graph id="n188_pbp6" name="n188" xy="0,0" size="2532,1170" group="n191_pbp6" type="rect" lineSize="0" fillColor="#73000000"/>
<image id="n189_pbp6" name="n189" pkg="v0j9abjy" src="pbp614k" fileName="Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
<text id="n190_pbp6" name="n190" xy="1024,667" size="484,79" group="n191_pbp6" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
<group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
<gearDisplay controller="voice" pages="1"/>
</group>
<component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="120,855" group="n59_v38k">
<gearDisplay controller="state" pages="3"/>
</component>
@ -286,5 +280,9 @@
<movieclip id="n203_whhc" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
<gearDisplay controller="cHuCardEffect" pages="1"/>
</movieclip>
<component id="n208_fwqx" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
<gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
</displayList>
</component>

24
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml
View File

@ -8,7 +8,7 @@
<controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
<controller name="more" pages="0,,1," selected="0"/>
<controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="1"/>
<controller name="cHuCardEffect" pages="0,,1," selected="0"/>
<displayList>
<component id="n205_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1200,366" size="435,73">
@ -54,18 +54,18 @@
<gearDisplay controller="state" pages="1,3"/>
<gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
</component>
<component id="n220_ogwn" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="743,-1170" size="1329,102" group="n224_ogwn" scale="1.5,1.5"/>
<component id="n221_ogwn" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="3,-885" group="n224_ogwn"/>
<component id="n222_ogwn" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2485,-382" size="110,75" group="n224_ogwn" scale="2,2">
<component id="n220_ogwn" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="741,-1172" size="1329,102" group="n224_ogwn" scale="1.5,1.5"/>
<component id="n221_ogwn" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="1,-887" group="n224_ogwn"/>
<component id="n222_ogwn" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2483,-384" size="110,75" group="n224_ogwn" scale="2,2">
<gearDisplay controller="state" pages="1,2"/>
</component>
<component id="n223_ogwn" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="265,-887" group="n224_ogwn">
<component id="n223_ogwn" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="263,-889" group="n224_ogwn">
<gearDisplay controller="state" pages="0,3"/>
</component>
<group id="n224_ogwn" name="n224" xy="3,-1170" size="2592,863" advanced="true">
<group id="n224_ogwn" name="n224" xy="1,-1172" size="2592,863" advanced="true">
<relation target="" sidePair="center-center,top-top"/>
</group>
<component id="n225_ogwn" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="2535,-344" visible="false" touchable="false">
<component id="n225_ogwn" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="2533,-344" visible="false" touchable="false">
<gearDisplay controller="state" pages="0,1,2"/>
<relation target="n224_ogwn" sidePair="right-right"/>
</component>
@ -257,12 +257,6 @@
<component id="n281_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
<relation target="" sidePair="right-right"/>
</component>
<graph id="n282_ogwn" name="n282" xy="0,0" size="2532,1170" group="n285_ogwn" type="rect" lineSize="0" fillColor="#73000000"/>
<image id="n283_ogwn" name="n283" xy="1203,522" size="100,100" group="n285_ogwn"/>
<text id="n284_ogwn" name="n284" xy="1024,667" size="484,79" group="n285_ogwn" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
<group id="n285_ogwn" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
<gearDisplay controller="voice" pages="1"/>
</group>
<component id="n286_ogwn" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,847" group="n288_ogwn">
<gearDisplay controller="state" pages="3"/>
</component>
@ -289,5 +283,9 @@
<movieclip id="n293_ogwn" name="effect_ZiMo" src="whhc1fo" fileName="Main_new/Main/Effect_ZiMo.jta" xy="1266,-574" pivot="0.5,0.5" anchor="true">
<gearDisplay controller="cHuCardEffect" pages="1"/>
</movieclip>
<component id="n295_fwqx" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
<gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
</displayList>
</component>

11
wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml
View File

@ -9,7 +9,6 @@
<controller name="more" pages="0,,1," selected="0"/>
<controller name="witness" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/>
<controller name="voice" pages="0,,1," selected="0"/>
<controller name="cHuCardEffect" pages="0,,1," selected="0"/>
<displayList>
<component id="n213_hyws" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" size="435,73">
@ -259,12 +258,6 @@
<component id="n353_ogwn" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,523" size="144,123">
<relation target="" sidePair="right-right"/>
</component>
<graph id="n354_ogwn" name="n354" xy="0,0" size="2532,1170" group="n357_ogwn" type="rect" lineSize="0" fillColor="#73000000"/>
<image id="n355_ogwn" name="n355" xy="1203,522" size="100,100" group="n357_ogwn"/>
<text id="n356_ogwn" name="n356" xy="1024,667" size="484,79" group="n357_ogwn" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
<group id="n357_ogwn" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
<gearDisplay controller="voice" pages="1"/>
</group>
<component id="n358_ogwn" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="0,847" group="n360_ogwn">
<gearDisplay controller="state" pages="3"/>
</component>
@ -302,5 +295,9 @@
<group id="n370_ogwn" name="n370" xy="-143,-1398" size="2592,863" advanced="true">
<relation target="" sidePair="center-center,top-top"/>
</group>
<component id="n372_fwqx" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,0">
<gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
</displayList>
</component>

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 3.6 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 MiB

After

Width:  |  Height:  |  Size: 4.6 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.