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

杠加分

master
DESKTOP-7R8JEQQ\k 2025-07-11 21:37:35 +08:00
parent 4ca52e0842
commit 80c0d02632
50 changed files with 116 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua_probject/base_project/Game/Controller/GameController.lua
View File

@ -29,6 +29,9 @@ GameEvent = {
--麻将修改牌大小
MJModifySzie = 'MJModifySzie',
--翻字
FangziAnimation = "FangziAnimation",
}
--- Base GameController
@ -650,3 +653,7 @@ end
function M:OnEvtExieWitness(msg)
DispatchEvent(self._dispatcher, GameEvent.WitnessPlayerLeave, msg.playyer)
end
function M:OnEventFzAction(msg)
DispatchEvent(self._dispatcher, GameEvent.FangziAnimation, msg)
end

8
lua_probject/base_project/Game/Controller/GroupMgrController.lua
View File

@ -17,6 +17,7 @@ GroupMgrEvent = {
ChatRoomData = "ChatRoomData",
OnNewApply = "OnNewApply",
OnNewRecord = "OnNewRecord",
OnMemberState = "OnMemberState",
}
GroupMgrController = {
@ -55,6 +56,7 @@ function GroupMgrController.new()
self._eventmap[Protocol.FGMGR_EVT_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom
self._eventmap[Protocol.FGMGR_EVT_DATA_CHATROOM] = self.FG_Data_ChatRoom
self._eventmap[Protocol.FGMGR_EVT_NEWCHAT] = self.FG_Data_NewChat
self._eventmap[Protocol.FGMGR_EVT_Member_State] = self.FG_Data_Member_State
-- self:connect(callback)
return self
end
@ -401,6 +403,12 @@ function M:FG_Data_NewChat(evt_data)
DispatchEvent(self._dispatcher, GroupMgrEvent.OnNewRecord, evt_data)
end
function M:FG_Data_Member_State(evt_data)
print("收到成员状态推送")
pt(evt_data)
DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
end
function M:PopEvent()
local _cacheEvent = self._cacheEvent
if (_cacheEvent:Count() > 0) then

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

@ -6,6 +6,14 @@ local SettingView = import('.SettingView')
local PlayerDistanceView = import('.PlayerDistanceView')
local FGAssistView = import('.FGAssistView')
local function GetSeat(data, uId)
for _,player in pairs(data.player_list) do
if player.self_user.account_id == uId then
return player.seat
end
end
end
--lingmeng新全局标记
lingmengxin = false
@ -702,6 +710,8 @@ function M:EventInit()
_gamectr:AddEventListener(GameEvent.PlayerReady, handler(self, self.OnPlayerReady))
_gamectr:AddEventListener(GameEvent.FangziAnimation, handler(self, self.OnFangziAnimation))
_gamectr:AddEventListener(
GameEvent.DeskBreak,
function(...)
@ -986,6 +996,19 @@ function M:OnPlayerReady(...)
printlog("基类准备++++++++++++++++++++++++++")
end
-- 飘字
function M:OnFangziAnimation(...)
print("OnFangziAnimation")
local arg = {...}
pt(arg)
local fz = arg[1]
local playerid = arg[1].playerid
local fromPlayer = arg[1].from_seat
local type = arg[1].type
local player = self._player_info[self:GetPos(playerid)]
end
function M:OnUpdateInfo(...)
local arg = { ... }
local p = arg[1]

1
lua_probject/extend_project/extend/majiang/100zhang/EXGameController.lua
View File

@ -211,6 +211,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("吃杠碰行为事件===========>>>")
pt(evt_data)
local _room = self._room

1
lua_probject/extend_project/extend/majiang/changsha/EXGameController.lua
View File

@ -221,6 +221,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/chaoshan/EXGameController.lua
View File

@ -211,6 +211,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("吃杠碰行为事件===========>>>")
pt(evt_data)
local _room = self._room

1
lua_probject/extend_project/extend/majiang/chaozhou/EXGameController.lua
View File

@ -213,6 +213,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("吃杠碰行为事件===========>>>")
pt(evt_data)
local _room = self._room

1
lua_probject/extend_project/extend/majiang/chaozhougui/EXGameController.lua
View File

@ -213,6 +213,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("吃杠碰行为事件===========>>>")
pt(evt_data)
local _room = self._room

1
lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua
View File

@ -250,6 +250,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/gejiu/EXGameController.lua
View File

@ -214,6 +214,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/hongzhong/EXGameController.lua
View File

@ -230,6 +230,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua
View File

@ -250,6 +250,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua
View File

@ -251,6 +251,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/nancheng/EXGameController.lua
View File

@ -250,6 +250,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/qizhiba/EXGameController.lua
View File

@ -246,6 +246,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("吃杠碰行为事件===========>>>")
pt(evt_data)

1
lua_probject/extend_project/extend/majiang/tuidaohu/EXGameController.lua
View File

@ -201,6 +201,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/majiang/zhuanzhuan/EXGameController.lua
View File

@ -227,6 +227,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/zipai/changdepaohuzi/EXGameController.lua
View File

@ -266,6 +266,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/zipai/fulushou/EXGameController.lua
View File

@ -380,6 +380,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("放子行为事件===》》》")
pt(evt_data)

1
lua_probject/extend_project/extend/zipai/hsrunbeard/EXGameController.lua
View File

@ -268,6 +268,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
local _room = self._room
local playerid = evt_data["playerid"]
local card = evt_data["card"]

1
lua_probject/extend_project/extend/zipai/runbeard/EXGameController.lua
View File

@ -299,6 +299,7 @@ function M:OnEventFangWei(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("jefe EventFz 操作提示===>>>>")
local _room = self._room
local playerid = evt_data["playerid"]

1
lua_probject/extend_project/extend/zipai/yueyangwaihuzi/EXGameController.lua
View File

@ -319,6 +319,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("放子行为提示事件===》》》")
pt(evt_data)
local _room = self._room

1
lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/EXGameController.lua
View File

@ -320,6 +320,7 @@ function M:OnEventFzTips(evt_data)
end
function M:OnEventFzAction(evt_data)
GameController.OnEventFzAction(self, evt_data)
printlog("放子行为提示事件===》》》")
pt(evt_data)
local _room = self._room

1
wb_new_ui/assets/Common/package.xml
View File

@ -2097,6 +2097,7 @@
<image id="qmc17jbw" name="default4.png" path="/images/Emojies2/"/>
<image id="qmc17jbx" name="default.png" path="/images/Emojies2/"/>
<image id="qmc17jby" name="default2.png" path="/images/Emojies2/"/>
<image id="qmc17jbz" name="loginBg.png" path="/bg/" exported="true" atlas="alone"/>
</resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
<atlas name="默认" index="0"/>

9
wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
View File

@ -2,7 +2,7 @@
<component size="132,132" initName="gcm_info">
<controller name="room_owner" pages="0,,1," selected="0"/>
<controller name="bank" pages="0,,1," selected="0"/>
<controller name="read" pages="0,,1," selected="1"/>
<controller name="read" pages="0,,1," selected="0"/>
<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"/>
@ -10,6 +10,7 @@
<controller name="ting" pages="0,,1," selected="0"/>
<controller name="text_color" pages="0,,1," selected="0"/>
<controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
<controller name="cScore" alias="分数飘字" pages="0,,1," selected="0"/>
<displayList>
<text id="n47_nkur" name="tuoguanTips" xy="-26,-84" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
<gearXY controller="site" pages="2,1" values="-26,-84|154,50" default="-85,-104"/>
@ -68,5 +69,11 @@
<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"/>
</group>
<list id="n51_qmc1" name="list_scoreAnimation" xy="-34,150" size="200,51" layout="row" overflow="scroll" defaultItem="ui://v0j9abjyqmc11ax" autoItemSize="false" align="center" vAlign="middle">
<gearDisplay controller="cScore" pages="1"/>
<item icon="ui://v0j9abjyqmc11ax"/>
<item url="ui://v0j9abjyqmc11b0" icon="ui://v0j9abjyqmc11b0"/>
<item url="ui://v0j9abjyqmc11as" icon="ui://v0j9abjyqmc11ay"/>
</list>
</displayList>
</component>

12
wb_new_ui/assets/Main_Majiang/package.xml
View File

@ -1423,6 +1423,18 @@
<image id="xblm1am" name="Group 82@3x.png" path="/component/Setting/Image/"/>
<component id="xblm1an" name="btn_gameDismissRoom.xml" path="/Main_new/Main/Component/"/>
<image id="qmc11ao" name="gamexzmj_9 1.png" path="/images/"/>
<image id="qmc11ap" name="score3.png" path="/images/score/" exported="true"/>
<image id="qmc11aq" name="score4.png" path="/images/score/" exported="true"/>
<image id="qmc11ar" name="score5.png" path="/images/score/" exported="true"/>
<image id="qmc11as" name="score6.png" path="/images/score/" exported="true"/>
<image id="qmc11at" name="score7.png" path="/images/score/" exported="true"/>
<image id="qmc11au" name="score8.png" path="/images/score/" exported="true"/>
<image id="qmc11av" name="score9.png" path="/images/score/" exported="true"/>
<image id="qmc11aw" name="score-.png" path="/images/score/" exported="true"/>
<image id="qmc11ax" name="score+.png" path="/images/score/" exported="true"/>
<image id="qmc11ay" name="score0.png" path="/images/score/" exported="true"/>
<image id="qmc11az" name="score1.png" path="/images/score/" exported="true"/>
<image id="qmc11b0" name="score2.png" path="/images/score/" exported="true"/>
</resources>
<publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
</packageDescription>

4
wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml
View File

@ -4,6 +4,7 @@
<controller name="page" pages="0,,1," selected="0"/>
<controller name="update" pages="0,,1,,2," selected="0"/>
<displayList>
<image id="n178_qmc1" name="n178" src="qmc17jbz" fileName="bg/loginBg.png" pkg="27vd145b" xy="0,0"/>
<component id="n177_id5t" name="lst_game" src="pzuc7cx2" fileName="CreatePlay.xml" pkg="2d9xdj6z" xy="1,12" group="n163_10xl7"/>
<component id="n157_10xl7" name="btn_next" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1986,991" size="426,144" group="n162_10xl7">
<Button title=" " titleColor="#167547" titleFontSize="24" icon="ui://2d9xdj6zp8hp7cz6"/>
@ -15,6 +16,9 @@
</component>
<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="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%"/>
</group>

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_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.4 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.6 MiB

After

Width:  |  Height:  |  Size: 4.4 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_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/base/newgroup/ui/NewGroup_fui.bytes
View File

Binary file not shown.

60
wb_unity_pro/Assets/StreamingAssets/init2_1.json
View File

@ -1,109 +1,109 @@
[
{
"lua_path": "/tolua_project,/base_project,/main_project",
"ver": "1.0.9",
"ver": "1.0.6",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "common",
"check": true,
"bundle": "base/common",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "login",
"check": true,
"bundle": "base/login",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "Family",
"check": true,
"bundle": "base/Family",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "chat",
"check": true,
"bundle": "base/chat",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "rank",
"check": true,
"version": "1.0.9",
"version": "1.0.6",
"bundle": "base/rank"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "main_majiang",
"check": true,
"version": "1.0.9",
"version": "1.0.6",
"bundle": "base/main_majiang"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "main_poker",
"check": true,
"version": "1.0.9",
"version": "1.0.6",
"bundle": "base/main_poker"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "main_zipai",
"check": true,
"version": "1.0.9",
"version": "1.0.6",
"bundle": "base/main_zipai"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "static",
"check": true,
"bundle": "base/static",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"is_res": true,
"name": "embed",
"check": true,
"bundle": "base/embed",
"version": "1.0.9"
"version": "1.0.6"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "main_pokemajiang",
"check": true,
"version": "1.0.9",
"version": "1.0.6",
"bundle": "base/main_pokemajiang"
},
{
"ver": "1.0.9",
"ver": "1.0.6",
"name": "main_zipaimajiang",
"check": true,
"version": "1.0.9",
"version": "1.0.6",
"bundle": "base/main_zipaimajiang"
}
]

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.8.bytes
View File

Binary file not shown.

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

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.8.bytes
View File

Binary file not shown.

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

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.8.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.8.bytes
View File

Binary file not shown.

6
wb_unity_pro/ProjectSettings/ProjectSettings.asset
View File

@ -178,8 +178,8 @@ PlayerSettings:
buildNumber:
iPhone: 1
AndroidBundleVersionCode: 12
AndroidMinSdkVersion: 29
AndroidTargetSdkVersion: 29
AndroidMinSdkVersion: 30
AndroidTargetSdkVersion: 30
AndroidPreferredInstallLocation: 1
aotOptions:
stripEngineCode: 0
@ -262,7 +262,7 @@ PlayerSettings:
AndroidEnableTango: 0
androidEnableBanner: 0
androidUseLowAccuracyLocation: 0
androidUseCustomKeystore: 1
androidUseCustomKeystore: 0
m_AndroidBanners:
- width: 320
height: 180