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

同步

master
罗家炜 2025-09-01 16:18:56 +08:00
parent 13ca4d1ea3
commit d7d9e3623c
36 changed files with 114 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,8 @@ local M = FGAssistView
setmetatable(M, { __index = BaseWindow })
local function SortMembers(Members)
-- ↓↓↓去掉用户自己
for _,player in pairs(Members) do
for _, player in pairs(Members) do
if player.uid == DataManager.SelfUser.account_id then
Members[_] = nil
end
@ -109,7 +108,6 @@ function M:FillData()
end
function M:ReFalsh(...)
--[[
local arg = { ... }
local group = DataManager.groups:get(self.group_id)
@ -133,7 +131,7 @@ function M:ReFalsh(...)
local group = DataManager.groups:get(self.group_id)
self._data_number = SortMembers(group.members) --group.members
self.lst_player.numItems = #self._data_number --#group.members
self.lst_player.numItems = #self._data_number --#group.members
end
function M:PlayerRenderer(index, obj)
@ -142,8 +140,10 @@ function M:PlayerRenderer(index, obj)
local btn_invite = obj:GetChild('btn_invite')
btn_invite:GetController('online').selectedIndex = 0
btn_invite.touchable = false
if self._data_number[i].uid ~= DataManager.SelfUser.account_id and self._data_number[i].online == 1 and self._data_number[i].playing ~= "startPlaying" then
btn_invite:GetController('online').selectedIndex = 1
btn_invite.touchable = true
end
--btn_invite:GetController('online').selectedIndex = self._data_number[i].uid == DataManager.SelfUser.account_id and 0 or self._data_number[i].online
@ -160,6 +160,9 @@ function M:PlayerRenderer(index, obj)
local loader = obj:GetChild("btn_head"):GetChild("icon")
ImageLoad.Load(self._data_number[i].portrait, loader)
btn_invite.onClick:Set(function()
obj:GetController('type').selectedIndex = 2
btn_invite.touchable = false
btn_invite:GetController('online').selectedIndex = 0
local mgr_ctr = ControllerManager.GetController(GroupMgrController)
local room = DataManager.CurrenRoom
mgr_ctr:FG_InvitePlayer(self.group_id, self._data_number[i].uid, DataManager.SelfUser.account_id, room.room_id,

15
lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua
View File

@ -276,6 +276,8 @@ function M:NumverRecordRenderer()
obj:GetChild('text_round').text = info.childNum
obj:GetChild('text_score').text = info.totalScore
obj:GetChild('text_winNum').text = info.winNum
obj:GetChild('btn_lookRecord').touchable = info.childNum ~= 0
obj:GetChild('btn_lookRecord'):GetController('cColor').selectedIndex = info.childNum ~= 0 and 0 or 1
obj:GetChild('btn_lookRecord').onClick:Set(function()
self._flag_unReadDetail = true
self.ctr_numberRecord.selectedIndex = 2
@ -293,6 +295,8 @@ function M:NumverRecordRenderer()
obj:GetChild('text_round').text = info.childNum
obj:GetChild('text_score').text = info.totalScore
obj:GetChild('text_winNum').text = info.winNum
obj:GetChild('btn_lookRecord').touchable = info.childNum ~= 0
obj:GetChild('btn_lookRecord'):GetController('cColor').selectedIndex = info.childNum ~= 0 and 0 or 1
obj:GetChild('btn_lookRecord').onClick:Set(function()
self._flag_unReadDetail = true
self.ctr_numberRecord.selectedIndex = 2
@ -372,6 +376,17 @@ function M:RecordItemDetailRender(round, allDate, rdata, obj)
for i = 1, #rdata do
local obj2 = list:AddItemFromPool()
obj2:GetChild('title').text = rdata[i].score
if round == tonumber(allDate.round) and allDate.applyDismisUserId and allDate.applyDismisUserId ~= "null" then
obj2:GetController('jiesan').selectedIndex = rdata[i].nick == allDate.applyDismisUserId and 1 or 2
else
obj2:GetController('jiesan').selectedIndex = 0
end
end
if round == tonumber(allDate.round) then
obj:GetController('jiesan_mng').selectedIndex = (not allDate.applyDismisUserId or allDate.applyDismisUserId == "null") and
1 or 0
else
obj:GetController('jiesan_mng').selectedIndex = 0
end
local btn_play = obj:GetChild("n10")

5
lua_probject/base_project/Game/View/FamilyView.lua
View File

@ -689,10 +689,7 @@ function M:UpdateFamilyRoom(fgCtr, id)
local newIndex = index - #roomList + 1
local config = ExtendManager.GetExtendConfig(playList[newIndex].gameId)
local mode = config:GetGameInfo()
-- times倍数
local times = json.decode(playList[newIndex].hpData).times
local gamePlay = times / 1000 .. "倍,"
gamePlay = gamePlay .. mode:LoadConfigToDetail(playList[newIndex].config, playList[newIndex].hpData)
local gamePlay = mode:LoadConfigToDetail(playList[newIndex].config, playList[newIndex].hpData)
obj:GetChild('Label_gameRule').title = gamePlay
local roomName = Utils.TextOmit(playList[newIndex].name, 6, "")
roomName = string.format("（%s）%s", playList[newIndex].game_name, roomName)

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

@ -183,6 +183,8 @@ function M:FillGameData()
self.cJiesan.selectedIndex = hpData.JieShan - 1
self.cChat.selectedIndex = hpData.BanChat
self.cMisslie.selectedIndex = hpData.BanMissile
else
self.cGps.selectedIndex = 2
end
end

12
lua_probject/extend_project/extend/majiang/fuzhou/EXGameInfo.lua
View File

@ -173,18 +173,24 @@ function M:LoadConfigData(data)
self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
end
function M:LoadConfigToDetail(data)
function M:LoadConfigToDetail(data, hpdata)
local configData = data
if type(data) == 'string' then
configData = json.decode(data)
end
local hpData = data.hpData
pt("lingemng", data)
local hpData = configData.hpData or hpdata
if type(hpData) == 'string' then
hpData = json.decode(hpData)
end
local returnString = string.format("人数%s人", configData.maxPlayers)
local returnString = ""
if hpData then
returnString = string.format("%s倍,", hpData.times / 1000)
end
returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
if configData.jiangma then
returnString = string.format("%s,%s马", returnString,
configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2))

12
lua_probject/extend_project/extend/majiang/jinxi/EXGameInfo.lua
View File

@ -169,18 +169,24 @@ function M:LoadConfigData(data)
self._config:GetChild("n93").text = string.format("奖%s马", data.jiangma * 2)
end
function M:LoadConfigToDetail(data)
function M:LoadConfigToDetail(data, hpdata)
local configData = data
if type(data) == 'string' then
configData = json.decode(data)
end
local hpData = data.hpData
pt("lingemng", data)
local hpData = configData.hpData or hpdata
if type(hpData) == 'string' then
hpData = json.decode(hpData)
end
local returnString = string.format("人数%s人", configData.maxPlayers)
local returnString = ""
if hpData then
returnString = string.format("%s倍,", hpData.times / 1000)
end
returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
if configData.jiangma then
returnString = string.format("%s,%s马", returnString,
configData.jiangma == 0 and "不奖" or string.format("奖%s", configData.jiangma * 2))

14
lua_probject/extend_project/extend/majiang/lichuan/EXGameInfo.lua
View File

@ -151,18 +151,26 @@ function M:LoadConfigData(data)
_config:GetController("jingbibo").selectedIndex = 1 - data.jingbibo
end
function M:LoadConfigToDetail(data)
function M:LoadConfigToDetail(data, hpdata)
local configData = data
if type(data) == 'string' then
configData = json.decode(data)
end
local hpData = data.hpData
pt("lingemng", data)
local hpData = configData.hpData or hpdata
if type(hpData) == 'string' then
hpData = json.decode(hpData)
end
local returnString = string.format("人数%s人,%s,%s,%s", configData.maxPlayers,
local returnString = ""
if hpData then
returnString = string.format("%s倍,", hpData.times / 1000)
end
returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
returnString = string.format("%s,%s,%s,%s", returnString, configData.maxPlayers,
configData.zimo == 0 and "只能自摸" or "自摸可点炮",
configData.tuoguan == 0 and string.format("%d秒后自动托管", configData.tuoguan_active_time) or "不能托管",
configData.jingbibo == 1 and "有精必博" or "有精可胡")

14
lua_probject/extend_project/extend/majiang/nancheng/EXGameInfo.lua
View File

@ -178,18 +178,26 @@ function M:LoadConfigData(data)
-- end
end
function M:LoadConfigToDetail(data)
function M:LoadConfigToDetail(data, hpdata)
local configData = data
if type(data) == 'string' then
configData = json.decode(data)
end
local hpData = data.hpData
pt("lingemng", data)
local hpData = configData.hpData or hpdata
if type(hpData) == 'string' then
hpData = json.decode(hpData)
end
local returnString = string.format("人数%s人,%s马%s%s%s%s%s%s,%s", configData.maxPlayers,
local returnString = ""
if hpData then
returnString = string.format("%s倍,", hpData.times / 1000)
end
returnString = string.format("%s人数%s人", returnString, configData.maxPlayers)
returnString = string.format("%s,%s马%s%s%s%s%s%s,%s", returnString, configData.maxPlayers,
configData.jiangma and string.format("奖%d", configData.jiangma * 2) or "不奖",
configData.shaozhuang and ",有烧庄" or "",
configData.zuoma and ",庄家坐马" or "",

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

@ -9,12 +9,10 @@ end
function GameInfoWindow:Reflash()
local config = self.room.room_config.config
local times = self.room.room_config.config.times
local game_id = self.room.game_id
local Info = ExtendManager.GetExtendConfig(game_id):GetGameInfo()
local text = Info:LoadConfigToDetail(config)
self.tex_tex.text = times / 1000 .. "倍," .. text
self.tex_tex.text = Info:LoadConfigToDetail(config)
end
function GameInfoWindow:Show(room)

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

@ -786,7 +786,7 @@ function M:OnHuCard(...)
end)
coroutine.start(function()
coroutine.wait(0.7)
coroutine.wait(0.5)
loader_HuEffect.visible = false
local Effects = {}

4
wb_new_ui/assets/FGAssist/invite/component/invite/btn_invite.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="210,90" extention="Button">
<controller name="online" pages="0,donw,1,up,3," selected="0"/>
<controller name="online" pages="1,up,0,donw,3," selected="0"/>
<displayList>
<image id="n1_kzuz" name="n1" src="q0vzhop" fileName="invite/image/invite/mj_club_waitingroom_yaoqing_btn.png" xy="0,0" size="210,90">
<gearDisplay controller="online" pages="0,3"/>
@ -11,5 +11,5 @@
<relation target="" sidePair="width-width,height-height"/>
</image>
</displayList>
<Button mode="Radio" downEffect="dark" downEffectValue=".8"/>
<Button downEffect="dark" downEffectValue="0.8"/>
</component>

2
wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/com_huType.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<component size="960,372" pivot="0.5,0.5">
<displayList>
<loader id="n1_m21r" name="loader_img" xy="240,133" pivot="0.5,0.5" size="480,105" aspect="true" url="ui://v0j9abjywhhc1f7" align="center" vAlign="middle" fill="scale"/>
<loader id="n1_m21r" name="loader_img" xy="144,112" pivot="0.5,0.5" size="671,146" aspect="true" url="ui://v0j9abjywhhc1f7" align="center" vAlign="middle" fill="scale"/>
<movieclip id="n2_m21r" name="effect_xingxing" src="xqxr1er" fileName="Main_new/Main/Component/xingxing.jta" xy="240,6" size="480,360" aspect="true"/>
</displayList>
</component>

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

Binary file not shown.

2
wb_unity_pro/Assets/Scripts/VerCheck.cs
View File

@ -293,7 +293,7 @@ public class VerCheck : MonoBehaviour
ac_url = string.Format("http://{0}/NewFKNB/config/asset_config{1}.json", conn.ip + ":" + conn.port, server_version.ToString());
// Debugger.LogError("CheckAssetConfig===>>>");
// Debugger.LogError(ac_url);
Debugger.LogError(ac_url);
float downTimeOut = 5;
using (var request = new WWW(ac_url))

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

@ -1,9 +1,9 @@
[
{
"ver": "1.0.23",
"ver": "1.0.24",
"name": "跑得快",
"check": true,
"version": "1.0.23",
"version": "1.0.24",
"game_id": "66",
"bundle": "extend/poker/runfast"
},
@ -24,34 +24,34 @@
"bundle": "extend/poker2/suoha"
},
{
"ver": "1.0.33",
"ver": "1.0.34",
"name": "南城麻将",
"check": true,
"version": "1.0.33",
"version": "1.0.34",
"game_id": "86",
"bundle": "extend/majiang/nancheng"
},
{
"ver": "1.0.35",
"ver": "1.0.36",
"name": "黎川麻将",
"check": true,
"version": "1.0.35",
"version": "1.0.36",
"game_id": "87",
"bundle": "extend/majiang/lichuan"
},
{
"ver": "1.0.20",
"ver": "1.0.21",
"name": "金溪麻将",
"check": true,
"version": "1.0.20",
"version": "1.0.21",
"game_id": "88",
"bundle": "extend/majiang/jinxi"
},
{
"ver": "1.0.19",
"ver": "1.0.20",
"name": "抚州麻将",
"check": true,
"version": "1.0.19",
"version": "1.0.20",
"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.11",
"ver": "1.0.13",
"name": "base_script",
"check": true,
"bundle": "base/base_script",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "common",
"check": true,
"bundle": "base/common",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "login",
"check": true,
"bundle": "base/login",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "lobby",
"check": true,
"bundle": "base/lobby",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "Family",
"check": true,
"bundle": "base/Family",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "chat",
"check": true,
"bundle": "base/chat",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "newgroup",
"check": true,
"bundle": "base/newgroup",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "rank",
"check": true,
"version": "1.0.11",
"version": "1.0.13",
"bundle": "base/rank"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "main_majiang",
"check": true,
"version": "1.0.11",
"version": "1.0.13",
"bundle": "base/main_majiang"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "main_poker",
"check": true,
"version": "1.0.11",
"version": "1.0.13",
"bundle": "base/main_poker"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "main_zipai",
"check": true,
"version": "1.0.11",
"version": "1.0.13",
"bundle": "base/main_zipai"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "static",
"check": true,
"bundle": "base/static",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"is_res": true,
"name": "embed",
"check": true,
"bundle": "base/embed",
"version": "1.0.11"
"version": "1.0.13"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "main_pokemajiang",
"check": true,
"version": "1.0.11",
"version": "1.0.13",
"bundle": "base/main_pokemajiang"
},
{
"ver": "1.0.11",
"ver": "1.0.13",
"name": "main_zipaimajiang",
"check": true,
"version": "1.0.11",
"version": "1.0.13",
"bundle": "base/main_zipaimajiang"
}
]

BIN
wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.11.bytes → wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.12.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.13.bytes Normal file
View File

Binary file not shown.

BIN
wb_unity_pro/Pack/Android32/extend/poker/runfast/asset_pack1.0.24.bytes Normal file
View File

Binary file not shown.

1
wb_unity_pro/ProjectSettings/GraphicsSettings.asset
View File

@ -39,7 +39,6 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}

6
wb_unity_pro/ProjectSettings/ProjectSettings.asset
View File

@ -179,7 +179,7 @@ PlayerSettings:
iPhone: 1
AndroidBundleVersionCode: 12
AndroidMinSdkVersion: 20
AndroidTargetSdkVersion: 30
AndroidTargetSdkVersion: 26
AndroidPreferredInstallLocation: 1
aotOptions:
stripEngineCode: 0
@ -251,7 +251,7 @@ PlayerSettings:
clonedFromGUID: 00000000000000000000000000000000
templatePackageId:
templateDefaultScene:
AndroidTargetArchitectures: 3
AndroidTargetArchitectures: 1
AndroidSplashScreenScale: 2
androidSplashScreen: {fileID: 0}
AndroidKeystoreName: '{inproject}: smn.keystore'
@ -787,7 +787,7 @@ PlayerSettings:
platformArchitecture:
iPhone: 1
scriptingBackend:
Android: 1
Android: 0
Standalone: 1
iPhone: 1
il2cppCompilerConfiguration: {}