diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 9ce95843d..b83431a82 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -768,9 +768,8 @@ class GamesController < ApplicationController # REDO:需要添加详细的说明 def cost_time #return if @game.status >= 2 - cost_time = (Time.now.to_i - @game.play_time.to_i) + @game.cost_time.to_i - @game.update_attributes(cost_time: cost_time, play_sign: 0) - render_ok + cost_time = (params[:time].to_i < 0 ? 0 : params[:time].to_i) + @game.cost_time.to_i + @game.update_attribute(:cost_time, cost_time) end # 同步challenge的更新时间 @@ -940,13 +939,6 @@ class GamesController < ApplicationController game.update_attributes(status: 0, open_time: Time.now) if game.open_time.blank? || game.status == 3 # 开启实训更新myshixuns的时间,方便跟踪用于的学习进度。 game.myshixun.update_column(:updated_at, Time.now) - # 如果异常关闭的话 更新完关卡的时间 - if game.status < 2 && @game.play_sign == 0 - @game.update_attributes(play_time: Time.now, play_sign: 1) - elsif game.status < 2 && @game.play_sign == 1 - cost_time = Time.now.to_i - (@game.play_time.presence || Time.now).to_i + cost_time.to_i - @game.update_attributes(play_time: Time.now, cost_time: cost_time, play_sign: 1) - end end # vnc连接 diff --git a/db/migrate/20191119021844_add_close_browser_time_for_games.rb b/db/migrate/20191119021844_add_close_browser_time_for_games.rb deleted file mode 100644 index f1d694fea..000000000 --- a/db/migrate/20191119021844_add_close_browser_time_for_games.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddCloseBrowserTimeForGames < ActiveRecord::Migration[5.2] - def change - add_column :games, :play_time, :timestamp - add_column :games, :play_sign, :integer, :default => 0 - end -end