Roman Dayneko 11 years ago
parent
commit
d0aa0d6ac7
1 changed files with 9 additions and 6 deletions
  1. 9 6
      apps/face/src/index.erl

+ 9 - 6
apps/face/src/index.erl

@@ -36,8 +36,9 @@ take(GameId,Place) ->
 %%     ).
 
 redraw_tiles(TilesList) ->
-    wf:info("Tiles ~p", [TilesList]),
-    wf:replace(drop, #dropdown{id = drop, options = [#option{label = VCBin} || {VCBin, _} <- TilesList]}).
+    wf:info("redraw_tiles Tiles ~p", [TilesList]),
+    wf:info("options ~p", [[#option{label = VCBin, value = VCBin} || {VCBin, _} <- TilesList]]),
+    wf:replace(drop, #dropdown{id = drop, options = [#option{label = VCBin, value = VCBin} || {VCBin, _} <- TilesList]}).
 
 main() -> #dtl{file="index", bindings=[{title,<<"N2O">>},{body,body()}]}.
 
@@ -65,18 +66,20 @@ event(combo)  -> wf:info("Combo: ~p",[wf:q(drop)]);
 event(join)   -> wf:wire(join("1000001"));
 event(attach) -> wf:wire(attach("'"++?TEST_TOKEN++"'"));
 event(take)   -> wf:wire(take("1000001","0"));
-event({game_event, _, okey_game_started, Args}) ->
+event({server, {game_event, _, okey_game_started, Args}}) ->
+    wf:info("okey_game_started"),
     {_, Tiles} = lists:keyfind(tiles, 1, Args),
     TilesList = [{erlang:list_to_binary([erlang:integer_to_list(V), " ", erlang:integer_to_list(C)]), {V, C}} || {_, V, C} <- Tiles],
     put(game_okey_tiles, TilesList),
     redraw_tiles(TilesList),
-    wf:info("tiles ~p", [Tiles]);
-event({game_event, _, okey_tile_discarded, Args}) ->
+    wf:info("okey_game_started tiles ~p", [TilesList]);
+event({server, {game_event, _, okey_tile_discarded, Args}}) ->
     {_, {_, V, C}} = lists:keyfind(tile, 1, Args),
     TilesListOld = get(game_okey_tiles),
     TilesList = lists:keydelete({V, C}, 2, TilesListOld),
     put(game_okey_tiles, TilesList),
-    redraw_tiles(TilesList);
+    redraw_tiles(TilesList),
+    wf:info("okey_tile_discarded tiles ~p", [TilesList]);
 %%event({game_event, _, okey_tile_take, Args}) ->
 %%    {_, {_, V, C}} = lists:keyfind(tile, 1, Args),
 %%    TilesListOld = get(game_okey_tiles),