Maxim Sokhatsky 11 лет назад
Родитель
Сommit
cc0307dac9
3 измененных файлов с 8 добавлено и 6 удалено
  1. 6 4
      apps/face/src/index.erl
  2. 1 1
      apps/server/src/gas.erl
  3. 1 1
      otp.mk

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

@@ -77,8 +77,8 @@ body() ->
 event(terminate) -> wf:info("terminate");
 event(terminate) -> wf:info("terminate");
 event(init) ->
 event(init) ->
     {ok,GamePid} = game_session:start_link(self()),
     {ok,GamePid} = game_session:start_link(self()),
-    event(attach),
-    event(join),
+%    event(attach),
+%    event(join),
     ets:insert(globals,{wf:session_id(),GamePid}),
     ets:insert(globals,{wf:session_id(),GamePid}),
     put(game_session, GamePid);
     put(game_session, GamePid);
 
 
@@ -88,7 +88,9 @@ event(take)   -> wf:wire(take("1000001", wf:q(take_combo)));
 event(player_info) -> wf:wire(player_info(wf:f("'~s'",["maxim"]),wf:f("'~s'",[game_okey])));
 event(player_info) -> wf:wire(player_info(wf:f("'~s'",["maxim"]),wf:f("'~s'",[game_okey])));
 event(attach) -> 
 event(attach) -> 
     Token = auth_server:generate_token(1000001,"maxim"),
     Token = auth_server:generate_token(1000001,"maxim"),
-    wf:wire(attach(wf:f("'~s'",[Token])));
+    wf:wire(attach(wf:f("'~s'",[Token]))),
+    wf:info("ATTACH ~p",[get(actions)]),
+    ok;
 
 
 event(discard) -> 
 event(discard) -> 
     TilesList = get(game_okey_tiles),
     TilesList = get(game_okey_tiles),
@@ -96,7 +98,7 @@ event(discard) ->
     wf:wire(discard("1000001", erlang:integer_to_list(C), erlang:integer_to_list(V)));
     wf:wire(discard("1000001", erlang:integer_to_list(C), erlang:integer_to_list(V)));
 
 
 
 
-event({binary,M}) -> {ok,<<"Hello">>};
+%event({binary,M}) -> {ok,<<"Hello">>};
 
 
 event({client,Message}) ->
 event({client,Message}) ->
 %    GamePid = get(game_session),
 %    GamePid = get(game_session),

+ 1 - 1
apps/server/src/gas.erl

@@ -2,7 +2,7 @@
 -compile(export_all).
 -compile(export_all).
 
 
 %-define(ALLOWED, [gas,nsg_trn_lucky,game_session,game_manager,game_okey_ng_table_trn]).
 %-define(ALLOWED, [gas,nsg_trn_lucky,game_session,game_manager,game_okey_ng_table_trn]).
--define(ALLOWED, []).
+-define(ALLOWED, [gas,game_session]).
 
 
 log(Module, String, Args, Fun) ->
 log(Module, String, Args, Fun) ->
     case lists:member(Module,?ALLOWED) of
     case lists:member(Module,?ALLOWED) of

+ 1 - 1
otp.mk

@@ -32,7 +32,7 @@ attach:
 release:
 release:
 	echo $(shell echo $(relx) > relx.config) & relx
 	echo $(shell echo $(relx) > relx.config) & relx
 stop:
 stop:
-	kill -9 `ps ax -o pid= -o command=|grep $(RELEASE)|grep $(COOKIE)|awk '{print $1}'`
+	kill -9 `ps ax -o pid= -o command=|grep $(RELEASE)|grep $(COOKIE)|awk '{print $$1}'`
 $(PLT_NAME):
 $(PLT_NAME):
 	ERL_LIBS=deps dialyzer --build_plt --output_plt $(PLT_NAME) --apps $(APPS) || true
 	ERL_LIBS=deps dialyzer --build_plt --output_plt $(PLT_NAME) --apps $(APPS) || true
 dialyze: $(PLT_NAME) compile
 dialyze: $(PLT_NAME) compile