同步梭哈新协议2099

lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua

@@ -317,9 +317,6 @@ function M:EventInit()
             local cardInfo = _player_card_info[self:GetPos(i)]
             if cardList then
                 cardInfo:UpdateHandPoker(cardList)
-                if self:GetPos(bank_seat) == 1 and bank_seat == i then
-                    cardInfo:ShowTips(1)
-                end
             end
         end
     end)
@@ -338,6 +335,10 @@ function M:EventInit()
 
     _gamectr:AddEventListener(EXGameEvent.OnTurnAction, function(...)
         local arg = { ... }
+        local data = arg[1]
+        local seat = data.seat
+        local cardInfo = _player_card_info[self:GetPos(seat)]
+        cardInfo:ShowTips(data.actions)
     end)
 end
 

lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua

@@ -3,10 +3,13 @@
 --- DateTime: 2017/12/13 17:04
 ---
 
-local TipType = {
-    guo = 0,
-    qi = 1,
-    xia = 4
+local TipID = {
+    xia = 1012,
+    gen = 1013,
+    jia = 1014,
+    suo = 1015,
+    qi = 1016,
+    guo = 1017
 }
 
 local EXPlayerPokerInfoView = import('.EXPlayerPokerInfoView')
@@ -43,37 +46,36 @@ function M:init()
     self._ctr_out = view:GetController('out')
 end
 
-function M:ShowTips(type)
+function M:ShowTips(tipsList)
     self._ctr_out.selectedIndex = 1
-    if type == 1 then
     self._view_tipsList:RemoveChildren()
+    for i = 1, #tipsList do
+        if tipsList[i] == 1012 then
+            local xiaScore = { 1, 2, 5 }
+            for j = 1, 3 do
                 local obj = self._view_tipsList:AddItemFromPool()
-        self.SetTipData(obj, TipType.qi)
-        obj = self._view_tipsList:AddItemFromPool()
-        obj.title = "1分"
-        self.SetTipData(obj, TipType.xia, 1)
-        obj = self._view_tipsList:AddItemFromPool()
-        obj.title = "2分"
-        self.SetTipData(obj, TipType.xia, 2)
-        obj = self._view_tipsList:AddItemFromPool()
-        obj.title = "5分"
-        self.SetTipData(obj, TipType.xia, 5)
+                self.SetTipData(obj, tipsList[j], xiaScore[j])
+                obj.title = string.format("%d分", xiaScore[j])
+            end
+        else
+            local obj = self._view_tipsList:AddItemFromPool()
+            self.SetTipData(obj, tipsList[i])
+        end
     end
 end
 
 function M:OnClickTips(context)
     local button = context.data.data
-    local type = button.type
+    local id = button.id
     local _data = {}
-    if type == TipType.guo then
-    elseif type == TipType.qi then
-        _data["id"] = 1016
-        self:ClickTip(_data)
-    elseif type == TipType.xia then
+    if id == TipID.xia then
         local score = button.data
-        _data["id"] = 1012
+        _data["id"] = id
         _data["betScore"] = tonumber(score)
         self:ClickTip(_data)
+    else
+        _data["id"] = id
+        self:ClickTip(_data)
     end
 end
 
@@ -81,11 +83,11 @@ function M:ClickTip(_data)
     self._gameCtr:SendTip(_data)
 end
 
-function M.SetTipData(obj, type, ...)
+function M.SetTipData(obj, id, ...)
     obj.data = {}
-    obj.data.type = type
+    obj.data.id = id
     obj.data.data = ...
-    obj:GetController('type').selectedIndex = type
+    obj:GetController('type').selectedIndex = id - 1012
 end
 
 function M:Clear()