邀请提交

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -72,6 +72,10 @@ function M:AddEventListener(evt_name, func)
     self._dispatcher[evt_name] = func
 end
 
+function M:RemoveEventListener(evt_name)
+    self._dispatcher[evt_name] = nil
+end
+
 ----------------------请求------------------------------------
 function M:connect(host, groupId, callback)
     self.host = host

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1565,6 +1565,7 @@ function M:FG_UpdatePlay(group_id, game_id, config_data, name, hpData, hpOnOff,
     _data.pid = pid
     _data.gtype = gtype
     _data.deskId = deskId
+    _data.hp_times = hp_times
     _client:send(Protocol.WEB_FG_UPDATE_PLAY, _data, function(res)
         callback(res)
     end)

lua_probject/base_project/Game/View/FGAssistView.lua

@@ -47,6 +47,9 @@ function M:init(url)
 
     self._timer = 0
     UpdateBeat:Add(self.OnUpdate, self)
+
+    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+    mgr_ctr:AddEventListener(GroupMgrEvent.OnMemberState, handler(self, self.ReFalsh))
 end
 
 function M:FillData()
@@ -58,6 +61,31 @@ function M:FillData()
     -- end
 end
 
+function M:ReFalsh(...)
+
+    local arg = { ... }
+    local group = DataManager.groups:get(self.group_id)
+
+    for _, player in pairs(arg[1].offlineUserId) do
+        local player = group.memberMap[player]
+
+        if player then
+           player.online = 0 
+        end
+    end
+
+    for _, player in pairs(arg[1].onlineUserId) do
+        local player = group.memberMap[player]
+
+        if player then
+           player.online = 1
+        end
+    end
+
+    self._data_number = group.members
+    self.lst_player.numItems = #group.members
+end
+
 function M:PlayerRenderer(index, obj)
     local i = index + 1
     obj:GetChild('tex_name').text = self._data_number[i].nick
@@ -65,6 +93,8 @@ function M:PlayerRenderer(index, obj)
     btn_invite:GetController('online').selectedIndex = self._data_number[i].uid ==
         DataManager.SelfUser.account_id and 0 or self._data_number[i].online
     obj:GetController('type').selectedIndex = self._data_number[i].online
+    local loader = obj:GetChild("btn_head"):GetChild("icon")
+    ImageLoad.Load(self._data_number[i].portrait, loader)
     btn_invite.onClick:Set(function()
         local mgr_ctr = ControllerManager.GetController(GroupMgrController)
         local room = DataManager.CurrenRoom
@@ -219,6 +249,9 @@ function M:OnUpdate()
 end
 
 function M:Close()
+    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+    mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState)
+
     BaseWindow.Close(self)
     if self.callback then
         self.callback()

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

@@ -25,6 +25,7 @@ function FamilyEventView.new(root)
     mgr_ctr:AddEventListener(GroupMgrEvent.ChatRoomData, handler(self, self._evtChatRoomData))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnNewApply, handler(self, self._evtOnNewApply))
     mgr_ctr:AddEventListener(GroupMgrEvent.OnNewRecord, handler(self, self._evtOnNewRecord))
+    --mgr_ctr:AddEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState))
     return self
 end
 
@@ -152,8 +153,25 @@ function M:_evtOnNewRecord(...)
     if view.class ~= "FamilyMainView" then
         return
     end
-    local arg = { ... } 
+    local arg = { ... }
     view.com_FamilyChatRoom:OnNewChatRefalsh(arg[1])
 end
 
+function M:_evtOnMemberState(...)
+    local view = ViewManager.GetCurrenView()
+    if view.class ~= "FamilyMainView" then
+        return
+    end
+    local arg = { ... }
+    local group = DataManager.groups:get(view._group.id)
+
+    for _, player in pairs(arg[1].offlineUserId) do
+        group.memberMap[player].online = 0
+    end
+
+    for _, player in pairs(arg[1].onlineUserId) do
+        group.memberMap[player].online = 0
+    end
+end
+
 return M

lua_probject/base_project/Game/View/MainView.lua

@@ -5,6 +5,7 @@ local DismissRoomWindow = import('.DismissRoomWindow')
 local SettingView = import('.SettingView')
 local PlayerDistanceView = import('.PlayerDistanceView')
 local FGAssistView = import('.FGAssistView')
+local MissileSender = import(".MissileSender")
 
 local function GetSeat(data, uId)
     for _, player in pairs(data.player_list) do
@@ -1151,13 +1152,11 @@ function M:SetLanguage(language)
     end
 end
 
-function M:Missile(seat, targetSeat, missile)
+function M:Missile(seat, targetSeat, url, animUrl)
     local send = self._player_info[self:GetPos(seat)]
     local target = self._player_info[self:GetPos(targetSeat)]
 
-    local obj = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Missile")
+    MissileSender.Send(url, send._view, target._view, self._view, animUrl, 5, 1)
-    obj.xy = send.xy
-    obj:TweenMove(target.xy, 1.5)
 end
 
 -- 获取消息使用的语言、序号

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -669,7 +669,9 @@ function M:FillFagData_jiangxi()
         gfiv:Show()
     end)
     --体力值倍数
-    local tex_times = panel_play_set:GetChild("tex_times")
+    --local tex_times = panel_play_set:GetChild("tex_times")
+    local tex_times = self._view:GetChild("tex_times")
+    --[[
     if game_id ~= 41 then
         tex_times.text = hpData and d2ad(hpData.times) or 1
         local btn_times_input = panel_play_set:GetChild("btn_times_input")
@@ -679,6 +681,7 @@ function M:FillFagData_jiangxi()
     else
         tex_times.text = 1
     end
+    ]]
 
     local btn_sub = panel_play_set:GetChild("btn_sub")
     btn_sub.onClick:Set(function()

lua_probject/extend_project/extend/majiang/jinxi/EXSettingView.lua

@@ -13,8 +13,10 @@ function EXSettingView:Show(room)
 
     if roomOwner == DataManager.SelfUser.account_id then
         self.cBtn.selectedIndex = 1
+        self.btn_closeRoom_cStyle = 1
     else
         self.cBtn.selectedIndex = 0
+        self.btn_closeRoom_cStyle = 0
     end
 
     BaseWindow.Show(self)
@@ -37,6 +39,8 @@ function M:init(url)
     local slider_music = view:GetChild('slider_vedio_music')
     local btn_music = view:GetChild('btn_vedio_music')
     local btn_sound = view:GetChild('btn_vedio_sound')
+    local btn_closeRoom = view:GetChild("btn_closeRoom")
+    self.btn_closeRoom_cStyle = btn_closeRoom:GetController("cStyle")
 
     self.cBtn = self._view:GetController('cBtn')
 
@@ -74,7 +78,7 @@ function M:init(url)
         end
     end)
 
-    self._view:GetChild("btn_closeRoom").onClick:Set(function()
+    btn_closeRoom.onClick:Set(function()
         local _gamectr = ControllerManager.GetController(GameController)
         _gamectr:LevelRoom(function(res)
             print("退出房间")

wb_new_ui/assets/Common/package.xml

@@ -2093,10 +2093,10 @@
     <component id="qmc17jbs" name="btn_close.xml" path="/window/Component/"/>
     <image id="qmc17jbt" name="Rectangle 298.png" path="/images/" scale="9grid" scale9grid="38,38,103,66"/>
     <component id="qmc17jbu" name="btn_emoji.xml" path="/window/Component/"/>
-    <image id="qmc17jbv" name="default3.png" path="/images/Emojies2/" disableTrim="true"/>
+    <image id="qmc17jbv" name="diamo.png" path="/images/Emojies2/" exported="true" disableTrim="true"/>
-    <image id="qmc17jbw" name="default4.png" path="/images/Emojies2/" disableTrim="true"/>
+    <image id="qmc17jbw" name="flower.png" path="/images/Emojies2/" exported="true" disableTrim="true"/>
-    <image id="qmc17jbx" name="default.png" path="/images/Emojies2/" disableTrim="true"/>
+    <image id="qmc17jbx" name="boom.png" path="/images/Emojies2/" exported="true" disableTrim="true"/>
-    <image id="qmc17jby" name="default2.png" path="/images/Emojies2/" disableTrim="true"/>
+    <image id="qmc17jby" name="egg.png" path="/images/Emojies2/" exported="true" disableTrim="true"/>
     <image id="qmc17jbz" name="loginBg.png" path="/bg/" exported="true" atlas="alone"/>
     <movieclip id="uans7jc0" name="MovieClip3.jta" path="/window/Component/"/>
   </resources>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_invite.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="360,129" extention="Button">
+<component size="360,129" 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_pkx5" name="n3" src="u63319z" fileName="Main_new/Main/Image/inivite_friend.png" xy="0,0" size="360,129">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.8"/>
+  <Button downEffect="scale" downEffectValue="0.9"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_ready.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="360,129" extention="Button">
+<component size="360,129" 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_pkx5" name="n3" src="u6331a0" fileName="Main_new/Main/Image/Paizhuo_ziz_btn_zb_normal.png" xy="0,0" size="360,129">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.8"/>
+  <Button downEffect="scale" downEffectValue="0.9"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml

@@ -6,9 +6,9 @@
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
-  <controller name="three_win" pages="0,,1," selected="0"/>
+  <controller name="three_win" pages="0,,1," selected="1"/>
   <controller name="ting" pages="0,,1," selected="0"/>
-  <controller name="text_color" pages="0,,1," selected="0"/>
+  <controller name="text_color" pages="0,,1," selected="1"/>
   <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
   <controller name="cScore" pages="0,,1," selected="0"/>
   <displayList>
@@ -58,7 +58,7 @@
       <gearDisplay controller="ting" pages="1"/>
     </component>
     <text id="n44_rfcn" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="0">
-      <gearColor controller="text_color" pages="0,1" values="#ffff99,#000000|#ff0000,#000000"/>
+      <gearColor controller="text_color" pages="0,1" values="#ffff99,#000000|#ffff99,#000000"/>
     </text>
     <group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
       <gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -124,23 +124,23 @@
     <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
       <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,796" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,274" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,82" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,82|1740,46|1752,62" default="1192,928"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1449,6 +1449,11 @@
     <image id="uans1bc" name="nscore7.png" path="/images/score/" exported="true"/>
     <image id="uans1bd" name="nscore8.png" path="/images/score/" exported="true"/>
     <component id="uans1be" name="Missile.xml" path="/Main_new/Clearing/Component/" exported="true"/>
+    <movieclip id="otcu1bf" name="Missile_boom.jta" path="/Missile/" exported="true" atlas="10"/>
+    <movieclip id="otcu1bg" name="Missile_diamo.jta" path="/Missile/" exported="true" atlas="10"/>
+    <movieclip id="otcu1bh" name="Missile_egg.jta" path="/Missile/" exported="true" atlas="10"/>
+    <movieclip id="otcu1bi" name="Missile_flower.jta" path="/Missile/" exported="true" atlas="10"/>
+    <image id="qncf1bj" name="exit_room.png" path="/Main_new/Main/Image/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml

@@ -17,7 +17,7 @@
     <text id="n161_10xl7" name="tex_name" xy="924,1027" size="388,76" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="请输入房间名称"/>
     <text id="n174_vyn3" name="n174" xy="633,1022" size="299,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="房间名称:"/>
     <image id="n179_qmc1" name="n179" src="l2997iht" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="1619,1024" size="174,78" group="n162_10xl7"/>
-    <text id="n180_qmc1" name="tex_multiple" xy="1619,1025" size="174,78" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="1"/>
+    <text id="n180_qmc1" name="tex_times" xy="1619,1025" size="174,78" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="1"/>
     <text id="n181_qmc1" name="n181" xy="1458,1022" size="169,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="倍数:"/>
     <group id="n162_10xl7" name="n162" xy="633,991" size="1779,144" group="n163_10xl7" advanced="true">
       <relation target="" sidePair="center-center%"/>