倍数补充、6字省略补充

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -99,8 +99,10 @@ function M:_evtNewMailTip(...)
     print("family event _evtNewMailTip")
 end
 
-function M:_evtOnNewApply()
+function M:_evtOnNewApply(...)
     print("_evtOnNewApply")
+    local arg = {...}
+    pt(arg)
     self._child_familyAuditNumber:InitList()
 end
 

lua_probject/base_project/Game/View/Family/FamilyInvitedMsgView.lua

@@ -17,11 +17,8 @@ function FamilyInvitedMsgView.new(blur_view, groupid, pid, invite_id, callback)
     self.pid = pid
     self.invite_id = invite_id
     self.callback = callback
-    print("lingmeng FGAssistInviteView1")
     UIPackage.AddPackage('base/newgroup/ui/FGAssist')
     self:initView("ui://FGAssist/panel_invited")
-    print("lingmeng FGAssistInviteView2")
-
     return self
 end
 
@@ -34,7 +31,8 @@ function M:initView(url)
     self._viewText_playName = self._view:GetChild('tex_play_name')
     self._viewText_playConfig = self._view:GetChild('text_play_config')
 
-    print("lingmeng FGAssistInviteView4")
+    self._viewText_groupName.emojies = EmojiDitc.EmojiesDitc
+    self._viewText_playName.emojies = EmojiDitc.EmojiesDitc
 
     self._view:GetChild('btn_no').onClick:Set(function()
         print("lingmeng btn_no")
@@ -67,15 +65,15 @@ function M:FillData()
     --print("lingmeng  FillData", self.groupid, self.pid, self.invite_id, type(self.invite_id), type(self.groupid),player)
     --pt(group.memberMap)
 
-    self._viewText_groupName.text = group.name
+    self._viewText_groupName.text = Utils.TextOmit(group.name, 6)
     self._viewText_gameName.text = play.game_name
     self._viewText_inviteName.text = player.nick
-    self._viewText_playName.text = play.name
+    self._viewText_playName.text = Utils.TextOmit(play.name, 6)
 
     local config = ExtendManager.GetExtendConfig(play.gameId)
     local mode = config:GetGameInfo()
     local gamePlay = mode:LoadConfigToDetail(play.config)
-    self._viewText_playConfig.text = gamePlay
+    self._viewText_playConfig.text = play.hp_times/1000 .. "倍," .. gamePlay
 end
 
 function M:Destroy()

lua_probject/base_project/Game/View/Family/FamilyJoinAndCreate.lua

@@ -28,21 +28,21 @@ function FamilyJoinAndCreate:init(root)
     self.input_name.emojies = EmojiDitc.EmojiesDitc
     self.input_wxId.emojies = EmojiDitc.EmojiesDitc
 
-    self._view:GetChild('btn_create').onClick:Add(function()
+    self._view:GetChild('btn_create').onClick:Set(function()
         if self.style.selectedIndex ~= 1 then
             self.style.selectedIndex = 1
             return
         end
     end)
 
-    self._view:GetChild('btn_join').onClick:Add(function()
+    self._view:GetChild('btn_join').onClick:Set(function()
         if self.style.selectedIndex ~= 0 then
             self.style.selectedIndex = 0
             return
         end
     end)
 
-    self._view:GetChild('btn_c').onClick:Add(function()
+    self._view:GetChild('btn_c').onClick:Set(function()
         fgCtr:FG_GroupList(function(res)
             fgCtr:FG_CreateGroup(self.input_name.text, 1, 2, function(res)
                 if res.ReturnCode == 0 then

lua_probject/base_project/Game/View/Family/PlayEditView.lua

@@ -75,7 +75,8 @@ function PlayEditView:Init()
         -- times倍数
         local times = json.decode(playList[index].hpData).times
         obj:GetChild('Label_details'):GetChild('title').text = times / 1000 .. "倍," .. mode:LoadConfigToDetail(playList[index].config)
-        obj:GetChild('text_playName').text = playList[index].name
+        obj:GetChild('text_playName').emojies = EmojiDitc.EmojiesDitc
+        obj:GetChild('text_playName').text = Utils.TextOmit(playList[index].name, 6)
         obj:GetController('type').selectedIndex = 1
         obj:GetChild('btn_del').onClick:Set(function()
             ViewUtil.ShowTwoChooose("是否要删除该玩法", function()

lua_probject/base_project/Game/View/FamilyView.lua

@@ -328,7 +328,7 @@ function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
         else
             list_familyNumber.itemRenderer = function(index, obj)
                 obj:GetChild('title').emojies = EmojiDitc.EmojiesDitc
-                obj:GetChild('title').text = members[index + 1].nick
+                obj:GetChild('title').text = Utils.TextOmit(members[index + 1].nick, 5)
                 obj:GetController('type').selectedIndex = members[index + 1].online and members[index + 1].online or 0
                 if members[index + 1].playing == "startPlaying" then
                     obj:GetController('type').selectedIndex = 2
@@ -395,7 +395,12 @@ function M:UpdateFamilyRoom(fgCtr, id)
             local config = ExtendManager.GetExtendConfig(gameId)
             local mode = config:GetGameInfo()
             local gamePlay = mode:LoadConfigToDetail(playGameInfoTable[roomList[newIndex].pid].config)
+            local times = json.decode(playList[newIndex].hpData).times
+            gamePlay = times / 1000 .. "倍," .. gamePlay
             obj:GetChild('Label_gameRule').title = gamePlay
+            local roomName = playGameInfoTable[roomList[newIndex].pid].name
+            roomName = Utils.TextOmit(roomName, 6)
+            obj:GetChild('game_type').emojies = EmojiDitc.EmojiesDitc
             obj:GetChild('game_type').text = string.format("（%s）%s", playGameInfoTable[roomList[newIndex].pid].gameName,
                 playGameInfoTable[roomList[newIndex].pid].name,
                 roomList[newIndex].id)

lua_probject/base_project/Game/View/LobbyView.lua

@@ -187,7 +187,8 @@ function M:InitView(url)
         lobbyHeadView:Show()
     end)
 
-    view:GetChild("tex_name").text = DataManager.SelfUser.nick_name
+    view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc
+    view:GetChild("tex_name").text = Utils.TextOmit(DataManager.SelfUser.nick_name, 6)
     view:GetChild("tex_id").text = tostring(DataManager.SelfUser.account_id)
 
     view:GetChild("btn_diamo").text = tostring(DataManager.SelfUser.diamo)

wb_new_ui/assets/Common/buttons/Btn_Common.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="262,82" extention="Button">
+<component size="262,82" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <text id="n2_ovii" name="title" xy="0,0" pivot="0.5,0.5" size="262,82" visible="false" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="5" autoSize="none" text="确定"/>
@@ -7,5 +7,5 @@
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.8"/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Common/window/Component/btn_close.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="122,122" extention="Button">
+<component size="122,122" pivot="0.5,0.5" extention="Button">
-  <Button/>
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver"/>
   <displayList>
-    <image id="n0_qmc1" src="qmc17jbr" name="n0" xy="0,0">
+    <image id="n0_qmc1" name="n0" src="qmc17jbr" fileName="images/CommonRes_3 4.png" xy="0,0">
-      <relation target="" sidePair="width,height"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Common/window/Component/btn_emoji.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="100,20" extention="Button">
+<component size="100,20" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <loader id="n4_qmc1" name="icon" xy="0,0" size="100,20" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/FGAssist/invite/panel_invited.xml

@@ -20,7 +20,7 @@
     <text id="n18_cioe" name="tex_game_name" xy="902,177" size="369,72" group="n24_p747" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" autoSize="shrink" singleLine="true" autoClearText="true" text="长沙麻将"/>
     <group id="n24_p747" name="gameName" xy="772,177" size="499,72"/>
     <text id="n14_cioe" name="n14" xy="666,251" size="238,72" group="n25_p747" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" text="包间名称:"/>
-    <text id="n16_cioe" name="tex_play_name" xy="902,251" size="369,72" group="n25_p747" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" autoSize="shrink" singleLine="true" autoClearText="true" text="233"/>
+    <richtext id="n16_cioe" name="tex_play_name" xy="902,251" size="369,72" group="n25_p747" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" vAlign="middle" autoSize="none" singleLine="true" autoClearText="true" text="233"/>
     <group id="n25_p747" name="roomName" xy="666,251" size="605,72"/>
     <text id="n9_cioe" name="n9" xy="138,251" size="185,72" group="n26_p747" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" text="邀请人:"/>
     <text id="n11_cioe" name="tex_name" xy="318,251" size="350,72" group="n26_p747" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" autoSize="shrink" singleLine="true" autoClearText="true" text="玩家名字"/>
@@ -29,10 +29,11 @@
     <group id="n13_cioe" name="n13" xy="98,39" size="260,89" group="n26_p747" visible="false" advanced="true"/>
     <group id="n26_p747" name="player" xy="98,39" size="570,284"/>
     <text id="n28_pbp6" name="n28" xy="138,177" size="185,72" group="n30_pbp6" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" text="亲友圈:"/>
-    <text id="n29_pbp6" name="tex_group_name" xy="318,177" size="453,72" group="n30_pbp6" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" autoSize="shrink" singleLine="true" autoClearText="true" text="长沙麻将"/>
+    <richtext id="n29_pbp6" name="tex_group_name" xy="318,177" size="453,72" group="n30_pbp6" font="ui://27vd145bh35o7ili" fontSize="54" color="#983431" autoSize="none" singleLine="true" autoClearText="true" text="长沙麻将"/>
     <group id="n30_pbp6" name="groupName" xy="138,177" size="633,72"/>
     <image id="n31_pbp6" name="n31" src="pbp6hon" fileName="invite/image/invited/Rectangle 257.png" xy="108,345" size="1092,246" group="n33_pbp6"/>
     <text id="n32_pbp6" name="text_play_config" xy="134,367" size="1038,199" group="n33_pbp6" font="ui://27vd145bh35o7il1" fontSize="42" color="#983431" autoSize="shrink" text="好多好多的玩法"/>
     <group id="n33_pbp6" name="playConfig" xy="108,345" size="1092,246"/>
+    <text id="n34_brmc" name="n34" xy="467,28" size="373,86" font="ui://27vd145bh35o7ili" fontSize="66" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="游戏邀请"/>
   </displayList>
 </component>

wb_new_ui/assets/Family/CreateAndJoin/Component/btn_create.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="333,96" extention="Button">
+<component size="333,96" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n3_86ct" name="n3" src="n74n7d1a" fileName="CreateAndJoin/Image/hall_club_createclub_btntext_chuangjian.png" xy="0,0" size="333,96">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button/>
+  <Button downEffect="scale" downEffectValue="1.1"/>
 </component>

wb_new_ui/assets/Family/GamePlay/Component/c_playChild.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="513,720">
-  <controller name="type" pages="0,type,1,game" selected="1"/>
+  <controller name="type" pages="0,type,1,game" selected="0"/>
   <displayList>
     <graph id="n0_86ct" name="n0" xy="0,0" size="513,720" group="n8_ayfr" type="rect" lineSize="0" fillColor="#ffa3673b" corner="24"/>
     <graph id="n5_86ct" name="n5" xy="18,157" size="480,450" group="n8_ayfr" type="rect" lineSize="0" lineColor="#ffffd184" fillColor="#ffffd184" corner="24"/>
@@ -12,7 +12,7 @@
     <component id="n2_86ct" name="btn_del" src="86ct7cv6" fileName="GamePlay/Component/btn_del.xml" xy="258,615" size="249,99" group="n8_ayfr"/>
     <component id="n3_86ct" name="btn_edit" src="86ct7cv5" fileName="GamePlay/Component/btn_edit.xml" xy="9,615" size="249,99" group="n8_ayfr"/>
     <component id="n4_86ct" name="Label_details" src="86ct7cv7" fileName="GamePlay/Component/Label_details.xml" xy="31,221" size="453,371" group="n8_ayfr"/>
-    <text id="n17_jydr" name="text_playName" xy="28,165" size="460,56" group="n8_ayfr" font="ui://27vd145bh35o7ilc" fontSize="42" align="center" vAlign="middle" autoSize="none" text="game那么"/>
+    <richtext id="n17_jydr" name="text_playName" xy="28,165" size="460,56" group="n8_ayfr" font="ui://27vd145bh35o7ilc" fontSize="42" align="center" vAlign="middle" autoSize="none" text="game那么"/>
     <group id="n8_ayfr" name="game" xy="0,0" size="513,720" advanced="true">
       <gearDisplay controller="type" pages="1"/>
     </group>

wb_new_ui/assets/Family/Main/Component/c_familyMember.xml

@@ -4,7 +4,7 @@
   <displayList>
     <graph id="n16_jrro" name="n16" xy="0,0" size="96,84" type="rect" lineSize="0" fillColor="#ffd9d9d9"/>
     <component id="n14_jrro" name="btn_head" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="0,0" size="96,84"/>
-    <richtext id="n17_jrro" name="title" xy="111,-3" size="208,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ad3c3a" autoSize="shrink" bold="true" text="超长的名字"/>
+    <richtext id="n17_jrro" name="title" xy="111,-3" size="216,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ad3c3a" vAlign="middle" autoSize="none" bold="true" text="五个字五个..."/>
     <image id="n18_jrro" name="n18" src="jrro7cyq" fileName="Main/Image/image_inGame.png" xy="114,48">
       <gearDisplay controller="type" pages="3"/>
     </image>

wb_new_ui/assets/Family/Main/Component/c_roomChild.xml

@@ -28,9 +28,9 @@
       <gearDisplay controller="num" pages="1,2"/>
     </component>
     <group id="n29_q2iu" name="n29" xy="12,51" size="186,111"/>
-    <text id="n2_in3i" name="game_type" xy="205,13" size="1075,64" group="n30_q2iu" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" autoSize="ellipsis" text="（抚州麻将）123123456">
+    <richtext id="n2_in3i" name="game_type" xy="205,13" size="1075,64" group="n30_q2iu" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" autoSize="none" text="（抚州麻将）123123456">
       <relation target="" sidePair="width-width"/>
-    </text>
+    </richtext>
     <text id="n3_in3i" name="n3" xy="244,71" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#474747" leading="0" autoSize="none" text="玩法：12316"/>
     <text id="n5_in3i" name="n5" xy="223,115" size="124,49" group="n30_q2iu" font="ui://27vd145bh35o7im7" fontSize="36" color="#474747" leading="0" text="已加入:"/>
     <component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,71" size="969,49" group="n30_q2iu">

wb_new_ui/assets/Lobby/Main_New.xml

@@ -7,9 +7,9 @@
     <image id="n190_ivty" name="n190" src="jrro7cya" fileName="component/Main/Image/bg.png" xy="0,0" size="2533,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n26" name="tex_name" xy="204,34" size="253,49" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" vAlign="middle" leading="0" autoSize="shrink" text="一共只有七个字">
+    <richtext id="n26" name="tex_name" xy="204,34" size="253,49" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="一共只有七个字">
       <relation target="n203_jrro" sidePair="left-right%,top-top"/>
-    </text>
+    </richtext>
     <text id="n84_mv8k" name="tex_id" xy="204,83" size="228,49" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" autoSize="shrink" text="ID:12345678">
       <relation target="n203_jrro" sidePair="right-right%,bottom-bottom"/>
     </text>

wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml

@@ -38,5 +38,12 @@
       <relation target="" sidePair="center-center,middle-middle"/>
       <Button icon="ui://27vd145bm0eibv" controller="page" page="0"/>
     </component>
+    <component id="n184_brmc" name="n184" src="brmc7i9o" fileName="mgr/SliderTimes.xml" xy="1134,511" size="1011,36">
+      <Slider value="10" max="100"/>
+    </component>
+    <text id="n185_brmc" name="n185" xy="903,499" size="206,59" font="ui://27vd145bh35o7il7" fontSize="44" color="#450f05" text="倍数设置: "/>
+    <image id="n186_brmc" name="n186" src="brmc7i9p" fileName="images/playEdit/queren_btn1.png" xy="1347,672" size="376,130"/>
+    <text id="n187_brmc" name="n187" xy="1139,429" size="30,59" font="ui://27vd145bh35o7ili" fontSize="44" color="#450f05" text="1"/>
+    <text id="n188_brmc" name="n188" xy="2110,429" size="55,59" font="ui://27vd145bh35o7ili" fontSize="44" color="#450f05" text="10"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/package.xml

@@ -831,6 +831,12 @@
     <image id="yk1o7i9g" name="hall_club_common_btntext_queding.png" path="/images/common/"/>
     <component id="yk1o7i9h" name="btn_numberRemarkConfirm.xml" path="/component/Btn/"/>
     <component id="yk1o7i9j" name="btn_numberRemarkQuit.xml" path="/component/Btn/"/>
+    <image id="brmc7i9k" name="image 26.png" path="/images/playEdit/"/>
+    <image id="brmc7i9l" name="Rectangle 299.png" path="/images/playEdit/" scale="9grid" scale9grid="19,11,13,3"/>
+    <image id="brmc7i9m" name="Rectangle 78.png" path="/images/playEdit/" scale="9grid" scale9grid="29,17,29,3"/>
+    <component id="brmc7i9n" name="SliderTimes_grip.xml" path="/mgr/"/>
+    <component id="brmc7i9o" name="SliderTimes.xml" path="/mgr/"/>
+    <image id="brmc7i9p" name="queren_btn1.png" path="/images/playEdit/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>