玩法bug修复中、调试文件
parent
0fd486fe13
commit
f5335788dd
|
|
@ -10,3 +10,4 @@
|
||||||
!wb_unity_pro/**
|
!wb_unity_pro/**
|
||||||
!wb_new_ui/**
|
!wb_new_ui/**
|
||||||
!.gitignore
|
!.gitignore
|
||||||
|
lua_probject/.emmyrc.json
|
||||||
|
|
|
||||||
|
|
@ -111,6 +111,19 @@
|
||||||
],
|
],
|
||||||
"port": 7003,
|
"port": 7003,
|
||||||
"printType": 1
|
"printType": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "emmylua_new",
|
||||||
|
"request": "launch",
|
||||||
|
"name": "EmmyLua-Debug",
|
||||||
|
"host": "localhost",
|
||||||
|
"port": 9966,
|
||||||
|
"ext": [
|
||||||
|
"lua",
|
||||||
|
"lua.txt",
|
||||||
|
"lua.bytes"
|
||||||
|
],
|
||||||
|
"ideConnectDebugger": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
|
@ -460,16 +460,35 @@ function M:UpdateFamilyRoom(fgCtr, id)
|
||||||
end
|
end
|
||||||
obj:GetChild('text_title').text = playList[index].game_name
|
obj:GetChild('text_title').text = playList[index].game_name
|
||||||
local mode = ExtendManager.GetExtendConfig(playList[index].gameId):GetGameInfo()
|
local mode = ExtendManager.GetExtendConfig(playList[index].gameId):GetGameInfo()
|
||||||
|
local pId = playList[index].id
|
||||||
obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config)
|
obj:GetChild('Label_details'):GetChild('title').text = mode:LoadConfigToDetail(playList[index].config)
|
||||||
obj:GetChild('text_playName').text = playList[index].name
|
obj:GetChild('text_playName').text = playList[index].name
|
||||||
obj:GetController('type').selectedIndex = 1
|
obj:GetController('type').selectedIndex = 1
|
||||||
obj:GetChild('btn_del').onClick:Set(function()
|
obj:GetChild('btn_del').onClick:Set(function()
|
||||||
ViewUtil.ShowTwoChooose("是否要删除该玩法", function()
|
ViewUtil.ShowTwoChooose("是否要删除该玩法", function()
|
||||||
fgCtr:FG_DelPlay(id, playList[index].id, function()
|
fgCtr:FG_DelPlay(id, playList[index].id, function(res)
|
||||||
|
if res.ReturnCode ~= 0 then
|
||||||
|
local msg = Table_Error_code_Map[res.ReturnCode] or {}
|
||||||
|
msg = msg.note or "操作失败"
|
||||||
|
ViewUtil.ShowBannerOnScreenCenter(msg)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
self:UpdateFamilyRoom(fgCtr, id)
|
self:UpdateFamilyRoom(fgCtr, id)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
obj:GetChild("btn_edit").onClick:Set(function()
|
||||||
|
local tem = GroupGameSettingView.new(self.blur_view, id, pId, nil, function(play)
|
||||||
|
local group = DataManager.groups:get(id)
|
||||||
|
group:addPlay(play)
|
||||||
|
-- self:FillView()
|
||||||
|
self:UpdateFamilyRoom(fgCtr, id)
|
||||||
|
printlog("刷新玩法===>>>>")
|
||||||
|
group.update_play = true
|
||||||
|
end)
|
||||||
|
tem:Show()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
local all_num = #playList + #roomList
|
local all_num = #playList + #roomList
|
||||||
-- print("=================================================list_room", list_room, list_room.numItems, all_num)
|
-- print("=================================================list_room", list_room, list_room.numItems, all_num)
|
||||||
|
|
|
||||||
|
|
@ -21,11 +21,16 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback)
|
||||||
self._new_hide = false
|
self._new_hide = false
|
||||||
self._queue = false
|
self._queue = false
|
||||||
self.group_id = gid
|
self.group_id = gid
|
||||||
-- self.play = DataManager.groups:get(gid):getPlay(pid)
|
|
||||||
-- self.table_color = self.play and self.play.deskId or 0
|
--- 2025.6.27
|
||||||
-- if room_config then
|
self.play = DataManager.groups:get(gid):getPlay(pid)
|
||||||
-- self.room_config = json.decode(room_config)
|
self.table_color = self.play and self.play.deskId or 0
|
||||||
-- end
|
if room_config then
|
||||||
|
self.room_config = json.decode(room_config)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
self.rewards_data = {}
|
self.rewards_data = {}
|
||||||
self.callback = callback
|
self.callback = callback
|
||||||
self._full = true
|
self._full = true
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,21 @@ oldGameVersion = 2 --1 原始 2 老游戏新加功能
|
||||||
|
|
||||||
--主入口函数。从这里开始lua逻辑
|
--主入口函数。从这里开始lua逻辑
|
||||||
function Main()
|
function Main()
|
||||||
|
-- EmmyluaDebug
|
||||||
|
|
||||||
|
if true then
|
||||||
|
local suc = pcall(function()
|
||||||
|
local path = Application.streamingAssetsPath .. "/../../../lua_probject"
|
||||||
|
package.cpath = package.cpath .. ";" .. path .. "/?.dll"
|
||||||
|
local dbg = require("emmy_core")
|
||||||
|
dbg.tcpConnect('localhost', 9966)
|
||||||
|
end)
|
||||||
|
if suc then
|
||||||
|
print("=============================调试连接成功!===========================")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
--PlayerPrefs.DeleteKey('session_id')
|
--PlayerPrefs.DeleteKey('session_id')
|
||||||
Application.targetFrameRate = 60
|
Application.targetFrameRate = 60
|
||||||
FairyGUI.UIConfig.buttonSound = FairyGUI.NAudioClip(ResourcesManager.LoadObject("base/common/sound/click.mp3",
|
FairyGUI.UIConfig.buttonSound = FairyGUI.NAudioClip(ResourcesManager.LoadObject("base/common/sound/click.mp3",
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue