Browse Source

i saw ok framework

Maxim Sokhatsky 11 years ago
parent
commit
d7a2e2db42

+ 3 - 3
apps/server/src/okey/okey_desk.erl

@@ -375,10 +375,10 @@ handle_player_action(PlayerId, {discard, Tash}, StateName,
                            NextPlayerId = next_id(CurPlayerId),
                            NextPlayerId = next_id(CurPlayerId),
 
 
         #player{discarded = Discarded} = get_player(CurPlayerId, Players),
         #player{discarded = Discarded} = get_player(CurPlayerId, Players),
-        wf:info(?MODULE,"Looking for Okey in Discarded Tower for Player ~p",[Discarded]),
+        VisibleTower = lists:sublist([Tash|Discarded],3),
+        wf:info(?MODULE,"Looking for ~p in Discarded Tower for Player ~p",[Okey,VisibleTower]),
 
 
-        EnableOkey = if Discarded /= [] ->
-            case deck:get(1, Discarded) of {Okey, _} -> true; _ -> false end; true -> false end,
+        EnableOkey = lists:any(fun(X)->X==Okey end,VisibleTower),
 
 
                            Events = [{next_player,NextPlayerId,EnableOkey} | Events1],
                            Events = [{next_player,NextPlayerId,EnableOkey} | Events1],
                            {ok, Events, ?STATE_TAKE,
                            {ok, Events, ?STATE_TAKE,

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

@@ -858,7 +858,8 @@ handle_desk_events([Event | Events], DeskState, Players, Relay, #okey_state{} =
                 case EnableOkey of
                 case EnableOkey of
                     true -> 
                     true -> 
                         MsgOkey = create_okey_enabled(SeatNum, CurSeatNum, Players),
                         MsgOkey = create_okey_enabled(SeatNum, CurSeatNum, Players),
-                        send_to_client_ge(Relay, PlayerId, MsgOkey, StateData);
+                        relay_publish_ge(Relay, MsgOkey, StateData);
+                        %send_to_client_ge(Relay, PlayerId, MsgOkey, StateData);
                     false -> skip
                     false -> skip
                 end,
                 end,
                 Msg = create_okey_next_turn(SeatNum, Players),
                 Msg = create_okey_next_turn(SeatNum, Players),

+ 1 - 1
apps/web/priv/static/app/js/okey/okey.js

@@ -233,7 +233,7 @@ function PostLoad()
     scope.apiProvider.on("okey_enable", function(x) {
     scope.apiProvider.on("okey_enable", function(x) {
         var e = {detail: x.detail.json, raw: x.detail.bert};
         var e = {detail: x.detail.json, raw: x.detail.bert};
         var enabled = dec(e.raw).value[0][3][1].value[0][1].value;
         var enabled = dec(e.raw).value[0][3][1].value[0][1].value;
-        if (enabled) $("#Okey").show();
+        if (enabled) $("#Okey").show(); else $("#Okey").hide();
     });
     });
 
 
     scope.apiProvider.on("okey_round_ended", function(x) {
     scope.apiProvider.on("okey_round_ended", function(x) {