diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index c24a0b29..9e79cdbd 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -7,6 +7,123 @@ local GroupGameSettingView = import(".NewGroup.MngView.GroupGameSettingView_jain FamilyView = {} local M = FamilyView + +local IDENTITY_LIST = { + { + level = 0, --圈主 + + }, + { + level = 1, --副圈主 + otherList = { + { + name = "邀请朋友", + Fct = M.ShareWx + }, + { + name = "游戏记录", + Fct = M.ShareWx + }, + { + name = "玩法管理", + Fct = M.PlayEdit + }, + { + name = "充值房卡", + Fct = M.ShareWx + }, + { + name = "申请消息", + Fct = M.ShareWx + }, + { + name = "查看成员", + Fct = M.ShareWx + }, + { + name = "创建亲友圈", + Fct = M.CreateFamily + }, + { + name = "高级选项", + Fct = M.CreateFamily + }, + { + name = "添加助理", + Fct = M.CreateFamily + }, + { + name = "加入亲友圈", + Fct = M.JoinFamily + }, + } + + }, + { + level = 2, --管理员 + otherList = { + { + name = "邀请朋友", + Fct = M.ShareWx + }, + { + name = "游戏记录", + Fct = M.ShareWx + }, + { + name = "玩法管理", + Fct = M.PlayEdit + }, + { + name = "充值房卡", + Fct = M.ShareWx + }, + { + name = "申请消息", + Fct = M.ShareWx + }, + { + name = "查看成员", + Fct = M.ShareWx + }, + { + name = "创建亲友圈", + Fct = M.CreateFamily + }, + { + name = "高级选项", + Fct = M.CreateFamily + }, + { + name = "添加助理", + Fct = M.CreateFamily + }, + { + name = "加入亲友圈", + Fct = M.JoinFamily + }, + } + + }, + { + level = 3, --成员 + otherList = { + { + name = "邀请朋友", + Fct = M.ShareWx + }, + { + name = "创建亲友圈", + Fct = M.CreateFamily + }, + { + name = "加入亲友圈", + Fct = M.JoinFamily + }, + } + + }, +} function FamilyView.new() UIPackage.AddPackage("base/Family/ui/Family") @@ -102,145 +219,28 @@ function M:init(url) end) end -function ShareWx(view) +function M:ShareWx() local familyInviteFamilyView = FamilyInviteFamilyView.new() familyInviteFamilyView:Show() end -function CreateFamily(view) - view.familyType.selectedIndex = 3 - view.lastType = 1 - view._view:GetController('createOrJoin').selectedIndex = 0 +function M:CreateFamily() + self.familyType.selectedIndex = 3 + self.lastType = 1 + self._view:GetController('createOrJoin').selectedIndex = 0 end -function JoinFamily(view) - view.familyType.selectedIndex = 3 - view.lastType = 1 - view._view:GetController('createOrJoin').selectedIndex = 1 +function M:JoinFamily() + self.familyType.selectedIndex = 3 + self.lastType = 1 + self._view:GetController('createOrJoin').selectedIndex = 1 end -function PlayEdit(view) - view.familyType.selectedIndex = 2 - view.lastType = 1 +function M:PlayEdit() + self.familyType.selectedIndex = 2 + self.lastType = 1 end -local IDENTITY_LIST = { - { - level = 0, --圈主 - - }, - { - level = 1, --副圈主 - otherList = { - { - name = "邀请朋友", - Fct = ShareWx - }, - { - name = "游戏记录", - Fct = ShareWx - }, - { - name = "玩法管理", - Fct = PlayEdit - }, - { - name = "充值房卡", - Fct = ShareWx - }, - { - name = "申请消息", - Fct = ShareWx - }, - { - name = "查看成员", - Fct = ShareWx - }, - { - name = "创建亲友圈", - Fct = CreateFamily - }, - { - name = "高级选项", - Fct = CreateFamily - }, - { - name = "添加助理", - Fct = CreateFamily - }, - { - name = "加入亲友圈", - Fct = JoinFamily - }, - } - - }, - { - level = 2, --管理员 - otherList = { - { - name = "邀请朋友", - Fct = ShareWx - }, - { - name = "游戏记录", - Fct = ShareWx - }, - { - name = "玩法管理", - Fct = PlayEdit - }, - { - name = "充值房卡", - Fct = ShareWx - }, - { - name = "申请消息", - Fct = ShareWx - }, - { - name = "查看成员", - Fct = ShareWx - }, - { - name = "创建亲友圈", - Fct = CreateFamily - }, - { - name = "高级选项", - Fct = CreateFamily - }, - { - name = "添加助理", - Fct = CreateFamily - }, - { - name = "加入亲友圈", - Fct = JoinFamily - }, - } - - }, - { - level = 3, --成员 - otherList = { - { - name = "邀请朋友", - Fct = ShareWx - }, - { - name = "创建亲友圈", - Fct = CreateFamily - }, - { - name = "加入亲友圈", - Fct = JoinFamily - }, - } - - }, -} - function M:ChangeOther(i) local otherList = IDENTITY_LIST[i].otherList local list_other = self._view:GetChild('list_other') @@ -248,6 +248,8 @@ function M:ChangeOther(i) list_other:SetVirtual() list_other.itemRenderer = function(index, obj) obj:GetChild('text').text = otherList[index + 1].name + -- print("lingmengChangeOther", otherList[index + 1].name, otherList[index + 1].Fct, + -- typeof(otherList[index + 1].Fct)) obj.onClick:Add(handler(self, otherList[index + 1].Fct)) end list_other.numItems = #otherList diff --git a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua index 935fd973..bbca6162 100644 --- a/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua +++ b/lua_probject/extend_project/extend/poker/runfast/CardCheck.lua @@ -72,6 +72,7 @@ function M:initLastCard(cardList) end end end + self.long = temp_long == self.cardNum and self.cardNum >= 5 self.type = -1 print("lingmengCheckAloneOrLong2") if self:CheckAloneOrLong() then diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua index 210d106e..13d6d87c 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_MainView.lua @@ -790,8 +790,8 @@ function M:EventInit() m = true end local zdts = self._view:GetController("zidongtishi").selectedIndex - self._player_card_info[1]:ShowOutCardOption(ctr_number, card_type, card_number, card_length, m, play, zdts) self._player_card_info[1]._cardCheck:initLastCard(lastCardList) + self._player_card_info[1]:ShowOutCardOption(ctr_number, card_type, card_number, card_length, m, play, zdts) end) -- 托管 _gamectr:AddEventListener(RunFast_GameEvent.Game_TuoGuan, function(...) diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 0202bf7f..701f9dde 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -1141,6 +1141,7 @@ function M:ShowTipsCard(index) self:UpdateCardMove(card.btn_card, false, false) end end + pt(item) self._cardCheck:initCards(item) self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0 end