diff --git a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua index cd5849fb..d1a6340e 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyNumberRecord.lua @@ -6,11 +6,50 @@ function FamilyNumberRecord.New(root) setmetatable(M, { __index = root }) local self = setmetatable({}, { __index = M }) + -- print("lingmengFamilyNumberRecord") + -- for key, value in pairs(self._group) do + -- if type(value) == "table" then + -- print(key) + -- pt(value) + -- else + -- print(key .. ":" .. tostring(value)) + -- end + -- end self.familyType.selectedIndex = 5 self.lastType = 1 - self._view:getchild('text_titleRecord') + self._view:GetChild('text_titleRecord').text = string.format("%s(%s) 成员记录", self._group.name, self._group.id) + self._view:GetChild('text_residueDiamond').text = self._group.diamo + self._view:GetChild('text_timeRecord').visible = false + + self._input_IDSerach = self._view:GetChild('input_numberID') + + self._view:GetChild('btn_clearInput').onClick:Set(function() + self._input_IDSerach.text = "" + end) + self._view:GetChild('btn_searchRecord').onClick:Set(function() + ViewUtil.ShowOneChooose("该功能还未开放") + end) + self._view:GetChild('btn_changeMJScore').onClick:Set(function() + ViewUtil.ShowOneChooose("该功能还未开放") + end) + + self._view:GetChild('btn_changePKScore').onClick:Set(function() + ViewUtil.ShowOneChooose("该功能还未开放") + end) + self._view:GetChild('comp_sortTypeList'):GetChild('n0').onClickItem:Set(function(context) + self:OnClickSortType(context) + end) + self._view:GetChild('comp_gameTypeList'):GetChild('n0').onClickItem:Set(function(context) + self:OnClickSortType(context) + end) + return self end +function M:OnClickSortType(context) + print("lingmengOnClickSortType", context.data.title, context.data.text) + pt(getmetatable(context.data.data)) +end + return M diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index 61892950..d454d07b 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -152,35 +152,35 @@ function ShareScreenShot(n, callback) end) end -function shareQRCodePicture(url,secene) - --print(debug.traceback()) - print(url) - print(secene) +function shareQRCodePicture(url, secene) + --print(debug.traceback()) + print(url) + print(secene) local json_data = {} json_data["title"] = "湘北联赛" local mediaObject = {} local filename = "qrcode" .. DataManager.SelfUser.account_id - print(Application.persistentDataPath) + print(Application.persistentDataPath) mediaObject["path"] = Application.persistentDataPath mediaObject["filename"] = filename mediaObject["type"] = 1 json_data["mediaObject"] = mediaObject json_data["description"] = "一款现实中朋友约局休闲娱乐的场所！速度约朋友一起来玩吧！" json_data["scene"] = secene - print("json_data==================") + print("json_data==================") local json_str = json.encode(json_data) - pt(json_str) + pt(json_str) local tex2 = QRCodePicture.GenerateQRcode(url, 250, 250) - local tex1 = ResourcesManager.LoadObject("base/lobby/bg/bg.png",typeof(UnityEngine.Texture2D)) - filename = filename ..".jpg" - print("text2==========") - print(tex2) - print("text1==========") - print(tex1) - print("filename==========") - print(filename) - QRCodePicture.CombanitePicture(tex1,tex2,393,1334-802-250,filename) - + local tex1 = ResourcesManager.LoadObject("base/lobby/bg/bg.png", typeof(UnityEngine.Texture2D)) + filename = filename .. ".jpg" + print("text2==========") + print(tex2) + print("text1==========") + print(tex1) + print("filename==========") + print(filename) + QRCodePicture.CombanitePicture(tex1, tex2, 393, 1334 - 802 - 250, filename) + GameApplication.Instance:ShareLink(1, json_str, nil) end @@ -201,7 +201,7 @@ local bg_url = nil function LoadGameBg(url, main_view) local win_mode = main_view:GetChild("win_mode") win_mode:RemoveChildren(0, -1, true) - local tex_bg = ResourcesManager.LoadObjectByGroup(url..".png",typeof(UnityEngine.Texture), url) + local tex_bg = ResourcesManager.LoadObjectByGroup(url .. ".png", typeof(UnityEngine.Texture), url) local bg = GImage() bg.texture = FairyGUI.NTexture(tex_bg) bg.width = win_mode.width @@ -362,7 +362,7 @@ function LuaPrint(lua_table, limit, indent, step) end function printlog(...) - if debug_print then - print(...) - end + if debug_print then + print(...) + end end diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua b/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua index b97778ac..fe96b1ec 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua @@ -35,6 +35,7 @@ function M:RegisterEvt() self._eventmap[EXProtocol.GAME_EVT_PLAYER_DEAL] = self.OnSendCard self._eventmap[EXProtocol.GAME_EVT_RESULT1] = self.OnResult1 self._eventmap[EXProtocol.GAME_EVT_RESULT2] = self.OnResult2 + self._eventmap[EXProtocol.GAME_EVT_SCORE] = self.OnUpdateScore self._eventmap[EXProtocol.GAME_EVT_CHANGE_ACTIVE_PLAYER] = self.OnTurnAction end @@ -117,6 +118,14 @@ function M:OnResult2(evt_data) ) end +function M:OnUpdateScore(evt_data) + self._cacheEvent:Enqueue( + function() + DispatchEvent(self._dispatcher, EXGameEvent.OnUpdateScore, evt_data) + end + ) +end + function M:OnTurnAction(evt_data) self._cacheEvent:Enqueue( function() diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExGameEvent.lua b/lua_probject/extend_project/extend/poker2/suoha/ExGameEvent.lua index cf7be9cd..84025b53 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExGameEvent.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExGameEvent.lua @@ -7,6 +7,7 @@ local EXGameEvent = { OnTipAction = "OnTipAction", OnResult1 = "OnResult1", OnResult2 = "OnResult2", + OnUpdateScore = "OnUpdateScore", OnTurnAction = "OnTurnAction" } return EXGameEvent diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua index acc6fb6f..a2633c36 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua @@ -213,6 +213,9 @@ function M:InitView(url) end) ---------------------------------------------------- + -------------梭哈------------------- + self._viewText_allScore = self._view:GetChild('text_AllScore') + ------------------------------------ end function M:UpdateCard(index) @@ -333,6 +336,22 @@ function M:EventInit() local arg = { ... } end) + _gamectr:AddEventListener(EXGameEvent.OnUpdateScore, function(...) + local arg = { ... } + local data = arg[1] + local sidePot = data.sidePot + self._viewText_allScore.text = sidePot + local maxPeopleNum = _room.room_config.people_num + for i = 1, maxPeopleNum do + local score = data[string.format("seat_%d", i)] + print(score) + local player = _player_info[self:GetPos(i)] + if score then + player:UpdateScore(score) + end + end + end) + _gamectr:AddEventListener(EXGameEvent.OnTurnAction, function(...) print("lingmengOnTurnAction") pt(arg) diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua b/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua index a6664a92..13a775d0 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExProtocol.lua @@ -16,6 +16,9 @@ local EXProtocol = { -- 大结算 GAME_EVT_RESULT2 = "2008", + -- 分数记录协议 + GAME_EVT_SCORE = "2011", + -- 转盘指向事件 GAME_EVT_CHANGE_ACTIVE_PLAYER = "2099", } diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index 38b62423..89baadd4 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes index 899e1277..91084f40 100644 Binary files a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes and b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes differ