resolution: 1024x640

lib/association.rb

+module Association
+  module_function
+
+  def register
+    if Windows
+      require 'win32/registry'
+      path, command, icon = paths
+      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard') { |reg| reg['URL Protocol'] = path.ljust path.bytesize }
+      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard\shell\open\command') { |reg| reg[nil] = command.ljust command.bytesize }
+      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard\DefaultIcon') { |reg| reg[nil] = icon.ljust icon.bytesize }
+      Win32::Registry::HKEY_CLASSES_ROOT.create('.ydk') { |reg| reg[nil] = 'mycard' }
+      Win32::Registry::HKEY_CLASSES_ROOT.create('.yrp') { |reg| reg[nil] = 'mycard' }
+      Win32::Registry::HKEY_CLASSES_ROOT.create('.deck') { |reg| reg[nil] = 'mycard' }
+    end
+  end
+
+  def paths
+    pwd = Dir.pwd.gsub('/', '\\')
+    path = '"' + pwd + '\ruby\bin\rubyw.exe" -C"' + pwd + '" -KU lib/main.rb'
+    command = path + ' "%1"'
+    icon = '"' + pwd + '\mycard.exe", 0'
+    [path, command, icon]
+  end
+
+  def need?
+    return false unless Windows
+    return false if $config['no_assoc']
+    path, command, icon = paths
+    require 'win32/registry'
+    begin
+      Win32::Registry::HKEY_CLASSES_ROOT.open('mycard') { |reg| return true unless reg['URL Protocol'] == path }
+      Win32::Registry::HKEY_CLASSES_ROOT.open('mycard\shell\open\command') { |reg| return true unless reg[nil] == command }
+      Win32::Registry::HKEY_CLASSES_ROOT.open('mycard\DefaultIcon') { |reg| return true unless reg[nil] == icon }
+      Win32::Registry::HKEY_CLASSES_ROOT.open('.ydk') { |reg| return true unless reg[nil] == 'mycard' }
+      Win32::Registry::HKEY_CLASSES_ROOT.open('.yrp') { |reg| return true unless reg[nil] == 'mycard' }
+      Win32::Registry::HKEY_CLASSES_ROOT.open('.deck') { |reg| return true unless reg[nil] == 'mycard' }
+    rescue
+      return true
+    end
+  end
+
+  def request
+    require_relative 'widget_msgbox'
+    Widget_Msgbox.new("mycard", "即将进行文件关联, 弹出安全警告请点允许", ok: "确定", cancel: "取消") do |clicked|
+      if clicked == :ok
+        yield
+      else
+        Widget_Msgbox.new("mycard", "没有进行关联,要重新关联请删除config.yml")
+        $config['no_assoc'] = true
+        Config.save
+      end
+    end
+  end
+  def start
+    if need?
+      request do
+       register rescue Dialog.uac("ruby/bin/rubyw.exe", "-KU lib/main.rb register_association")
+      end
+    end
+  end
+end
\ No newline at end of file

lib/config.rb

+require 'yaml'
+require_relative 'resolution'
+Config = Module.new
+module Config
+  module_function
+  def load(file="config.yml")
+    config = YAML.load_file(file) rescue {}
+    config = {} unless config.is_a? Hash
+    config['bgm'] = true if config['bgm'].nil?
+    config['screen'] ||= {}
+    config['screen']['width'], config['screen']['height'] = Resolution.default unless Resolution.all.include? [config['screen']['width'], config['screen']['height']]
+    config
+  end
+  def save(config=$config, file="config.yml")
+    File.open(file, "w") { |file| YAML.dump(config, file) }
+  end
+end
\ No newline at end of file

lib/graphics.rb

+module Graphics
+  module_function
+  Ext = ['.png', '.jpg', '.gif']
+
+  def load(directory, filename, alpha=true)
+    extname  = File.extname(filename)
+    path = "graphics/#{directory}/#{File.dirname(filename)}/#{File.basename(filename, extname)}"
+
+    result = if extname.empty?
+      Ext.each do |ext|
+        result = load_file(path, ext)
+        break result if result
+      end
+    else
+      load_file(path, extname)
+    end
+    raise 'file not exist' if result.nil?
+
+    if alpha
+      result.display_format_alpha
+    else
+      result.display_format
+    end
+  end
+
+  def load_file(path, ext)
+    path_with_resolution = "#{path}-#{$config['screen']['width']}x#{$config['screen']['height']}#{ext}"
+    if File.file? path_with_resolution
+      Surface.load path_with_resolution
+    elsif File.file? path += ext
+      Surface.load path
+    end
+  end
+end
\ No newline at end of file

lib/iduel/game.rb

@@ -117,7 +117,7 @@ class Iduel < Game
             User.new(id).friend = true
             $config['iDuel']['friends'] << id
           end
-          save_config
+          Config.save
         end
       rescue Exception => exception
         $log.error('读取好友信息') {[exception.inspect, *exception.backtrace].collect{|str|str.encode("UTF-8")}.join("\n")}
@@ -169,7 +169,7 @@ class Iduel < Game
             announcements << Announcement.new(title.encode("UTF-8"), "http://www.duelcn.com/#{url}", nil)
           end
           $config['iDuel']['announcements'].replace announcements
-          save_config
+          Config.save
         end
       rescue Exception => exception
         $log.error('公告') {[exception.inspect, *exception.backtrace].collect{|str|str.encode("UTF-8")}.join("\n")}

lib/iduel/window_login.rb

-class Window_Login
-  def clicked
-    return if @last_clicked and Time.now - @last_clicked < 3 #防止重复点击
-    case @index
-    when :login
-      Widget_Msgbox.new("iDuel", "正在登录")
-      $scene.draw #强制重绘一次，下面会阻塞
-      $game = Iduel.new
-      $config[$config['game']]['username'] = @username_inputbox.value
-      $config[$config['game']]['password'] = @remember_password.checked? ? @password_inputbox.value : nil
-      save_config
-      $game.login(@username_inputbox.value, @password_inputbox.value)
-      @last_clicked = Time.now
-    when :register
-      Dialog.web Iduel::Register_Url
-      @last_clicked = Time.now
-    when :replay
-      file = Dialog.get_open_file("播放录像", "所有支持的录像 (*.txt;*.htm)" => "*.txt;*.htm", "iDuel的html的录像 (*.htm)" => "*.htm", "文本录像 (*.txt)" => "*.txt")
-      if !file.empty?
-        $game = Iduel.new
-        $game.user = User.new(0)
-        Widget_Msgbox.new("回放录像", "录像读取中...")
-        $scene.draw
-        $log.info('iduel window_login'){'loading reply file'}
-        $scene = Scene_Replay.new Replay.load file
-      end
-      @last_clicked = Time.now
-    end
-  end
+class Window_Login
+  def clicked
+    return if @last_clicked and Time.now - @last_clicked < 3 #防止重复点击
+    case @index
+    when :login
+      Widget_Msgbox.new("iDuel", "正在登录")
+      $scene.draw #强制重绘一次，下面会阻塞
+      $game = Iduel.new
+      $config[$config['game']]['username'] = @username_inputbox.value
+      $config[$config['game']]['password'] = @remember_password.checked? ? @password_inputbox.value : nil
+      Config.save
+      $game.login(@username_inputbox.value, @password_inputbox.value)
+      @last_clicked = Time.now
+    when :register
+      Dialog.web Iduel::Register_Url
+      @last_clicked = Time.now
+    when :replay
+      file = Dialog.get_open_file("播放录像", "所有支持的录像 (*.txt;*.htm)" => "*.txt;*.htm", "iDuel的html的录像 (*.htm)" => "*.htm", "文本录像 (*.txt)" => "*.txt")
+      if !file.empty?
+        $game = Iduel.new
+        $game.user = User.new(0)
+        Widget_Msgbox.new("回放录像", "录像读取中...")
+        $scene.draw
+        $log.info('iduel window_login'){'loading reply file'}
+        $scene = Scene_Replay.new Replay.load file
+      end
+      @last_clicked = Time.now
+    end
+  end
 end
\ No newline at end of file

lib/main.rb

-#!/usr/bin/env ruby
-begin
-  #定义全局方法
-  def load_config(file="config.yml")
-    require 'yaml'
-    $config = YAML.load_file("config.yml") rescue {}
-    $config = {} unless $config.is_a? Hash
-    $config['bgm'] = true if $config['bgm'].nil?
-    $config['screen'] ||= {}
-    $config['screen']['width'] ||= 1024
-<<<<<<< HEAD
-    $config['screen']['height'] ||= 768
-=======
-    $config['screen']['height'] ||= 640
->>>>>>> 8031a2a
-  end
-
-  def save_config(file="config.yml")
-    File.open(file, "w") { |file| YAML.dump($config, file) }
-  end
-<<<<<<< HEAD
-
-  def register_url_protocol
-    if RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
-      require 'win32/registry'
-      path, command, icon = assoc_paths
-      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard') { |reg| reg['URL Protocol'] = path.ljust path.bytesize }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard\shell\open\command') { |reg| reg[nil] = command.ljust command.bytesize }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard\DefaultIcon') { |reg| reg[nil] = icon.ljust icon.bytesize }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('.ydk') { |reg| reg[nil] = 'mycard' }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('.yrp') { |reg| reg[nil] = 'mycard' }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('.deck') { |reg| reg[nil] = 'mycard' }
-    end
-  end
-
-  def assoc_paths
-    pwd = Dir.pwd.gsub('/', '\\')
-    path = '"' + pwd + '\ruby\bin\rubyw.exe" -C"' + pwd + '" -KU lib/main.rb'
-    command = path + ' "%1"'
-    icon = '"' + pwd + '\mycard.exe", 0'
-    [path, command, icon]
-  end
-
-  def assoc_need?
-    return false unless RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
-    return false if $config['no_assoc']
-    path, command, icon = assoc_paths
-    require 'win32/registry'
-    begin
-      Win32::Registry::HKEY_CLASSES_ROOT.open('mycard') { |reg| return true unless reg['URL Protocol'] == path }
-      Win32::Registry::HKEY_CLASSES_ROOT.open('mycard\shell\open\command') { |reg| return true unless reg[nil] == command }
-      Win32::Registry::HKEY_CLASSES_ROOT.open('mycard\DefaultIcon') { |reg| return true unless reg[nil] == icon }
-      Win32::Registry::HKEY_CLASSES_ROOT.open('.ydk') { |reg| return true unless reg[nil] == 'mycard' }
-      Win32::Registry::HKEY_CLASSES_ROOT.open('.yrp') { |reg| return true unless reg[nil] == 'mycard' }
-      Win32::Registry::HKEY_CLASSES_ROOT.open('.deck') { |reg| return true unless reg[nil] == 'mycard' }
-    rescue
-      return true
-    end
-  end
-
-  def request_assoc
-    require_relative 'widget_msgbox'
-    Widget_Msgbox.new("mycard", "即将进行文件关联, 弹出安全警告请点允许", ok: "确定", cancel: "取消") do |clicked|
-      if clicked == :ok
-        yield
-      else
-        Widget_Msgbox.new("mycard", "没有进行关联,要重新关联请删除config.yml")
-        $config['no_assoc'] = true
-        save_config
-      end
-=======
-  def register_url_protocol
-    if RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
-      require 'win32/registry'
-      pwd = Dir.pwd.gsub('/', '\\')
-      path = '"' + pwd + '\ruby\bin\rubyw.exe" -C"' + pwd + '" -KU lib/main.rb'
-      command = path + ' "%1"'
-      icon = '"' + pwd + '\mycard.exe", 0'
-      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard') { |reg| reg['URL Protocol'] = path.ljust path.bytesize unless (reg['URL Protocol'] == path rescue false) }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard\shell\open\command') { |reg| reg[nil] = command.ljust command.bytesize unless (reg[nil] == command rescue false) }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('mycard\DefaultIcon') { |reg| reg[nil] = icon.ljust icon.bytesize unless (reg[nil] == icon rescue false) }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('.ydk') { |reg| reg[nil] = 'mycard' unless (reg[nil] == 'mycard' rescue false) }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('.yrp') { |reg| reg[nil] = 'mycard' unless (reg[nil] == 'mycard' rescue false) }
-      Win32::Registry::HKEY_CLASSES_ROOT.create('.deck') { |reg| reg[nil] = 'mycard' unless (reg[nil] == 'mycard' rescue false) }
->>>>>>> 8031a2a
-    end
-  end
-
-  Thread.abort_on_exception = true
-  require_relative 'announcement'
-  #读取配置文件
-  load_config
-  save_config
-  #读取命令行参数
-  log = "log.log"
-  log_level = "INFO"
-  profile = nil
-  ARGV.each do |arg|
-    arg = arg.dup.force_encoding("UTF-8")
-    arg.force_encoding("GBK") unless arg.valid_encoding?
-    case arg
-      when /--log=(.*)/
-        log.replace $1
-      when /--log-level=(.*)/
-        log_level.replace $1
-      when /--profile=(.*)/
-        profile = $1
-      when /^mycard:.*|\.ydk$|\.yrp$|\.deck$/
-        require_relative 'quickstart'
-        $scene = false
-      when /register_web_protocol/
-<<<<<<< HEAD
-        $assoc_requested = true
-=======
->>>>>>> 8031a2a
-        register_url_protocol
-        $scene = false
-    end
-  end
-  unless $scene == false
-    #初始化SDL
-    require 'sdl'
-    include SDL
-    SDL::Event::APPMOUSEFOCUS = 1
-    SDL::Event::APPINPUTFOCUS = 2
-    SDL::Event::APPACTIVE = 4
-    SDL.putenv ("SDL_VIDEO_CENTERED=1");
-    SDL.init(INIT_VIDEO | INIT_AUDIO)
-    WM::set_caption("MyCard", "MyCard")
-    WM::icon = Surface.load("graphics/system/icon.gif")
-    $screen = Screen.open($config['screen']['width'], $config['screen']['height'], 0, HWSURFACE | ($config['screen']['fullscreen'] ? FULLSCREEN : 0))
-    Mixer.open(Mixer::DEFAULT_FREQUENCY, Mixer::DEFAULT_FORMAT, Mixer::DEFAULT_CHANNELS, 1024)
-    Mixer.set_volume_music(60)
-    TTF.init
-    Thread.abort_on_exception = true
-
-    #初始化日志
-    require 'logger'
-    if log == "STDOUT" #调试用
-      log = STDOUT
-    end
-    $log = Logger.new(log)
-    $log.level = Logger.const_get log_level
-    #性能分析
-    if profile
-      if profile == "STDOUT"
-        profile = STDOUT
-      else
-        profile = open(profile, 'w')
-      end
-      require 'profiler'
-      RubyVM::InstructionSequence.compile_option = {
-          :trace_instruction => true,
-          :specialized_instruction => false
-      }
-      Profiler__::start_profile
-    end
-
-
-    #初始化标题场景
-    require_relative 'scene_title'
-<<<<<<< HEAD
-    require_relative 'dialog'
-=======
->>>>>>> 8031a2a
-    $scene = Scene_Title.new
-
-    #自动更新
-    require_relative 'update'
-    Update.start
-    WM::set_caption("MyCard v#{Update::Version}", "MyCard")
-<<<<<<< HEAD
-    if assoc_need?
-      request_assoc do
-        register_url_protocol rescue Dialog.uac("ruby/bin/rubyw.exe", "-KU lib/main.rb register_web_protocol")
-      end
-    end
-
-=======
-    require_relative 'dialog'
-    register_url_protocol rescue Dialog.uac("ruby/bin/rubyw.exe", "-KU lib/main.rb register_web_protocol")
->>>>>>> 8031a2a
-    $log.info("main") { "初始化成功" }
-  end
-rescue Exception => exception
-  open('error-程序出错请到论坛反馈.txt', 'w') { |f| f.write [exception.inspect, *exception.backtrace].join("\n") }
-  $scene = false
-end
-
-#主循环
-begin
-  $scene.main while $scene
-rescue Exception => exception
-  exception.backtrace.each { |backtrace| break if backtrace =~ /^(.*)\.rb:\d+:in `.*'"$/ } #由于脚本是从main.rb开始执行的，总会有个能匹配成功的文件
-  $log.fatal($1) { [exception.inspect, *exception.backtrace].collect { |str| str.force_encoding("UTF-8") }.join("\n") }
-  $game.exit if $game
-  require_relative 'scene_error'
-  $scene = Scene_Error.new
-  retry
-ensure
-  if profile
-    Profiler__::print_profile(profile)
-    profile.close
-  end
-  $log.close rescue nil
+#!/usr/bin/env ruby
+begin
+
+  Windows = RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
+  Thread.abort_on_exception = true
+
+  require_relative 'resolution'
+  require_relative 'announcement'
+  require_relative 'config'
+  require_relative 'association'
+
+  #读取配置文件
+  $config = Config.load
+  Config.save
+
+  #读取命令行参数
+  log = "log.log"
+  log_level = "INFO"
+  profile = nil
+  ARGV.each do |arg|
+    arg = arg.dup.force_encoding("UTF-8")
+    arg.force_encoding("GBK") unless arg.valid_encoding?
+    case arg
+      when /--log=(.*)/
+        log.replace $1
+      when /--log-level=(.*)/
+        log_level.replace $1
+      when /--profile=(.*)/
+        profile = $1
+      when /^mycard:.*|\.ydk$|\.yrp$|\.deck$/
+        require_relative 'quickstart'
+        $scene = false
+      when /register_association/
+        Association.register
+        $scene = false
+    end
+  end
+
+  unless $scene == false
+    #加载文件
+    require 'logger'
+    require 'sdl'
+    include SDL
+
+    require_relative 'dialog'
+    require_relative 'graphics'
+    require_relative 'window'
+    require_relative 'widget_msgbox'
+
+    #日志
+    if log == "STDOUT" #调试用
+      log = STDOUT
+    end
+    $log = Logger.new(log)
+    $log.level = Logger.const_get log_level
+
+    #性能分析
+    if profile
+      if profile == "STDOUT"
+        profile = STDOUT
+      else
+        profile = open(profile, 'w')
+      end
+      require 'profiler'
+      RubyVM::InstructionSequence.compile_option = {
+          :trace_instruction => true,
+          :specialized_instruction => false
+      }
+      Profiler__::start_profile
+    end
+
+    SDL::Event::APPMOUSEFOCUS = 1
+    SDL::Event::APPINPUTFOCUS = 2
+    SDL::Event::APPACTIVE = 4
+    SDL.putenv ("SDL_VIDEO_CENTERED=1");
+    SDL.init(INIT_VIDEO)
+
+    WM::set_caption("MyCard", "MyCard")
+    $screen = Screen.open($config['screen']['width'], $config['screen']['height'], 0, HWSURFACE | ($config['screen']['fullscreen'] ? FULLSCREEN : 0))
+    TTF.init
+
+    #声音
+    begin
+      SDL.init(INIT_AUDIO)
+      Mixer.open(Mixer::DEFAULT_FREQUENCY, Mixer::DEFAULT_FORMAT, Mixer::DEFAULT_CHANNELS, 1536)
+      Mixer.set_volume_music(60)
+    rescue
+      nil
+    end
+
+    #标题场景
+    require_relative 'scene_title'
+    $scene = Scene_Title.new
+
+    #自动更新, 加载放到SDL前面会崩, 原因不明
+    require_relative 'update'
+    Update.start
+    WM::set_caption("MyCard v#{Update::Version}", "MyCard")
+
+    #文件关联
+    Association.start
+
+    #初始化完毕
+    $log.info("main") { "初始化成功" }
+  end
+rescue Exception => exception
+  open('error-程序出错请到论坛反馈.txt', 'w') { |f| f.write [exception.inspect, *exception.backtrace].join("\n") }
+  $scene = false
+end
+
+#主循环
+begin
+  $scene.main while $scene
+rescue Exception => exception
+  exception.backtrace.each { |backtrace| break if backtrace =~ /^(.*)\.rb:\d+:in `.*'"$/ } #由于脚本是从main.rb开始执行的，总会有个能匹配成功的文件
+  $log.fatal($1) { [exception.inspect, *exception.backtrace].collect { |str| str.force_encoding("UTF-8") }.join("\n") }
+  $game.exit if $game
+  require_relative 'scene_error'
+  $scene = Scene_Error.new
+  retry
+ensure
+  if profile
+    Profiler__::print_profile(profile)
+    profile.close
+  end
+  $log.close rescue nil
 end
\ No newline at end of file

lib/resolution.rb

+module Resolution
+  module_function
+
+  def all
+    [
+        [1024, 768],
+        [1024, 640]
+    ]
+  end
+
+  def system
+    return [1024, 768]
+    if Windows
+      require 'win32api'
+      get_system_metrics = Win32API.new "User32.dll", "GetSystemMetrics", ["L"], "L"
+      [get_system_metrics.call(0), get_system_metrics.call(1)]
+    else
+      `xrandr`.scan(/current (\d+) x (\d+)/).flatten.collect { |n| n.to_i }
+    end
+  end
+
+  def default
+    system_resolution = self.system
+    all.each do |width, height|
+      #p [width, height, system_resolution[0], system_resolution[1], (system_resolution[0] < width and system_resolution[1] < height)]
+      return [width, height] if system_resolution[0] > width and system_resolution[1] > height
+    end
+    all.last
+  end
+end
\ No newline at end of file

lib/scene.rb

@@ -51,7 +51,7 @@ class Scene
   # ● 开始处理
   #--------------------------------------------------------------------------
   def start
-    if $config['bgm'] and @@last_bgm != bgm and File.file? "audio/bgm/#{bgm}"
+    if $config['bgm'] and @@last_bgm != bgm and SDL.inited_system(INIT_AUDIO) != 0 and File.file? "audio/bgm/#{bgm}"
       @@bgm.destroy if @@bgm
       @@bgm = Mixer::Music.load "audio/bgm/#{bgm}"
       Mixer.fade_in_music(@@bgm, -1, 800)
@@ -130,7 +130,7 @@ class Scene
           style = HWSURFACE
           style |= FULLSCREEN if $config['screen']["fullscreen"]
           $screen = Screen.open($config['screen']["width"], $config['screen']["height"], 0, style)
-          save_config
+          Config.save
         end
       when Key::F12
         $scene = Scene_Title.new

lib/scene_duel.rb

@@ -43,7 +43,7 @@ class Scene_Duel < Scene
     @player_lp_window = Window_LP.new(0,0, @room.player1, true)
     @opponent_lp_window = Window_LP.new(360,0, @room.player2, false)
 
-    @join_se = Mixer::Wave.load("audio/se/join.ogg")
+    @join_se = Mixer::Wave.load("audio/se/join.ogg") if SDL.inited_system(INIT_AUDIO) != 0
     
     create_action_window
     create_chat_window
@@ -161,7 +161,7 @@ class Scene_Duel < Scene
       player = $game.room.player1 == $game.user ? $game.room.player2 : $game.room.player1
       if player
         notify_send("对手加入房间", "#{player.name}(#{player.id})")
-        Mixer.play_channel(-1,@join_se,0)
+        Mixer.play_channel(-1,@join_se,0) if SDL.inited_system(INIT_AUDIO) != 0
       else
         notify_send("对手离开房间", "对手离开房间")
       end
@@ -175,7 +175,7 @@ class Scene_Duel < Scene
     super
   end
   def refresh
-    @fieldback_window.card = $game.player_field.field[0] && $game.player_field.field[0].card_type == :场地魔法 && $game.player_field.field[0].position == :attack ? $game.player_field.field[0] : $game.opponent_field.field[0] && $game.opponent_field.field[0].card_type == :场地魔法 && $game.opponent_field.field[0].position == :attack ? $game.opponent_field.field[0] : nil
+    @fieldback_window.card = $game.player_field.field[0] && $game.player_field.field[0].card_type == :"场地魔法" && $game.player_field.field[0].position == :attack ? $game.player_field.field[0] : $game.opponent_field.field[0] && $game.opponent_field.field[0].card_type == :"场地魔法" && $game.opponent_field.field[0].position == :attack ? $game.opponent_field.field[0] : nil
     @player_field_window.refresh
     @opponent_field_window.refresh
     @phases_window.player = $game.turn_player

lib/scene_lobby.rb

-#encoding: UTF-8
-#==============================================================================
-# Scene_Lobby
-#------------------------------------------------------------------------------
-# 大厅
-#==============================================================================
-
-class Scene_Lobby < Scene
-  require_relative 'window_userlist'
-  require_relative 'window_userinfo'
-  require_relative 'window_roomlist'
-  require_relative 'window_chat'
-  require_relative 'window_host'
-  require_relative 'window_lobbybuttons'
-  require_relative 'chatmessage'
-  require_relative 'scene_duel'
-  attr_reader :chat_window
-  def start
-    WM::set_caption("MyCard v#{Update::Version} - #{$config['game']} - #{$game.user.name}(#{$game.user.id})", "MyCard")
-		$game.refresh
-		@background = Surface.load("graphics/lobby/background.png").display_format
-    Surface.blit(@background,0,0,0,0,$screen,0,0)
-		@userlist = Window_UserList.new(24,204,$game.users)
-    @roomlist = Window_RoomList.new(320,50,$game.rooms)
-		@userinfo = Window_UserInfo.new(24,24, $game.user)
-		@host_window = Window_LobbyButtons.new(748,18)
-    @active_window = @roomlist
-<<<<<<< HEAD
-		@chat_window = Window_Chat.new(313,543,698,212)
-=======
-		@chat_window = Window_Chat.new(313,$config['screen']['height'] - 225,698,212)
->>>>>>> 8031a2a
-    @count = 0
-    super
-  end
-  def bgm
-    "lobby.ogg"
-  end
-  def handle(event)
-    case event
-    when Event::KeyDown
-      case event.sym
-      when Key::UP
-        @active_window.cursor_up
-      when Key::DOWN
-        @active_window.cursor_down
-      when Key::F2
-        #@joinroom_msgbox = Widget_Msgbox.new("创建房间", "正在等待对手")
-        #$game.host Room.new(0, $game.user.name)        
-      when Key::F3
-        #@joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入房间")
-        #$game.join 'localhost'
-      when Key::F5
-        $game.refresh
-      when Key::F12
-        $game.exit
-        $scene = Scene_Login.new
-      end
-    else
-      super
-    end
-  end
-
-  def handle_game(event)
-    case event
-    when Game_Event::AllUsers
-      @userlist.items = $game.users
-    when Game_Event::AllRooms
-      @roomlist.items = $game.rooms
-    when Game_Event::Join
-      join(event.room)
-    when Game_Event::Watch
-      require_relative 'scene_watch'
-      $scene = Scene_Watch.new(event.room)
-    when Game_Event::Chat
-      @chat_window.add event.chatmessage
-    else
-      super
-    end
-  end
-  def join(room)
-    $scene = Scene_Duel.new(room)
-  end
-  def update
-    @chat_window.update
-    @host_window.update
-    @roomlist.update
-    if @count >= $game.refresh_interval*60
-      $game.refresh
-      @count = 0
-    end
-    @count += 1
-    super
-  end
-  def terminate
-    unless $scene.is_a? Scene_Lobby or $scene.is_a? Scene_Duel
-      $game.exit
-    end
-  end
+#encoding: UTF-8
+#==============================================================================
+# Scene_Lobby
+#------------------------------------------------------------------------------
+# 大厅
+#==============================================================================
+
+class Scene_Lobby < Scene
+  require_relative 'window_userlist'
+  require_relative 'window_userinfo'
+  require_relative 'window_roomlist'
+  require_relative 'window_chat'
+  require_relative 'window_host'
+  require_relative 'window_lobbybuttons'
+  require_relative 'chatmessage'
+  require_relative 'scene_duel'
+  attr_reader :chat_window
+  def start
+    WM::set_caption("MyCard v#{Update::Version} - #{$config['game']} - #{$game.user.name}(#{$game.user.id})", "MyCard")
+		$game.refresh
+		@background = Graphics.load('lobby', 'background', false)
+    Surface.blit(@background,0,0,0,0,$screen,0,0)
+		@userlist = Window_UserList.new(24,204,$game.users)
+    @roomlist = Window_RoomList.new(320,50,$game.rooms)
+		@userinfo = Window_UserInfo.new(24,24, $game.user)
+		@host_window = Window_LobbyButtons.new(748,18)
+    @active_window = @roomlist
+		@chat_window = Window_Chat.new(313,$config['screen']['height'] - 225,698,212)
+    @count = 0
+    super
+  end
+  def bgm
+    "lobby.ogg"
+  end
+  def handle(event)
+    case event
+    when Event::KeyDown
+      case event.sym
+      when Key::UP
+        @active_window.cursor_up
+      when Key::DOWN
+        @active_window.cursor_down
+      when Key::F2
+        #@joinroom_msgbox = Widget_Msgbox.new("创建房间", "正在等待对手")
+        #$game.host Room.new(0, $game.user.name)        
+      when Key::F3
+        #@joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入房间")
+        #$game.join 'localhost'
+      when Key::F5
+        $game.refresh
+      when Key::F12
+        $game.exit
+        $scene = Scene_Login.new
+      end
+    else
+      super
+    end
+  end
+
+  def handle_game(event)
+    case event
+    when Game_Event::AllUsers
+      @userlist.items = $game.users
+    when Game_Event::AllRooms
+      @roomlist.items = $game.rooms
+    when Game_Event::Join
+      join(event.room)
+    when Game_Event::Watch
+      require_relative 'scene_watch'
+      $scene = Scene_Watch.new(event.room)
+    when Game_Event::Chat
+      @chat_window.add event.chatmessage
+    else
+      super
+    end
+  end
+  def join(room)
+    $scene = Scene_Duel.new(room)
+  end
+  def update
+    @chat_window.update
+    @host_window.update
+    @roomlist.update
+    if @count >= $game.refresh_interval*60
+      $game.refresh
+      @count = 0
+    end
+    @count += 1
+    super
+  end
+  def terminate
+    unless $scene.is_a? Scene_Lobby or $scene.is_a? Scene_Duel
+      $game.exit
+    end
+  end
 end
\ No newline at end of file

lib/scene_login.rb

-#encoding: UTF-8
-#==============================================================================
-# ■ Scene_Login
-#------------------------------------------------------------------------------
-# 　login
-#==============================================================================
-require_relative 'window_gameselect'
-require_relative 'window_announcements'
-require_relative 'window_login'
-require_relative 'scene_replay'
-require_relative 'scene_lobby'
-class Scene_Login < Scene
-	def start
-    WM::set_caption("MyCard v#{Update::Version}", "MyCard")
-    @background = Surface.load("graphics/login/background.png").display_format
-	#======================================================
-	# We'll pay fpr that soon or later.
-	#======================================================
-	if $config['screen']['height'] == 768
-		@gameselect_window = Window_GameSelect.new(117,269)
-	elsif $config['screen']['height'] == 640
-		@gameselect_window = Window_GameSelect.new(117,134)
-	else
-		raise "无法分辨的分辨率"
-	end	
-	#======================================================
-	# ENDS HERE
-	#======================================================
-    super
-	end
-  def update
-    @gameselect_window.update
-    super
-  end
-  def handle_game(event)
-    case event
-    when Game_Event::Login
-      require_relative 'scene_lobby'
-      $scene = Scene_Lobby.new
-    else
-      super
-    end
-  end
-  #def terminate
-  #  @gameselect_window.destroy
-  #end
+#encoding: UTF-8
+#==============================================================================
+# ■ Scene_Login
+#------------------------------------------------------------------------------
+# 　login
+#==============================================================================
+require_relative 'window_gameselect'
+require_relative 'window_announcements'
+require_relative 'window_login'
+require_relative 'scene_replay'
+require_relative 'scene_lobby'
+class Scene_Login < Scene
+	def start
+    WM::set_caption("MyCard v#{Update::Version}", "MyCard")
+    @background = Graphics.load('login', 'background', false)
+	#======================================================
+	# We'll pay fpr that soon or later.
+	#======================================================
+	if $config['screen']['height'] == 768
+		@gameselect_window = Window_GameSelect.new(117,269)
+	elsif $config['screen']['height'] == 640
+		@gameselect_window = Window_GameSelect.new(117,134)
+	else
+		raise "无法分辨的分辨率"
+	end	
+	#======================================================
+	# ENDS HERE
+	#======================================================
+    super
+	end
+  def update
+    @gameselect_window.update
+    super
+  end
+  def handle_game(event)
+    case event
+    when Game_Event::Login
+      require_relative 'scene_lobby'
+      $scene = Scene_Lobby.new
+    else
+      super
+    end
+  end
+  #def terminate
+  #  @gameselect_window.destroy
+  #end
 end
\ No newline at end of file

lib/scene_title.rb

 #encoding: UTF-8
 #==============================================================================
-# �Scene_Title
+# Scene_Title
 #------------------------------------------------------------------------------
-# �title
+# title
 #==============================================================================
 require_relative 'scene'
 require_relative 'widget_inputbox'
@@ -15,8 +15,8 @@ class Scene_Title < Scene
     title = title[rand(title.size)]
     @background = Surface.load(title).display_format
     Surface.blit(@background,0,0,0,0,$screen,0,0)
-    @command_window = Window_Title.new(title["left"] ? 200 : title["right"] ? 600 : 400, 300)
-    @decision_se = Mixer::Wave.load("audio/se/decision.ogg")
+    @command_window = Window_Title.new(title["left"] ? 200 : title["right"] ? 600 : 400, $config['screen']['height']/2-100)
+    @decision_se = Mixer::Wave.load("audio/se/decision.ogg") if SDL.inited_system(INIT_AUDIO) != 0
     super
   end
   def clear(x,y,width,height)
@@ -24,7 +24,7 @@ class Scene_Title < Scene
   end
   def determine
     return unless @command_window.index
-    Mixer.play_channel(-1,@decision_se,0)
+    Mixer.play_channel(-1,@decision_se,0) if SDL.inited_system(INIT_AUDIO) != 0
     case @command_window.index
     when 0
       require_relative 'scene_login'

lib/update.rb

-require 'open-uri'
-require "fileutils"
-require_relative 'card'
-module Update
-<<<<<<< HEAD
-  Version = '0.7.2'
-=======
-  Version = '0.7.0'
->>>>>>> 8031a2a
-  URL = "http://card.touhou.cc/mycard/update.json?version=#{Version}"
-  class <<self
-    attr_reader :thumbnails, :images, :status
-    def start
-      Dir.glob("mycard-update-*-*.zip") do |file|
-        file =~ /mycard-update-(.+?)-(.+?)\.zip/
-        if $1 <= Version and $2 > Version
-          $log.info('安装更新'){file}
-          WM::set_caption("MyCard - 正在更新 #{Version} -> #{$2}", "MyCard")
-          require 'zip/zip'
-          Zip::ZipFile::open(file) do |zip|
-            zip.each do |f|
-              if !File.directory?(f.name)
-                FileUtils.mkdir_p(File.dirname(f.name)) 
-              end
-              f.extract{true}
-            end
-          end rescue $log.error('安装更新出错'){file+$!.inspect+$!.backtrace.inspect}
-          Version.replace $2
-          File.delete file
-          @updated = true
-        end
-      end
-      if @updated
-        IO.popen('./mycard')
-        $scene = nil
-      end
-      @images = []
-      @thumbnails = []
-      
-      @status = '正在检查更新'
-      @updated = false
-      Thread.new do
-        open(URL) do |file|
-          require 'json'
-          reply = file.read
-          $log.info('下载更新-服务器回传'){reply}
-          reply = JSON.parse(reply)
-          $log.info('下载更新-解析后'){reply.inspect}
-          reply.each do |fil|
-            name = File.basename fil
-            @status.replace "正在下载更新#{name}"
-            open(fil, 'rb') do |fi|
-              $log.info('下载完毕'){name}
-              @updated = true
-              open(name, 'wb') do |f|
-                f.write fi.read
-              end
-            end rescue $log.error('下载更新'){'下载更新失败'}
-          end
-        end rescue $log.error('检查更新'){'检查更新失败'}
-        if @updated
-          require_relative 'widget_msgbox'
-          Widget_Msgbox.new('mycard', '下载更新完毕，点击确定重新运行mycard并安装更新', :ok => "确定"){IO.popen('./mycard'); $scene = nil}
-        end
-        if File.file? "ygocore/cards.cdb"
-          require 'sqlite3'
-          db = SQLite3::Database.new( "ygocore/cards.cdb" )
-          db.execute( "select id from datas" ) do |row|
-            @thumbnails << row[0]
-          end
-          @images.replace @thumbnails
-          
-          if !File.directory?('ygocore/pics/thumbnail')
-            FileUtils.mkdir_p('ygocore/pics/thumbnail') 
-          end
-          
-          existed_thumbnails = []
-          Dir.foreach("ygocore/pics/thumbnail") do |file|
-            if file =~ /(\d+)\.jpg/
-              existed_thumbnails << $1.to_i
-            end
-          end
-          @thumbnails -= existed_thumbnails
-          existed_images = []
-          Dir.foreach("ygocore/pics") do |file|
-            if file =~ /(\d+)\.jpg/
-              existed_images << $1.to_i
-            end
-          end
-          @images -= existed_images
-          existed_images = []
-          if (!@images.empty? or !@thumbnails.empty?) and File.file?("#{Card::PicPath}/1.jpg")
-            db_mycard = SQLite3::Database.new( "data/data.sqlite" )
-              
-            db_mycard.execute( "select id, number from `yu-gi-oh` where number in (#{(@images+@thumbnails).uniq.collect{|number|"'%08d'" % number}.join(',')})" ) do |row|
-              id = row[0]
-              number = row[1].to_i
-              src = "#{Card::PicPath}/#{id}.jpg"
-              dest = "ygocore/pics/#{number}.jpg"
-              dest_thumb = "ygocore/pics/thumbnail/#{number}.jpg"
-              if File.file?(src)
-                @status.replace "检测到存在iDuel卡图 正在导入 #{id}.jpg"
-                existed_images << number
-                if !File.exist?(dest)
-                  FileUtils.copy_file(src, dest)
-                  FileUtils.copy_file(src, dest_thumb)
-                end
-              end
-            end
-          end
-          @images -= existed_images
-          @thumbnails -= existed_images
-          @thumbnails = (@thumbnails & @images) + (@thumbnails - @images)
-          unless @thumbnails.empty? and @images.empty?
-            $log.info('待下载的完整卡图'){@images.inspect}
-            $log.info('待下载的缩略卡图'){@thumbnails.inspect}
-            threads = 5.times.collect do 
-              thread = Thread.new do
-                while number = @thumbnails.pop
-                  @status.replace "正在下载缩略卡图 (剩余#{@thumbnails.size}张)"
-                  open("http://card.touhou.cc/images/cards/ygocore/thumbnail/#{number}.jpg", 'rb') do |remote|
-                    next if File.file? "ygocore/pics/thumbnail/#{number}.jpg"
-                    #$log.debug('下载缩略卡图'){"http://card.touhou.cc/images/cards/ygocore/thumbnail/#{number}.jpg 到 ygocore/pics/thumbnail/#{number}.jpg" }
-                    open("ygocore/pics/thumbnail/#{number}.jpg", 'wb') do |local|
-                      local.write remote.read
-                    end
-                  end rescue $log.error('下载缩略出错'){"http://card.touhou.cc/images/cards/ygocore/thumbnail/#{number}.jpg 到 ygocore/pics/thumbnail/#{number}.jpg" }
-                end
-                while number = @images.pop
-                  @status.replace "正在下载完整卡图 (剩余#{@images.size}张)"
-                  #$log.debug('下载完整卡图'){"http://card.touhou.cc/images/cards/ygocore/#{number}.jpg 到 ygocore/pics/#{number}.jpg" }
-                  open("http://card.touhou.cc/images/cards/ygocore/#{number}.jpg", 'rb') do |remote|
-                    next if File.file? "ygocore/pics/#{number}.jpg"
-                    open("ygocore/pics/#{number}.jpg", 'wb') do |local|
-                      local.write remote.read
-                    end
-                  end rescue $log.error('下载完整卡图出错'){"http://card.touhou.cc/images/cards/ygocore/#{number}.jpg 到 ygocore/pics/#{number}.jpg" }
-                end 
-              end
-              thread.priority = -1
-              thread
-            end
-            threads.each{|thread|thread.join}
-          end
-        end rescue $log.error('卡图更新'){'找不到ygocore卡片数据库'}
-        @status = nil
-      end.priority = -1
-    end
-  end
-end
+require 'open-uri'
+require "fileutils"
+require_relative 'card'
+module Update
+  Version = '0.7.3'
+  URL = "http://card.touhou.cc/mycard/update.json?version=#{Version}"
+  class <<self
+    attr_reader :thumbnails, :images, :status
+    def start
+      Dir.glob("mycard-update-*-*.zip") do |file|
+        file =~ /mycard-update-(.+?)-(.+?)\.zip/
+        if $1 <= Version and $2 > Version
+          $log.info('安装更新'){file}
+          WM::set_caption("MyCard - 正在更新 #{Version} -> #{$2}", "MyCard")
+          require 'zip/zip'
+          Zip::ZipFile::open(file) do |zip|
+            zip.each do |f|
+              if !File.directory?(f.name)
+                FileUtils.mkdir_p(File.dirname(f.name)) 
+              end
+              f.extract{true}
+            end
+          end rescue $log.error('安装更新出错'){file+$!.inspect+$!.backtrace.inspect}
+          Version.replace $2
+          File.delete file
+          @updated = true
+        end
+      end
+      if @updated
+        IO.popen('./mycard')
+        $scene = nil
+      end
+      @images = []
+      @thumbnails = []
+      
+      @status = '正在检查更新'
+      @updated = false
+      Thread.new do
+        open(URL) do |file|
+          require 'json'
+          reply = file.read
+          $log.info('下载更新-服务器回传'){reply}
+          reply = JSON.parse(reply)
+          $log.info('下载更新-解析后'){reply.inspect}
+          reply.each do |fil|
+            name = File.basename fil
+            @status.replace "正在下载更新#{name}"
+            open(fil, 'rb') do |fi|
+              $log.info('下载完毕'){name}
+              @updated = true
+              open(name, 'wb') do |f|
+                f.write fi.read
+              end
+            end rescue $log.error('下载更新'){'下载更新失败'}
+          end
+        end rescue $log.error('检查更新'){'检查更新失败'}
+        if @updated
+          require_relative 'widget_msgbox'
+          Widget_Msgbox.new('mycard', '下载更新完毕，点击确定重新运行mycard并安装更新', :ok => "确定"){IO.popen('./mycard'); $scene = nil}
+        end
+        if File.file? "ygocore/cards.cdb"
+          require 'sqlite3'
+          db = SQLite3::Database.new( "ygocore/cards.cdb" )
+          db.execute( "select id from datas" ) do |row|
+            @thumbnails << row[0]
+          end
+          @images.replace @thumbnails
+          
+          if !File.directory?('ygocore/pics/thumbnail')
+            FileUtils.mkdir_p('ygocore/pics/thumbnail') 
+          end
+          
+          existed_thumbnails = []
+          Dir.foreach("ygocore/pics/thumbnail") do |file|
+            if file =~ /(\d+)\.jpg/
+              existed_thumbnails << $1.to_i
+            end
+          end
+          @thumbnails -= existed_thumbnails
+          existed_images = []
+          Dir.foreach("ygocore/pics") do |file|
+            if file =~ /(\d+)\.jpg/
+              existed_images << $1.to_i
+            end
+          end
+          @images -= existed_images
+          existed_images = []
+          if (!@images.empty? or !@thumbnails.empty?) and File.file?("#{Card::PicPath}/1.jpg")
+            db_mycard = SQLite3::Database.new( "data/data.sqlite" )
+              
+            db_mycard.execute( "select id, number from `yu-gi-oh` where number in (#{(@images+@thumbnails).uniq.collect{|number|"'%08d'" % number}.join(',')})" ) do |row|
+              id = row[0]
+              number = row[1].to_i
+              src = "#{Card::PicPath}/#{id}.jpg"
+              dest = "ygocore/pics/#{number}.jpg"
+              dest_thumb = "ygocore/pics/thumbnail/#{number}.jpg"
+              if File.file?(src)
+                @status.replace "检测到存在iDuel卡图 正在导入 #{id}.jpg"
+                existed_images << number
+                if !File.exist?(dest)
+                  FileUtils.copy_file(src, dest)
+                  FileUtils.copy_file(src, dest_thumb)
+                end
+              end
+            end
+          end
+          @images -= existed_images
+          @thumbnails -= existed_images
+          @thumbnails = (@thumbnails & @images) + (@thumbnails - @images)
+          unless @thumbnails.empty? and @images.empty?
+            $log.info('待下载的完整卡图'){@images.inspect}
+            $log.info('待下载的缩略卡图'){@thumbnails.inspect}
+            threads = 5.times.collect do 
+              thread = Thread.new do
+                while number = @thumbnails.pop
+                  @status.replace "正在下载缩略卡图 (剩余#{@thumbnails.size}张)"
+                  open("http://card.touhou.cc/images/cards/ygocore/thumbnail/#{number}.jpg", 'rb') do |remote|
+                    next if File.file? "ygocore/pics/thumbnail/#{number}.jpg"
+                    #$log.debug('下载缩略卡图'){"http://card.touhou.cc/images/cards/ygocore/thumbnail/#{number}.jpg 到 ygocore/pics/thumbnail/#{number}.jpg" }
+                    open("ygocore/pics/thumbnail/#{number}.jpg", 'wb') do |local|
+                      local.write remote.read
+                    end
+                  end rescue $log.error('下载缩略出错'){"http://card.touhou.cc/images/cards/ygocore/thumbnail/#{number}.jpg 到 ygocore/pics/thumbnail/#{number}.jpg" }
+                end
+                while number = @images.pop
+                  @status.replace "正在下载完整卡图 (剩余#{@images.size}张)"
+                  #$log.debug('下载完整卡图'){"http://card.touhou.cc/images/cards/ygocore/#{number}.jpg 到 ygocore/pics/#{number}.jpg" }
+                  open("http://card.touhou.cc/images/cards/ygocore/#{number}.jpg", 'rb') do |remote|
+                    next if File.file? "ygocore/pics/#{number}.jpg"
+                    open("ygocore/pics/#{number}.jpg", 'wb') do |local|
+                      local.write remote.read
+                    end
+                  end rescue $log.error('下载完整卡图出错'){"http://card.touhou.cc/images/cards/ygocore/#{number}.jpg 到 ygocore/pics/#{number}.jpg" }
+                end 
+              end
+              thread.priority = -1
+              thread
+            end
+            threads.each{|thread|thread.join}
+          end
+        end rescue $log.error('卡图更新'){'找不到ygocore卡片数据库'}
+        @status = nil
+      end.priority = -1
+    end
+  end
+end

lib/window_config.rb

-class Window_Config < Window
-  def initialize(x,y)
-    super(x,y,$screen.w, $screen.h)
-    
-    @checkbox = Surface.load('graphics/system/checkbox.png')
-    @button = Surface.load('graphics/system/button.png')
-    @background = Surface.load('graphics/config/background.png').display_format
-    @contents = Surface.load('graphics/config/background.png').display_format
-    @font = TTF.open('fonts/wqy-microhei.ttc', 20)
-    @index = nil
-    
-    @items = {
-      :fullscreen => [200,160,120,WLH],
-      :bgm => [200,160+WLH,120,WLH],
-      :avatar_cache => [200+220, 160+WLH*2,@button.w/3, @button.h],
-      :return => [200,160+WLH*3+10,100,WLH]
-    }
-    refresh
-  end
-  def draw_item(index, status=0)
-    case index
-    when :fullscreen
-      Surface.blit(@checkbox, 20*status, $config['screen']['fullscreen'] ? 20 : 0, 20, 20, @contents, @items[:fullscreen][0],@items[:fullscreen][1])
-      case status
-      when 0
-        @font.draw_blended_utf8(@contents, "全屏模式", @items[:fullscreen][0]+24, @items[:fullscreen][1], 0xFF,0xFF,0xFF)
-      when 1
-        @font.draw_shaded_utf8(@contents, "全屏模式", @items[:fullscreen][0]+24, @items[:fullscreen][1], 0xFF,0xFF,0xFF, 0x11, 0x11, 0x11)
-      when 2
-        @font.draw_shaded_utf8(@contents, "全屏模式", @items[:fullscreen][0]+24, @items[:fullscreen][1], 0x11,0x11,0x11, 0xFF, 0xFF, 0xFF)
-      end
-    when :bgm
-      Surface.blit(@checkbox, 20*status, $config['bgm'] ? 20 : 0, 20, 20, @contents, @items[:bgm][0], @items[:bgm][1])
-      case status
-      when 0
-        @font.draw_blended_utf8(@contents, "BGM", @items[:bgm][0]+24, @items[:bgm][1], 0xFF,0xFF,0xFF)
-      when 1
-        @font.draw_shaded_utf8(@contents, "BGM", @items[:bgm][0]+24, @items[:bgm][1], 0xFF,0xFF,0xFF, 0x11, 0x11, 0x11)
-      when 2
-        @font.draw_shaded_utf8(@contents, "BGM", @items[:bgm][0]+24, @items[:bgm][1], 0x11,0x11,0x11, 0xFF, 0xFF, 0xFF)
-      end
-    when :avatar_cache
-      size = 0
-      count = 0
-      Dir.glob("graphics/avatars/*_*.png") do |file|
-        count += 1
-        size += File.size(file)
-      end
-      @font.draw_blended_utf8(@contents, "头像缓存: #{count}个文件, #{filesize_inspect(size)}", 200, @items[:avatar_cache][1], 0xFF,0xFF,0xFF)
-      Surface.blit(@button, @button.w/3*status, 0, @button.w/3, @button.h, @contents, @items[:avatar_cache][0],@items[:avatar_cache][1])
-      @font.draw_blended_utf8(@contents, "清空", @items[:avatar_cache][0]+10, @items[:avatar_cache][1]+5, 0xFF,0xFF,0xFF)
-    when :return
-      @font.draw_blended_utf8(@contents, "回到标题画面", @items[:return][0],@items[:return][1], 0xFF,0xFF,0xFF)
-    end
-    
-  end
-  def item_rect(index)
-    @items[index]
-  end
-  def index=(index)
-    return if index == @index
-    
-    if @index
-      clear(*item_rect(@index))
-      draw_item(@index, 0) 
-    end
-    if index.nil? or !@items.include? index
-      @index = nil
-    else
-      @index = index
-      clear(*item_rect(@index))
-      draw_item(@index, 1)
-    end
-  end
-  def mousemoved(x,y)
-    self.index = @items.each do |index, item_rect|
-      if x.between?(@x+item_rect[0], @x+item_rect[0]+item_rect[2]) and y.between?(@y+item_rect[1], @y+item_rect[1]+item_rect[3])
-        break index
-      end
-    end
-  end
-  def refresh
-    clear
-    @items.each_key{|index|draw_item(index)}
-  end
-  def clicked
-    case @index
-    when :fullscreen
-      clear(*item_rect(@index))
-      $config['screen']['fullscreen'] = !$config['screen']['fullscreen']
-      $screen.destroy
-      style = HWSURFACE
-      style |= FULLSCREEN if $config['screen']["fullscreen"]
-      $screen = Screen.open($config['screen']["width"], $config['screen']["height"], 0, style)
-      draw_item(@index, 1)
-    when :bgm
-      clear(*item_rect(@index))
-      $config['bgm'] = !$config['bgm']
-      if $config['bgm']
-        $scene = Scene_Config.new
-      else
-        $scene.last_bgm = nil
-        Mixer.fade_out_music(800)
-      end
-      draw_item(@index, 1)
-    when :avatar_cache
-      #clear(*item_rect(@index))
-      Dir.glob("graphics/avatars/*_*.png") do |file|
-        File.delete file
-      end
-      refresh
-      #draw_item(:avatar_cache,1)
-    when :return
-      $scene = Scene_Title.new
-    end
-    save_config
-  end
-  def filesize_inspect(size)
-    case size
-    when 0...1024
-      size.to_s + "B"
-    when 1024...1024*1024
-      (size/1024).to_s + "KB"
-    else
-      (size/1024/1024).to_s + "MB"
-    end
-  end
+class Window_Config < Window
+  def initialize(x,y)
+    super(x,y,$screen.w, $screen.h)
+    
+    @checkbox = Surface.load('graphics/system/checkbox.png')
+    @button = Surface.load('graphics/system/button.png')
+    @background = Surface.load('graphics/config/background.png').display_format
+    @contents = Surface.load('graphics/config/background.png').display_format
+    @font = TTF.open('fonts/wqy-microhei.ttc', 20)
+    @index = nil
+    
+    @items = {
+      :fullscreen => [200,160,120,WLH],
+      :bgm => [200,160+WLH,120,WLH],
+      :avatar_cache => [200+220, 160+WLH*2,@button.w/3, @button.h],
+      :return => [200,160+WLH*3+10,100,WLH]
+    }
+    refresh
+  end
+  def draw_item(index, status=0)
+    case index
+    when :fullscreen
+      Surface.blit(@checkbox, 20*status, $config['screen']['fullscreen'] ? 20 : 0, 20, 20, @contents, @items[:fullscreen][0],@items[:fullscreen][1])
+      case status
+      when 0
+        @font.draw_blended_utf8(@contents, "全屏模式", @items[:fullscreen][0]+24, @items[:fullscreen][1], 0xFF,0xFF,0xFF)
+      when 1
+        @font.draw_shaded_utf8(@contents, "全屏模式", @items[:fullscreen][0]+24, @items[:fullscreen][1], 0xFF,0xFF,0xFF, 0x11, 0x11, 0x11)
+      when 2
+        @font.draw_shaded_utf8(@contents, "全屏模式", @items[:fullscreen][0]+24, @items[:fullscreen][1], 0x11,0x11,0x11, 0xFF, 0xFF, 0xFF)
+      end
+    when :bgm
+      Surface.blit(@checkbox, 20*status, $config['bgm'] ? 20 : 0, 20, 20, @contents, @items[:bgm][0], @items[:bgm][1])
+      case status
+      when 0
+        @font.draw_blended_utf8(@contents, "BGM", @items[:bgm][0]+24, @items[:bgm][1], 0xFF,0xFF,0xFF)
+      when 1
+        @font.draw_shaded_utf8(@contents, "BGM", @items[:bgm][0]+24, @items[:bgm][1], 0xFF,0xFF,0xFF, 0x11, 0x11, 0x11)
+      when 2
+        @font.draw_shaded_utf8(@contents, "BGM", @items[:bgm][0]+24, @items[:bgm][1], 0x11,0x11,0x11, 0xFF, 0xFF, 0xFF)
+      end
+    when :avatar_cache
+      size = 0
+      count = 0
+      Dir.glob("graphics/avatars/*_*.png") do |file|
+        count += 1
+        size += File.size(file)
+      end
+      @font.draw_blended_utf8(@contents, "头像缓存: #{count}个文件, #{filesize_inspect(size)}", 200, @items[:avatar_cache][1], 0xFF,0xFF,0xFF)
+      Surface.blit(@button, @button.w/3*status, 0, @button.w/3, @button.h, @contents, @items[:avatar_cache][0],@items[:avatar_cache][1])
+      @font.draw_blended_utf8(@contents, "清空", @items[:avatar_cache][0]+10, @items[:avatar_cache][1]+5, 0xFF,0xFF,0xFF)
+    when :return
+      @font.draw_blended_utf8(@contents, "回到标题画面", @items[:return][0],@items[:return][1], 0xFF,0xFF,0xFF)
+    end
+    
+  end
+  def item_rect(index)
+    @items[index]
+  end
+  def index=(index)
+    return if index == @index
+    
+    if @index
+      clear(*item_rect(@index))
+      draw_item(@index, 0) 
+    end
+    if index.nil? or !@items.include? index
+      @index = nil
+    else
+      @index = index
+      clear(*item_rect(@index))
+      draw_item(@index, 1)
+    end
+  end
+  def mousemoved(x,y)
+    self.index = @items.each do |index, item_rect|
+      if x.between?(@x+item_rect[0], @x+item_rect[0]+item_rect[2]) and y.between?(@y+item_rect[1], @y+item_rect[1]+item_rect[3])
+        break index
+      end
+    end
+  end
+  def refresh
+    clear
+    @items.each_key{|index|draw_item(index)}
+  end
+  def clicked
+    case @index
+    when :fullscreen
+      clear(*item_rect(@index))
+      $config['screen']['fullscreen'] = !$config['screen']['fullscreen']
+      $screen.destroy
+      style = HWSURFACE
+      style |= FULLSCREEN if $config['screen']["fullscreen"]
+      $screen = Screen.open($config['screen']["width"], $config['screen']["height"], 0, style)
+      draw_item(@index, 1)
+    when :bgm
+      clear(*item_rect(@index))
+      $config['bgm'] = !$config['bgm']
+      if $config['bgm']
+        $scene = Scene_Config.new
+      else
+        $scene.last_bgm = nil
+        Mixer.fade_out_music(800) if SDL.inited_system(INIT_AUDIO) != 0
+      end
+      draw_item(@index, 1)
+    when :avatar_cache
+      #clear(*item_rect(@index))
+      Dir.glob("graphics/avatars/*_*.png") do |file|
+        File.delete file
+      end
+      refresh
+      #draw_item(:avatar_cache,1)
+    when :return
+      $scene = Scene_Title.new
+    end
+    Config.save
+  end
+  def filesize_inspect(size)
+    case size
+    when 0...1024
+      size.to_s + "B"
+    when 1024...1024*1024
+      (size/1024).to_s + "KB"
+    else
+      (size/1024/1024).to_s + "MB"
+    end
+  end
 end
\ No newline at end of file

lib/window_roomlist.rb

-#encoding: UTF-8
-#==============================================================================
-# ■ Window_Roomitems
-#------------------------------------------------------------------------------
-# 　大厅内房间列表
-#==============================================================================
-require_relative 'window_scrollable'
-require_relative 'window_join'
-class Window_RoomList < Window_Scrollable
-	attr_reader :items
-  WLH = 48
-	def initialize(x, y, items)
-    @button = Surface.load('graphics/lobby/room.png')
-    @button.set_alpha(RLEACCEL, 255)
-    #@background = Surface.load 'graphics/lobby/roomitems.png'
-    #@contents = Surface.load 'graphics/lobby/roomitems.png'
-<<<<<<< HEAD
-    super(x,y,@button.w / 3, 48 * 10)
-=======
-    super(x,y,@button.w / 3, ($config['screen']['height'] - 288) / 48 * 48)
->>>>>>> 8031a2a
-    @item_max = 0
-    @font = TTF.open("fonts/wqy-microhei.ttc", 16)
-    @color = [0x03, 0x11, 0x22]
-    @scrollbar = Widget_ScrollBar.new(self,@x+@width,@y,@height)
-    self.items = items
-	end
-
-  def draw_item(index, status=0)
-    y = item_rect(index)[1]
-    room = @items[index]
-    Surface.blit(@button, @width*status, room.full? ? WLH : 0, @width, WLH, @contents, 0, y)
-    @font.draw_blended_utf8(@contents, room.id.to_s, 24, y+8, *@color)
-    @font.draw_blended_utf8(@contents, room.full? ? "【决斗中】" : room.private? ? "【私密房】" : "【等待中】", 8, y+24, *@color)
-    @font.draw_blended_utf8(@contents, room.name, 128, y+8, *room.color) unless room.name.empty? or room.name.size > 100
-    $log.error('标题过长') {room.name} if room.name.size > 100
-    @font.draw_blended_utf8(@contents, room.player1.name, 128, y+24, *room.player1.color) if room.player1 and !room.player1.name.empty?
-    @font.draw_blended_utf8(@contents, room.player2.name, 320, y+24, *room.player2.color) if room.player2 and !room.player2.name.empty?
-    room.extra.each_with_index do |extra, index|
-      str, color = extra
-      @font.draw_blended_utf8(@contents, str, 300+index*96, y+8, *color)
-    end
-  end
-  def update
-    @join_window.update if @join_window and !@join_window.destroyed?
-  end
-  def mousemoved(x,y)
-    return unless self.include?(x,y)
-    self.index = (y - @y) / WLH + @scroll
-  end
-  def clicked
-    return unless @index and room = @items[@index]
-    if room.full?
-      @joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入观战")
-      $game.watch room
-    else
-      if room.private
-        @join_window = Window_Join.new(0,0,room)
-      else
-        @joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入房间")
-        $game.join room
-      end
-    end
-  end
+#encoding: UTF-8
+#==============================================================================
+# ■ Window_Roomitems
+#------------------------------------------------------------------------------
+# 　大厅内房间列表
+#==============================================================================
+require_relative 'window_scrollable'
+require_relative 'window_join'
+class Window_RoomList < Window_Scrollable
+	attr_reader :items
+  WLH = 48
+	def initialize(x, y, items)
+    @button = Surface.load('graphics/lobby/room.png')
+    @button.set_alpha(RLEACCEL, 255)
+    #@background = Surface.load 'graphics/lobby/roomitems.png'
+    #@contents = Surface.load 'graphics/lobby/roomitems.png'
+    super(x,y,@button.w / 3, ($config['screen']['height'] - 288) / 48 * 48)
+    @item_max = 0
+    @font = TTF.open("fonts/wqy-microhei.ttc", 16)
+    @color = [0x03, 0x11, 0x22]
+    @scrollbar = Widget_ScrollBar.new(self,@x+@width,@y,@height)
+    self.items = items
+	end
+
+  def draw_item(index, status=0)
+    y = item_rect(index)[1]
+    room = @items[index]
+    Surface.blit(@button, @width*status, room.full? ? WLH : 0, @width, WLH, @contents, 0, y)
+    @font.draw_blended_utf8(@contents, room.id.to_s, 24, y+8, *@color)
+    @font.draw_blended_utf8(@contents, room.full? ? "【决斗中】" : room.private? ? "【私密房】" : "【等待中】", 8, y+24, *@color)
+    @font.draw_blended_utf8(@contents, room.name, 128, y+8, *room.color) unless room.name.empty? or room.name.size > 100
+    $log.error('标题过长') {room.name} if room.name.size > 100
+    @font.draw_blended_utf8(@contents, room.player1.name, 128, y+24, *room.player1.color) if room.player1 and !room.player1.name.empty?
+    @font.draw_blended_utf8(@contents, room.player2.name, 320, y+24, *room.player2.color) if room.player2 and !room.player2.name.empty?
+    room.extra.each_with_index do |extra, index|
+      str, color = extra
+      @font.draw_blended_utf8(@contents, str, 300+index*96, y+8, *color)
+    end
+  end
+  def update
+    @join_window.update if @join_window and !@join_window.destroyed?
+  end
+  def mousemoved(x,y)
+    return unless self.include?(x,y)
+    self.index = (y - @y) / WLH + @scroll
+  end
+  def clicked
+    return unless @index and room = @items[@index]
+    if room.full?
+      @joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入观战")
+      $game.watch room
+    else
+      if room.private
+        @join_window = Window_Join.new(0,0,room)
+      else
+        @joinroom_msgbox = Widget_Msgbox.new("加入房间", "正在加入房间")
+        $game.join room
+      end
+    end
+  end
 end
\ No newline at end of file

lib/window_title.rb

-require_relative 'window_list'
-class Window_Title < Window_List
-  Button_Count = 5
-  WLH = 50
-  attr_reader :x, :y, :width, :height, :single_height, :index
-  def initialize(x,y)
-    @button = Surface.load("graphics/system/titlebuttons.png")
-    @button.set_alpha(RLEACCEL,255)
-    @single_height = @button.h / Button_Count
-    super(x,y,@button.w / 3,WLH * Button_Count - (WLH - @button.h / Button_Count))
-    @cursor_se = Mixer::Wave.load 'audio/se/cursor.ogg'
-    self.items = [:决斗开始, :单人模式, :卡组编成, :选项设置, :退出游戏]
-  end
-  def index=(index)
-    if index and @index != index
-      Mixer.play_channel(-1,@cursor_se,0)
-    end
-    super
-  end
-  def mousemoved(x,y)
-    self.index = (y - @y) / WLH
-  end
-  def draw_item(index, status=0)
-    Surface.blit(@button, @width*status, @single_height*index, @width, @single_height, @contents, 0, WLH*index)
-  end
-  def clicked
-    $scene.determine if $scene.is_a? Scene_Title
-  end
-  def clear(x=0,y=0,width=@width,height=@height)
-    @contents.fill_rect(x,y,width, height, 0x00000000)
-  end
+require_relative 'window_list'
+class Window_Title < Window_List
+  Button_Count = 5
+  WLH = 50
+  attr_reader :x, :y, :width, :height, :single_height, :index
+  def initialize(x,y)
+    @button = Surface.load("graphics/system/titlebuttons.png")
+    @button.set_alpha(RLEACCEL,255)
+    @single_height = @button.h / Button_Count
+    super(x,y,@button.w / 3,WLH * Button_Count - (WLH - @button.h / Button_Count))
+    @cursor_se = Mixer::Wave.load 'audio/se/cursor.ogg' if SDL.inited_system(INIT_AUDIO) != 0
+    self.items = [:决斗开始, :单人模式, :卡组编成, :选项设置, :退出游戏]
+  end
+  def index=(index)
+    if index and @index != index
+      Mixer.play_channel(-1,@cursor_se,0) if SDL.inited_system(INIT_AUDIO) != 0
+    end
+    super
+  end
+  def mousemoved(x,y)
+    self.index = (y - @y) / WLH
+  end
+  def draw_item(index, status=0)
+    Surface.blit(@button, @width*status, @single_height*index, @width, @single_height, @contents, 0, WLH*index)
+  end
+  def clicked
+    $scene.determine if $scene.is_a? Scene_Title
+  end
+  def clear(x=0,y=0,width=@width,height=@height)
+    @contents.fill_rect(x,y,width, height, 0x00000000)
+  end
 end
\ No newline at end of file

lib/ygocore/game.rb

@@ -208,7 +208,7 @@ class Ygocore < Game
             announcements << Announcement.new(title, @@config['index'], nil)
           end
           $config['ygocore']['announcements'].replace announcements
-          save_config
+          Config.save
         end
       rescue Exception => exception
         $log.error('公告读取失败') { [exception.inspect, *exception.backtrace].collect { |str| str.encode("UTF-8") }.join("\n") }

lib/ygocore/window_login.rb

-class Window_Login
-  def clicked
-    return if @last_clicked and Time.now - @last_clicked < 3 #防止重复点击
-    case @index
-    when :login
-      Widget_Msgbox.new("ygocore", "正在登录")
-      $scene.draw #强制重绘一次，下面会阻塞
-      $game = Ygocore.new
-      $config[$config['game']]['username'] = @username_inputbox.value
-      $config[$config['game']]['password'] = @remember_password.checked? ? @password_inputbox.value : nil
-      save_config
-      $game.login(@username_inputbox.value, @password_inputbox.value)
-      @last_clicked = Time.now
-    when :register
-      Ygocore.register
-      @last_clicked = Time.now
-    when :replay
-      file = Dialog.get_open_file("播放录像", "ygocore录像 (*.yrp)" => "*.yrp")
-      if !file.empty? and File.file? file
-        Ygocore.replay file
-      end
-      @last_clicked = Time.now
-    end
-  end
+class Window_Login
+  def clicked
+    return if @last_clicked and Time.now - @last_clicked < 3 #防止重复点击
+    case @index
+    when :login
+      Widget_Msgbox.new("ygocore", "正在登录")
+      $scene.draw #强制重绘一次，下面会阻塞
+      $game = Ygocore.new
+      $config[$config['game']]['username'] = @username_inputbox.value
+      $config[$config['game']]['password'] = @remember_password.checked? ? @password_inputbox.value : nil
+      Config.save
+      $game.login(@username_inputbox.value, @password_inputbox.value)
+      @last_clicked = Time.now
+    when :register
+      Ygocore.register
+      @last_clicked = Time.now
+    when :replay
+      file = Dialog.get_open_file("播放录像", "ygocore录像 (*.yrp)" => "*.yrp")
+      if !file.empty? and File.file? file
+        Ygocore.replay file
+      end
+      @last_clicked = Time.now
+    end
+  end
 end
\ No newline at end of file