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

同步

master
罗家炜 2025-09-17 16:02:57 +08:00
parent 9d9506ea80
commit e4776139f4
18 changed files with 174 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lua_probject/base_project/Game/View/Common/ModalWaitingWindow2.lua Normal file
View File

@ -0,0 +1,45 @@
ModalWaitingWindow2 = {
}
local M = ModalWaitingWindow2
local modal_wait_win_url = "ui://Common/GlobalModalWaiting_jiangxi"
local modal_panel = nil
function ModalWaitingWindow2.new()
local self = setmetatable({}, { __index = M })
self.class = "ModalWaitingWindow2"
self._view = UIPackage.CreateObjectFromURL(modal_wait_win_url)
if not modal_panel then
modal_panel = UIPackage.CreateObjectFromURL("ui://Common/UIPanel")
modal_panel.name = "GlobalModalWaiting_Win"
modal_panel:MakeFullScreen()
modal_panel:AddRelation(GRoot.inst, RelationType.Size)
end
modal_panel:AddChild(self._view)
self._view:Center()
GRoot.inst:AddChild(modal_panel)
return self
end
function M:Show()
modal_panel.visible = true
end
function M:Close()
modal_panel.visible = false
end
local _inst = nil
function ModalWaitingWindow2.ShowModal()
if (_inst == nil) then
_inst = ModalWaitingWindow2.new()
end
_inst:Show()
end
function ModalWaitingWindow2.CloseModal()
if (_inst) then
_inst:Close()
end
end

12
lua_probject/base_project/Game/View/LobbyView.lua
View File

@ -95,11 +95,11 @@ function M:InitView(url)
local clickTime = 0
local btn_family = self._view:GetChild("btn_family")
btn_family.onClick:Add(function()
if not self._flag_loadImageSucces and clickTime < 3 then
ViewUtil.ShowOneChooose({ showText = string.format("请等待头像加载完成,再点击%d次,无视头像不加载进入圈子", 3 - clickTime) })
clickTime = clickTime + 1
return
end
-- if not self._flag_loadImageSucces and clickTime < 3 then
-- ViewUtil.ShowOneChooose({ showText = string.format("请等待头像加载完成,再点击%d次,无视头像不加载进入圈子", 3 - clickTime) })
-- clickTime = clickTime + 1
-- return
-- end
local user = DataManager.SelfUser
if user.group_id ~= 0 then
self:ReconnectRoom(user.group_id)
@ -507,7 +507,7 @@ function M:GetPlayerInfoData()
self:ShowPlayerInfo(data.raffle, data.diamo, data.newMail)
if data.group_id ~= 0 then
-- 重连,确保头像加载成功才能重连
ViewUtil.ShowModalWait(self._root_view, " ")
ViewUtil.ShowModalWait2(self._root_view)
coroutine.start(function()
local waitTimes = 0
while not self._flag_loadImageSucces do

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

@ -1177,6 +1177,12 @@ end
-- 标记自己托管
function M:MarkSelfTuoguan()
--托管前把弹窗啥的去一下
if self._player_card_info then
local info = self._player_card_info[1]
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
end
if self._com_tuoguan then
return
end

23
lua_probject/base_project/Game/View/ResultView.lua
View File

@ -11,7 +11,13 @@ function M:Show(time)
local pos = obj.xy
self._view:GetChild("Frist"):TweenMove(Vector2.New(pos.x, pos.y + 200), time or 1.5)
end
BaseWindow.Show(self)
if self._root then
self._root._view_clearingFather:AddChild(self._view)
self._view:AddRelation(self._root._view_clearingFather, RelationType.Size)
self._view:MakeFullScreen()
else
BaseWindow.Show(self)
end
end
function M:InitView()
@ -97,7 +103,11 @@ function M:init(url, isBigFull)
self._animation = false
self._scale = true
self._full = false
BaseWindow.init(self, url)
if self._root then
self._view = UIPackage.CreateObjectFromURL(url)
else
BaseWindow.init(self, url)
end
self:InitView()
@ -446,3 +456,12 @@ function M:ContinueGame(gid, pid, game_id)
pid
)
end
function M:Destroy()
if self._root then
self._view:RemoveFromParent()
self._view:Dispose()
else
BaseWindow.Destroy(self)
end
end

18
lua_probject/base_project/Game/View/ViewUtil.lua
View File

@ -55,6 +55,24 @@ function ViewUtil.CloseModalWait()
ModalWaitingWindow.CloseModal()
end
function ViewUtil.ShowModalWait2(blur_view, title, time)
ViewUtil.CloseModalWait2()
ViewUtil.continue = coroutine.start(
function()
coroutine.wait(time or 1)
ModalWaitingWindow2.ShowModal()
end
)
end
function ViewUtil.CloseModalWait2()
if ViewUtil.continue then
coroutine.stop(ViewUtil.continue)
ViewUtil.continue = nil
end
ModalWaitingWindow2.CloseModal()
end
local _defaultTooltipWin = nil
local function __waittips(obj)
_defaultTooltipWin:Dispose()

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

@ -5,6 +5,7 @@ import(".Common.BaseWindow")
import(".Common.MsgWindow")
import(".Common.NetResetConnectWindow")
import(".Common.ModalWaitingWindow")
import(".Common.ModalWaitingWindow2")
import(".Common.ImageLoad")
import(".ViewUtil")
@ -17,4 +18,4 @@ import(".MainView")
import(".PlayBackView")
import(".RuleView")
import(".RoomInfoView")
import(".RoomInfoView")

11
lua_probject/base_project/Game/ViewManager.lua
View File

@ -60,10 +60,17 @@ local function __OnGameConnectAction(state)
if state == SocketCode.Connect then
ViewManager.ChangeView(ViewManager.View_Main, DataManager.CurrenRoom.game_id)
return
--这两种情况默认重连
elseif state == SocketCode.DisconnectByServer then
__NetTip("网络断开连接！")
-- __NetTip("网络断开连接！")
NetResetConnectWindow.ShowNetReset()
ControllerManager.reset_join_room = 0
ControllerManager.ResetJionRoom()
elseif state == SocketCode.ExceptionOnConnect or state == SocketCode.NetworkException then
__NetTip("请检查您的网络环境！")
-- __NetTip("请检查您的网络环境！")
NetResetConnectWindow.ShowNetReset()
ControllerManager.reset_join_room = 0
ControllerManager.ResetJionRoom()
elseif state == SocketCode.Disconnect then
ControllerManager.ChangeController(LoddyController)
ViewManager.ChangeView(ViewManager.View_Lobby)

4
lua_probject/extend_project/extend/majiang/lichuan/EXClearingView.lua
View File

@ -5,7 +5,7 @@ local EXClearingView = {}
local M = EXClearingView
function EXClearingView.new(blur_view, data)
function EXClearingView.new(root, data)
setmetatable(M, { __index = ResultView })
local self = setmetatable({}, { __index = M })
self._full = true
@ -14,7 +14,7 @@ function EXClearingView.new(blur_view, data)
self._root_view:GetChild("win_mode").visible = false
self._currenIndex = 0
self._blur_view = blur_view
self._root = root
self._close_zone = false
if data then
self.flag_back = data.flag_back

29
lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
View File

@ -562,20 +562,23 @@ function M:OutCard(card)
local _gamectr = ControllerManager.GetController(GameController)
self._room.curren_outcard_seat = -1
_gamectr:SendOutCard(
{ card = card, isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 or
self._player_card_info[1]._ctr_showGuoHu.selectedIndex == 1 }, function()
local info = self._player_card_info[1]
self:RemoveCursor()
info:UpdateHandCard()
{
card = card,
isTip = self._player_card_info[1]._ctr_tip.selectedIndex == 1 or
self._player_card_info[1]._ctr_showGuoHu.selectedIndex == 1
}, function()
local info = self._player_card_info[1]
self:RemoveCursor()
info:UpdateHandCard()
info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("LiChuan_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip()
end)
info:UpdateOutCardList(nil, card, self._cursor)
info._ctr_tip.selectedIndex = 0
info._ctr_showGuoHu.selectedIndex = 0
self:markOutCards(false, card)
self:PlaySound("LiChuan_MJ", self._room.self_player.self_user.sex, tostring(card))
self:PlayMJSound("chupai.mp3")
-- self:ShowHuTip()
end)
else
printlog("鬼牌不能出===>>>" .. card)
end

9
lua_probject/main_project/main/majiang/MJMainView.lua
View File

@ -51,6 +51,7 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
self.cHuCardEffect = self._view:GetController("cHuCardEffect")
-- self.effect_ZiMo = self._view:GetChild("effect_ZiMo")
self._ctr_more = self._view:GetController("more")
self._view_clearingFather = self._view:GetChild('clearing_show')
self.com_notice = self._view:GetChild("com_notice")
@ -518,7 +519,8 @@ function M:OnPlayerReady(...)
self._ctr_action.selectedIndex = 2
end
else
self._ctr_action.selectedIndex = 1
--江西这边没有洗牌，暂时把这个洗牌相关的准备注释了
-- self._ctr_action.selectedIndex = 1
end
else
self._ctr_action.selectedIndex = 0
@ -724,12 +726,11 @@ function M:OnResult1(...)
local data = result.info_list
local niao = result.niao
-- self:RemoveCursor()
self._clearingView = self.EXClearingViewClass.new(self._root_view)
self._clearingView._view:GetChild('btn_setting').onClick:Set(handler(self, self.ClickSetting))
self._clearingView = self.EXClearingViewClass.new(self)
coroutine.start(function()
if liuju then
self:PlayMJSound("liuju.mp3")
coroutine.wait(2.7)
coroutine.wait(3)
self:PlayMJSound("end_music.mp3")
else
self:PlayMJSound("end_music.mp3")

4
lua_probject/main_project/main/majiang/MJWitnessView.lua
View File

@ -185,8 +185,8 @@ function M:OnFangziAction(...)
end)
clip.playing = true
coroutine.start(function()
coroutine.wait(2)
effect:Dispose()
coroutine.wait(0.3)
self._popEvent = true
end)
self:RemoveCursor()

4
wb_new_ui/assets/Common/GlobalModalWaiting_jiangxi.xml
View File

@ -2,8 +2,8 @@
<component size="1751,1001" extention="Button">
<displayList>
<graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000"/>
<component id="n8_xx1c" name="n8" src="xx1c7jct" fileName="component/loading2.xml" xy="684,273" size="387,406" group="n7_f86r" aspect="true"/>
<group id="n7_f86r" name="n7" xy="684,273" size="387,406" advanced="true">
<component id="n8_xx1c" name="n8" src="xx1c7jct" fileName="component/loading2.xml" xy="757,376" size="236,248" group="n7_f86r" aspect="true"/>
<group id="n7_f86r" name="n7" xy="757,376" size="236,248" advanced="true">
<relation target="" sidePair="center-center,middle-middle"/>
</group>
</displayList>

8
wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml
View File

@ -15,6 +15,9 @@
<group id="n113_qt01" name="Frist" xy="559,451" size="1420,258" advanced="true">
<gearDisplay controller="main" pages="0"/>
</group>
<graph id="n156_xx1c" name="n156" xy="0,0" size="2532,1170" group="n116_yry6" type="rect" lineSize="0" fillColor="#99000000">
<relation target="" sidePair="width-width,height-height"/>
</graph>
<image id="n150_l9ll" name="n150" src="l9ll1gu" fileName="Main_new/Clearing/Image/mahj_common_bg.png" xy="51,68" size="2428,1052" group="n116_yry6">
<relation target="" sidePair="width-width%,height-height%,center-center,top-top%"/>
</image>
@ -147,11 +150,8 @@
<group id="n140_yry6" name="over1" xy="74,76" size="2382,1035" group="n116_yry6" advanced="true">
<gearDisplay controller="over" pages="1"/>
</group>
<group id="n116_yry6" name="Main" xy="0,68" size="2534,1105" advanced="true">
<group id="n116_yry6" name="Main" xy="0,0" size="2534,1173" advanced="true">
<gearDisplay controller="main" pages="1"/>
</group>
<component id="n156_l02z" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2193,20" size="141,117">
<gearDisplay controller="main" pages="0"/>
</component>
</displayList>
</component>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="2532,1170" pivot="0.5,0.5" designImage="ui://v0j9abjyj6yy1fr" designImageAlpha="35">
<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"/>
@ -14,6 +14,9 @@
<remark page="1" value="开"/>
</controller>
<displayList>
<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="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1200,366" size="435,73">
<relation target="" sidePair="center-center"/>
<relation target="n169_gmbn" sidePair="bottom-top"/>
@ -46,14 +49,14 @@
<gearXY controller="action" pages="2,0,1" values="8808,794|-16242,794|5853,170"/>
<Button icon="ui://v0j9abjygq7m48"/>
</component>
<component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2738,480" group="n36_k3io" visible="false">
<component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2737,480" group="n36_k3io" visible="false">
<Button icon="ui://v0j9abjygq7m49"/>
</component>
<component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2328,487" group="n36_k3io" scale="0.9,1">
<component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="-2327,487" group="n36_k3io" scale="0.9,1">
<gearDisplay controller="action" pages="1"/>
<Button icon="ui://v0j9abjygq7m4i"/>
</component>
<group id="n36_k3io" name="n36" xy="-2738,480" size="11813,414" visible="false" advanced="true">
<group id="n36_k3io" name="n36" xy="-2737,480" size="11812,414" visible="false" advanced="true">
<relation target="" sidePair="bottom-bottom,center-center"/>
</group>
<component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@ -144,7 +147,7 @@
<gearDisplay controller="state" pages="0,2"/>
<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="87,787" size="153,132">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="730,-60" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="87,787|84,778|85,786" default="730,-60"/>
<relation target="n118_pkx5" sidePair="right-left,top-top"/>
@ -153,7 +156,7 @@
<gearDisplay controller="state" pages="0,2"/>
<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="1866,33" size="153,132">
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="2701,486" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="2701,486|1866,33|1867,35|1868,34" default="2007,876"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>
@ -182,6 +185,33 @@
<group id="n138_lu84" name="top_right" xy="2033,18" size="477,461" advanced="true">
<relation target="" sidePair="right-right,top-top"/>
</group>
<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>
<component id="n210_xx1c" name="clearing_show" src="cjli6" fileName="UIPanel.xml" pkg="27vd145b" xy="0,0">
<relation target="" sidePair="width-width,height-height"/>
</component>
<graph id="n182_kw9h" name="n182" xy="886,1030" size="760,92" type="rect" lineSize="0" fillColor="#4c000000">
<gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</graph>
<text id="n181_kw9h" name="n181" xy="1103,1034" size="326,82" font="FZCuYuan-M03" fontSize="62" color="#ffffff" letterSpacing="3" text="正在旁观中">
<gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</text>
<component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
<Button controller="witness" page="0"/>
</component>
<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"/>
<gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
</component>
<component id="n208_fwqx" name="comp_voice" src="dlc41ga" fileName="Main_new/Chat/Component/Comp_VoiceBegin.xml" xy="0,-1">
<gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
<graph id="n146_l15a" name="btn_showNext" xy="1161,453" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
<gearDisplay controller="state" pages="1"/>
<relation target="n159_ckvb" sidePair="center-center,middle-middle"/>
@ -231,33 +261,6 @@
<group id="n168_qz7i" name="showNext" xy="-125,-102" size="2832,1436" advanced="true">
<gearDisplay controller="showNext" pages="1"/>
</group>
<graph id="n182_kw9h" name="n182" xy="886,1030" size="760,92" type="rect" lineSize="0" fillColor="#4c000000">
<gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</graph>
<text id="n181_kw9h" name="n181" xy="1103,1034" size="326,82" font="FZCuYuan-M03" fontSize="62" color="#ffffff" letterSpacing="3" text="正在旁观中">
<gearDisplay controller="state" pages="4"/>
<relation target="" sidePair="center-center,bottom-bottom"/>
</text>
<component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
<gearDisplay controller="witness" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
<Button controller="witness" page="0"/>
</component>
<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"/>
<gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
</component>
<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>
<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,-1">
<gearDisplay controller="voice" pages="1"/>
<relation target="" sidePair="width-width,height-height"/>
</component>
<component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1260,910" group="n209_lvks">
<relation target="" sidePair="center-center"/>
</component>

BIN
wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes
View File

Binary file not shown.

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

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.6.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.6.bytes
View File

Binary file not shown.