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

适配和加分

master
1076390229 2025-08-09 22:05:28 +08:00
parent 611658bb15
commit 2e92757ba3
13 changed files with 64 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua_probject/base_project/Game/View/PlayerInfoView.lua
View File

@ -214,6 +214,10 @@ function M:UpdateScore(score)
end
end
end
local curScore = tonumber(self._tex_score.text)
curScore = curScore or 0
self:ScoreAnimation(score - curScore)
self._tex_score.text = tostring(score)
end

10
lua_probject/base_project/Game/View/PlayerInfoView2.lua
View File

@ -45,6 +45,7 @@ function M:init()
self._ctr_read = view:GetController('read')
self._ctr_offline = view:GetController('offline')
self._tex_score = view:GetChild('text_jifen')
self._btn_head = view:GetChild('btn_head')
self._ctr_bank = view:GetController('bank')
@ -160,7 +161,7 @@ function M:FillData(player)
if (DataManager.CurrenRoom.self_player ~= player) then
self._ctr_offline.selectedIndex = player.line_state == 0 and 1 or 0
end
-- self:UpdateScore()
self:UpdateScore()
self:Ready(player.ready)
if player.entrust and player ~= room.self_player then
@ -183,7 +184,7 @@ function M:UpdateScore(score)
-- end
-- end
end
-- self._tex_score.text = tostring(score)
self._tex_score.text = tostring(score)
end
function M:SetStartType(peopleNum, seat)
@ -360,6 +361,11 @@ function M:Destroy()
end
function M:ScoreAnimation(score)
if score == 0 then
return
end
local imgPath = "ui://Main_Majiang/score"
local symbol = "ui://Main_Majiang/score+"
if score < 0 then

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

@ -95,6 +95,8 @@ end
function M:init(url, isBigFull)
self._animation = false
self._scale = true
self._full = false
BaseWindow.init(self, url)
self:InitView()

21
lua_probject/extend_project/extend/majiang/fuzhou/EXPlayerInfoView.lua
View File

@ -53,25 +53,4 @@ function M:FillData(player)
PlayerInfoView2.FillData(self, player)
end
function M:UpdateScore()
local score = self._player.total_score
local room = DataManager.CurrenRoom
if room:checkHpNonnegative() then
score = d2ad(self._player.cur_hp)
end
if not score then
score = 0
end
if score < 0 then
self._ct_score.selectedIndex = 1
self._tex_score2.text = score
else
self._ct_score.selectedIndex = 0
if not room:checkHpNonnegative() then
score = "+" .. score
end
self._tex_score.text = score
end
end
return M

21
lua_probject/extend_project/extend/majiang/jinxi/EXPlayerInfoView.lua
View File

@ -53,25 +53,4 @@ function M:FillData(player)
PlayerInfoView2.FillData(self, player)
end
function M:UpdateScore()
local score = self._player.total_score
local room = DataManager.CurrenRoom
if room:checkHpNonnegative() then
score = d2ad(self._player.cur_hp)
end
if not score then
score = 0
end
if score < 0 then
self._ct_score.selectedIndex = 1
self._tex_score2.text = score
else
self._ct_score.selectedIndex = 0
if not room:checkHpNonnegative() then
score = "+" .. score
end
self._tex_score.text = score
end
end
return M

21
lua_probject/extend_project/extend/majiang/lichuan/EXPlayerInfoView.lua
View File

@ -53,25 +53,4 @@ function M:FillData(player)
PlayerInfoView2.FillData(self, player)
end
function M:UpdateScore()
local score = self._player.total_score
local room = DataManager.CurrenRoom
if room:checkHpNonnegative() then
score = d2ad(self._player.cur_hp)
end
if not score then
score = 0
end
if score < 0 then
self._ct_score.selectedIndex = 1
self._tex_score2.text = score
else
self._ct_score.selectedIndex = 0
if not room:checkHpNonnegative() then
score = "+" .. score
end
self._tex_score.text = score
end
end
return M

21
lua_probject/extend_project/extend/majiang/nancheng/EXPlayerInfoView.lua
View File

@ -53,25 +53,4 @@ function M:FillData(player)
PlayerInfoView2.FillData(self, player)
end
function M:UpdateScore()
local score = self._player.total_score
local room = DataManager.CurrenRoom
if room:checkHpNonnegative() then
score = d2ad(self._player.cur_hp)
end
if not score then
score = 0
end
if score < 0 then
self._ct_score.selectedIndex = 1
self._tex_score2.text = score
else
self._ct_score.selectedIndex = 0
if not room:checkHpNonnegative() then
score = "+" .. score
end
self._tex_score.text = score
end
end
return M

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

@ -37,6 +37,8 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
self._room.card_type = DataManager.CardTypeList[tostring(self._room.game_id)] or 1
UIPackage.AddPackage("base/main_majiang/ui/Main_Majiang")
self._full = false
self._scale = true
MainView.InitView(self, url)
self.btn_setting = self._view:GetChild("btn_setting")
local _view = self._view

3
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"/>
@ -62,6 +62,7 @@
</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"/>
<relation target="" sidePair="top-top"/>
</group>
<list id="n51_qmc1" name="list_scoreAnimation" xy="-92,131" size="200,51" scale="1.6,1.6" layout="row" selectionMode="none" defaultItem="ui://v0j9abjyuans1b1" autoItemSize="false" align="center" vAlign="middle" renderOrder="descent" autoClearItems="true">
<gearDisplay controller="cScore" pages="1"/>

16
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">
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
<controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
<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"/>
@ -107,10 +107,10 @@
<gearDisplay controller="state" pages="3"/>
<Button icon="ui://v0j9abjylj2n17t"/>
</component>
<component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="370,52">
<component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="370,52" size="1347,101">
<gearDisplay controller="state" pages="1,3,4"/>
</component>
<component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="9,975">
<component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="9,975" size="2532,186">
<gearDisplay controller="state" pages="1,3,4"/>
<relation target="" sidePair="width-width,bottom-bottom"/>
</component>
@ -127,23 +127,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="1189,909" size="153,132">
<component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1189,909|100,796|1183,909" default="1183,909"/>
<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,132,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="739,916" size="153,132">
<component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="56,796" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="1,3,4" values="56,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="1189,223" size="153,132">
<component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
<gearDisplay controller="state" pages="0,2"/>
<gearXY controller="state" pages="0,1,2" values="1189,223|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="1886,538" size="153,132">
<component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,37" size="153,132">
<gearDisplay controller="state" pages="1,3,4"/>
<gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,37|1740,46|1752,62" default="1192,928"/>
<relation target="n155_gi99" sidePair="left-right,top-top"/>

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

Binary file not shown.

16
wb_unity_pro/Assets/StreamingAssets/init1_1.json
View File

@ -24,34 +24,34 @@
"bundle": "extend/poker2/suoha"
},
{
"ver": "1.0.28",
"ver": "1.0.30",
"name": "南城麻将",
"check": true,
"version": "1.0.28",
"version": "1.0.30",
"game_id": "86",
"bundle": "extend/majiang/nancheng"
},
{
"ver": "1.0.29",
"ver": "1.0.31",
"name": "黎川麻将",
"check": true,
"version": "1.0.29",
"version": "1.0.31",
"game_id": "87",
"bundle": "extend/majiang/lichuan"
},
{
"ver": "1.0.15",
"ver": "1.0.17",
"name": "金溪麻将",
"check": true,
"version": "1.0.15",
"version": "1.0.17",
"game_id": "88",
"bundle": "extend/majiang/jinxi"
},
{
"ver": "1.0.14",
"ver": "1.0.16",
"name": "抚州麻将",
"check": true,
"version": "1.0.14",
"version": "1.0.16",
"game_id": "89",
"bundle": "extend/majiang/fuzhou"
}

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"
}
]