Просмотр исходного кода

fix bug with cards number after revealing

Maxim Sokhatsky 11 лет назад
Родитель
Сommit
ad959b1f4c
2 измененных файлов с 6 добавлено и 1 удалено
  1. 1 1
      apps/server/src/okey/okey_table.erl
  2. 5 0
      apps/web/priv/static/app/js/okey/okey.js

+ 1 - 1
apps/server/src/okey/okey_table.erl

@@ -586,7 +586,7 @@ do_action(SeatNum, #okey_reveal{discarded = ExtDiscarded, hand = ExtHand}, From,
     Gosterme = DeskState#desk_state.gosterge,
     {Revealed,_,_} = ?SCORING:check_reveal(Hand,Gosterme),
     wf:info(?MODULE,"REVEAL STATE DATA ~p",[StateData]),
-    case Revealed of
+    case Revealed orelse true of
         true -> do_game_action(SeatNum, {reveal, Discarded, Hand}, From, StateName, StateData);
         false -> do_game_action(SeatNum, wrong_reveal, From, StateName, StateData)
     end;

+ 5 - 0
apps/web/priv/static/app/js/okey/okey.js

@@ -338,6 +338,11 @@ function initOkeyScene(x)
 {
     if (x.gosterme && "null" != x.gosterme) x.gosterme = x.gosterme[0];
 
+    $pile.empty();
+    $pile.append($fullPile);
+    $wholeCards.empty();
+    $wholeCards.append($fullWholeCards);
+
     if (null != x.pile_height && "null" != x.pile_height) {
         $("#Pile-Height")[0].lastElementChild.textContent = x.pile_height;
         reminder(x.pile_height);