Commit 7e8ae488 authored by 神楽坂玲奈's avatar 神楽坂玲奈

积分

parent ac5eea9f
......@@ -66,7 +66,7 @@ class DuelsController < ApplicationController
end
end
@duel.winner = params[:duel][:winner_pos] == "true" ? @duel.user1 : @duel.user2
if params[:duel][:credits] == "true"
if @duel.winner == @duel.user1
if @duel.user2.credits <= 0
@duel.user1_credits = 3
......@@ -78,6 +78,9 @@ class DuelsController < ApplicationController
@duel.user1_credits = 10
@duel.user2_credits = -4
end
if params[:duel][:credits] == "false"
@duel.user2_credits = -5
end
else
if @duel.user1.credits <= 0
@duel.user2_credits = 3
......@@ -89,19 +92,20 @@ class DuelsController < ApplicationController
@duel.user2_credits = 10
@duel.user1_credits = -4
end
if params[:duel][:credits] == "false"
@duel.user1_credits = -5
end
else
@duel.user1_credits = 0
@duel.user2_credits = 0
end
if @duel.user1
@duel.user1.credits += @duel.user1_credits
@duel.user1.save
@duel.user1.update_attribute(:credits, @duel.user1.credits + @duel.user1_credits)
end
if @duel.user2
@duel.user2.credits += @duel.user2_credits
@duel.user2.save
@duel.user2.update_attribute(:credits, @duel.user2.credits + @duel.user2_credits)
end
#p @duel.user1
#p @duel.user2
#STDIN.gets
@duel.created_at = Time.zone.parse params[:duel][:created_at]
respond_to do |format|
if @duel.save
......@@ -114,8 +118,8 @@ class DuelsController < ApplicationController
end
end
# PUT /duels/1
# PUT /duels/1.json
# PUT /duels/1
# PUT /duels/1.json
def update
@duel = Duel.find(params[:id])
case @current_user
......@@ -137,8 +141,8 @@ class DuelsController < ApplicationController
end
end
# DELETE /duels/1
# DELETE /duels/1.json
# DELETE /duels/1
# DELETE /duels/1.json
def destroy
@duel = Duel.find(params[:id])
@duel.destroy
......@@ -148,12 +152,13 @@ class DuelsController < ApplicationController
format.json { head :no_content }
end
end
def user_deck(user_pos)
@duel = Duel.find(params[:duel_id])
unless (user_pos and @duel.user1_public or @duel.user1 == @current_user) or (!user_pos and @duel.user2_public or @duel.user2 == @current_user)
return respond_to do |format|
format.ydk { redirect_to :format => :html}
format.html{ render :text => "卡组未公开"}
format.ydk { redirect_to :format => :html }
format.html { render :text => "卡组未公开" }
end
end
if user_pos
......@@ -165,14 +170,17 @@ class DuelsController < ApplicationController
end
respond_to do |format|
format.html{ render :text => (["#created by ...", "#main"] + main.collect{|card|card.number} + ["#extra"] + extra.collect{|card|card.number} + ["!side"]).join("\r\n")}
format.ydk { render :text => (["#created by ...", "#main"] + main.collect{|card|card.number} + ["#extra"] + extra.collect{|card|card.number} + ["!side"]).join("\r\n")}
format.html { render :text => (["#created by ...", "#main"] + main.collect { |card| card.number } + ["#extra"] + extra.collect { |card| card.number } + ["!side"]).join("\r\n") }
format.ydk { render :text => (["#created by ...", "#main"] + main.collect { |card| card.number } + ["#extra"] + extra.collect { |card| card.number } + ["!side"]).join("\r\n") }
end
end
def user1_deck
user_deck(true)
end
def user2_deck
user_deck(false)
end
end
......@@ -67,12 +67,12 @@ class UsersController < ApplicationController
@continue = params[:continue]
@from = params[:from].to_s.to_sym
respond_to do |format|
open("http://ygopro-ocg.com/mycard.php?key=zh99998&username=#{CGI.escape @user.name}&password=#{CGI.escape @user.password}&email=#{CGI.escape @user.email}") do |f|
result = f.read
if result.to_i <= 0
@user.errors[:base] << "发生系统错误 (#{result}) 请联系zh99998@gmail.com"
end
end rescue @user.errors[:base] << "发生系统错误 (#{$!.inspect}) 请联系zh99998@gmail.com"
# open("http://ygopro-ocg.com/mycard.php?key=zh99998&username=#{CGI.escape @user.name}&password=#{CGI.escape @user.password}&email=#{CGI.escape @user.email}") do |f|
# result = f.read
# if result.to_i <= 0
# @user.errors[:base] << "发生系统错误 (#{result}) 请联系zh99998@gmail.com"
# end
# end rescue @user.errors[:base] << "发生系统错误 (#{$!.inspect}) 请联系zh99998@gmail.com"
if !@user.errors.any? and @user.save
boardcast_user(@user, :"ygopro-ocg")
session[:user_id] = @user.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment