版本0.3.9

.gitignore

 /nbproject/
 /ruby/
 /pkg/
+/config.yml
 /log.log
-/err.log
+/profile.log
 /replay/
 /mycard/
 /mycard.exe

Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 require 'rake/clean'
 require 'rake/gempackagetask'
-#require 'rake/rdoctask'
+require 'rake/rdoctask'
 #require 'rake/testtask'
 
 Windows = RUBY_PLATFORM["mingw"] || RUBY_PLATFORM["mswin"]
 spec = Gem::Specification.new do |s|
   s.name = 'mycard'
-  s.version = '0.3.8'
+  s.version = '0.3.9'
   s.extra_rdoc_files = ['README.txt', 'LICENSE.txt']
   s.summary = 'a card game'
   s.description = s.summary
@@ -16,7 +16,7 @@ spec = Gem::Specification.new do |s|
   s.email = 'zh99998@gmail.com'
   s.homepage = 'http://card.touhou,cc'
   # s.executables = ['your_executable_here']
-  s.files = %w(LICENSE.txt README.txt config.yml replay) + Dir.glob("{lib,audio,data,fonts,graphics}/**/*")
+  s.files = %w(LICENSE.txt README.txt replay) + Dir.glob("{lib,audio,data,fonts,graphics}/**/*")
   if Windows
     s.files += %w(mycard.exe) + Dir.glob("{ruby}/**/*")
   else
@@ -36,4 +36,13 @@ Rake::GemPackageTask.new(spec) do |p|
   end
 end
 
-CLOBBER.include %w(log.log) + Dir.glob("{replay}/**/*") + Dir.glob("**/Thumbs.db") + Dir.glob("graphics/avatars/*_*.png")
+Rake::RDocTask.new do |rdoc|
\ No newline at end of file
+  files =['README.txt', 'LICENSE.txt', 'lib/**/*.rb']
+  rdoc.rdoc_files.add(files)
+  rdoc.main = "README.txt" # page to start on
+  rdoc.title = "Mycard Docs"
+  rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
+  rdoc.options << '--line-numbers'
+end
+
+CLOBBER.include %w(log.log profile.log config.yml doc) + Dir.glob("{replay}/**/*") + Dir.glob("**/Thumbs.db") + Dir.glob("graphics/avatars/*_*.png")
\ No newline at end of file

config.yml

---- 
-fullscreen: false
-width: 1024
-height: 768
-autologin: true
-username: zh99997
-password: "111111"

lib/action.rb

@@ -692,6 +692,18 @@ class Action
       end
     end
   end
+  class CardInfo < Action
+    def initialize(card, card_type, atk, _def, attribute, type, level, lore)
+      card.card_type = card_type
+      card.monster_type = monster_type
+      card.atk = atk
+      card.def = _def
+      card.attribute = attribute
+      card.type = type
+      card.level = level
+      card.lore = lore
+    end
+  end
   class Unknown < Action
     def initialize(str)
       @str = str

lib/card.rb

 #encoding: UTF-8
-#==============================================================================
-# ■ Scene_Login
-#------------------------------------------------------------------------------
-# 　login
-#==============================================================================
+#==Card Model
 class Card
 	require 'sqlite3'
 	@db = SQLite3::Database.new( "data/data.sqlite" )
-	@all = []
+	@all = {}
+  @diy = {}
 	@count = @db.get_first_value("select COUNT(*) from YGODATA") rescue 0
 	@db.results_as_hash = true
-	#PicPath = '/media/44CACC1DCACC0D5C/game/yu-gi-oh/YGODATA/YGOPIC'
-  PicPath = 'E:/game/yu-gi-oh/YGODATA/YGOPIC'
+  PicPath = if RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
+    require 'win32/registry'
+    Win32::Registry::HKEY_CURRENT_USER.open('Software\OCGSOFT\Cards'){|reg|reg['Path']} rescue ''
+  else
+    '' #其他操作系统卡图存放位置标准尚未制定。
+  end
   CardBack = Surface.load("graphics/field/card.jpg").display_format
   CardBack_Small = Surface.load("graphics/field/card_small.gif").display_format
-
 	class << self
 		def find(id, order_by=nil)
       case id
@@ -22,7 +22,11 @@ class Card
         @all[id] || old_new(@db.get_first_row("select * from YGODATA where id = #{id}"))
       when Symbol
 				row = @db.get_first_row("select * from YGODATA where name = '#{id}'")
-        (row && (@all[row['id'].to_i] || old_new(row))) || Card.new('id' => 0, 'number' => :"00000000", 'name' => id, 'card_type' => :通常怪兽, 'stats' => "", 'archettypes' => "", 'mediums' => "", 'lore' => "")
+        if row
+          @all[row['id'].to_i] || old_new(row)
+        else
+          @diy[id] ||= Card.new('id' => 0, 'number' => :"00000000", 'name' => id, 'card_type' => :通常怪兽, 'stats' => "", 'archettypes' => "", 'mediums' => "", 'lore' => "")
+        end
       when Hash
         old_new(id)
       when nil
@@ -185,9 +189,9 @@ class Card
   def token?
     @token
   end
-  #def inspect
-  #  "[#{card_type}][#{name}]"
-  #end
+  def inspect
+    "[#{card_type}][#{name}]"
+  end
   Unknown = Card.new('id' => 0, 'number' => :"00000000", 'name' => "", 'lore' => '', 'card_type' => :通常怪兽, 'stats' => "", 'archettypes' => "", 'mediums' => "")
   Unknown.instance_eval{@image = CardBack; @image_small = CardBack_Small}
 end
\ No newline at end of file

lib/iduel/action.rb

 #encoding: UTF-8
-#这个文件iduel和nbx相同，编辑时推荐使用软/硬链接来保持一致
 class Action
-  CardFilter = /(<?\[?Token[ \\\d]*\]?>?|<?(?:\[.*?\])?\[(?:.*?)\][ \d]*>?|一张怪兽卡|一张魔\/陷卡|一张卡|\?\?)/
-  PosFilter = /((?:手卡|手牌|场上|魔陷区|怪兽区|墓地|墓地\|,,,,,\|\*\:\d+张\:\*|额外牌堆|除外区|卡组|卡组顶端|\(\d+\)){1,2})/
-  PositionFilter = /(表攻|表守|里守|攻击表示|防守表示|里侧表示|背面守备表示)/
-  PhaseFilter = /(抽卡`阶段|准备`阶段|主`阶段1|战斗`阶段|主`阶段2|结束`阶段)/
-  CountersFilter = /(?:\()?(\d+)?(?:\))?/
-  FieldFilter = /(?:LP:(\d+)\n手卡(?:数)?:(\d+)\n卡组:(\d+)\n墓地:(\d+)\n除外:(\d+)\n前场:\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n后场:<(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?>\n场地\|<(?:无|#{CountersFilter}#{CardFilter})>\n(?:◎|●)→＼＼)/
+  CardFilter = /(<?\[?Token[ \\\d]*\]?>?|<?(?:\[.*?\])?\[(?:.*?)\][ \d？]*>?|一张怪兽卡|一张魔\/陷卡|一张卡|\?\?)/.to_s
+  PosFilter = /((?:手卡|手牌|场上|魔陷区|怪兽区|墓地|墓地\|,,,,,\|\*\:\d+张\:\*|额外牌堆|除外区|卡组|卡组顶端|\(\d+\)){1,2})/.to_s
+  PositionFilter = /(表攻|表守|里守|攻击表示|防守表示|里侧表示|背面守备表示)/.to_s
+  PhaseFilter = /(抽卡`阶段|准备`阶段|主`阶段1|战斗`阶段|主`阶段2|结束`阶段)/.to_s
+  CountersFilter = /(?:\()?(\d+)?(?:\))?/.to_s
+  FieldFilter = /(?:LP:(\d+)\n手卡(?:数)?:(\d+)\n卡组:(\d+)\n墓地:(\d+)\n除外:(\d+)\n前场:\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n     <(?:#{CountersFilter}#{PositionFilter}\|#{CardFilter})?>\n后场:<(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?><(?:#{CountersFilter}#{CardFilter})?>\n场地\|<(?:无|#{CountersFilter}#{CardFilter})>\n(?:◎|●)→＼＼)/.to_s
   def self.parse_pos(pos)
     if index = pos.index("(")
       index += 1
@@ -174,6 +173,7 @@ class Action
     counters.to_i
   end
   def self.parse(str)
+    #TODO:效率优化
     from_player = nil
     case str
     when /^\[(\d+)\] (.*)$/m
@@ -181,8 +181,14 @@ class Action
       result = case $2
       when /^┊(.*)┊$/m
         Chat.new from_player, $1
-      when /^※\[(.*)\]\n(.*)\n注释$/m
-        Note.new from_player, $2, Card.find($1.to_sym)
+      when /^※\[(.*)\]\n(.*)\n注释.*$/m
+        card = Card.find($1)
+        case $2 
+        when /(.+怪兽),种族：(.+),属性：(.+),星级：(\d+),攻击：(\d+|？),防御：(\d+|？),效果：(.+)/
+          CardInfo.new(card, $1.to_sym, $5 == "？" ? nil : $5.to_i, $6 == "？" ? nil : $6.to_i, $3.to_sym, $2.to_sym, $4.to_sym, $7)
+        when /(魔法|陷阱)种类：(.+),效果：(.+)/
+          CardInfo.new(($2+$1).to_sym, nil, nil, nil, nil, nil, $3)
+        end
       when /^※(.*)$/
         Chat.new from_player, $1
       when /^(◎|●)→=\[0:0:0\]==回合结束==<(\d+)>=\[\d+\]\n#{FieldFilter}(.*)$/ #把这货弄外面的原因是因为这个指令里开头有一个●→，后面还有，下面判msg的正则会判错
@@ -262,7 +268,7 @@ class Action
         when /第(\d+)张手牌为:#{CardFilter}/
           Show.new(from_player, $1.to_i+10, parse_card($2))
         when /\|--\+>手卡:(?:\[#{CardFilter}\])*/
-          MultiShow.new from_player, :hand, $&.scan(CardFilter).collect{|matched|parse_card(matched.first)}
+          MultiShow.new from_player, :hand, $&.scan(/#{CardFilter}/).collect{|matched|parse_card(matched.first)}
         when /^(?:(\d+)#{CardFilter}\n?)+$/
           from_pos = 71
           cards = $&.lines.collect do |line|
@@ -318,7 +324,7 @@ class Action
           when "加入手卡"
             :hand
           end
-          cards = $&.scan(CardFilter).collect{|matched|parse_card matched.first}
+          cards = $&.scan(/#{CardFilter}/).collect{|matched|parse_card matched.first}
           MultiMove.new(from_player, from_pos, to_pos, cards)
         when /己方#{PosFilter}#{CardFilter}送入对手墓地/
           SendToOpponentGraveyard.new(from_player, parse_pos($1), parse_card($2))

lib/main.rb

 #!/usr/bin/env ruby
 #encoding: UTF-8
-GC.disable
+
 begin
   #读取配置文件
   require 'yaml'
-  $config = YAML.load_file("config.yml")
+  $config = YAML.load_file("config.yml") rescue {}
+  $config['width'] ||= 1024
+  $config['height'] ||= 768
+  File.open("config.yml","w"){|config| YAML.dump($config, config)}
   
   #读取命令行参数
   log = "log.log"
+  profile = nil
   ARGV.each do |arg|
     case arg
     when /--log=(.*)/
       log.replace $1
+    when /--profile=(.*)/
+      profile = $1
     end
   end
 
@@ -25,18 +31,35 @@ begin
   Mixer.open(Mixer::DEFAULT_FREQUENCY,Mixer::DEFAULT_FORMAT,Mixer::DEFAULT_CHANNELS,512)
   TTF.init
   
-  #初始化标题场景
-  require_relative 'scene_title'
-  $scene = Scene_Title.new
+  #设置标准输出编码（windows)
+  STDOUT.set_encoding "GBK", "UTF-8", :invalid => :replace, :undef => :replace if RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
   
   #初始化日志
   require 'logger'
   if log == "STDOUT" #调试用
     log = STDOUT
-    log.set_encoding "GBK", "UTF-8", :invalid => :replace, :undef => :replace if RUBY_PLATFORM["win"] || RUBY_PLATFORM["ming"]
   end
   $log = Logger.new(log)
   $log.info("main"){"初始化成功"}
+  
+  #性能分析
+  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'
+  $scene = Scene_Title.new
 rescue Exception => exception
   open('error-程序出错请到论坛反馈.txt', 'w'){|f|f.write [exception.inspect, *exception.backtrace].join("\n")}
   exit(1)
@@ -53,6 +76,9 @@ rescue Exception => exception
   $scene = Scene_Error.new
   retry
 ensure
-  #(Thread.list-[Thread.main]).each{|t|t.exit} #消灭其他
+  if profile
+    Profiler__::print_profile(profile)
+    profile.close
+  end
   $log.close
 end
\ No newline at end of file

lib/window.rb

 class Window
   WLH = 24
-  attr_accessor :x, :y, :width, :height, :z, :contents, :angle, :visible, :viewport
+  attr_accessor :x, :y, :width, :height, :z, :contents, :visible, :viewport
   alias visible? visible
   def initialize(x, y, width, height, z=200)
     @x = x
@@ -9,7 +9,7 @@ class Window
     @width = width
     @height = height
     @visible = true
-    @angle = 0
+    #@angle = 0
     @viewport = [0, 0, @width, @height]
     @destroyed = false
     amask = 0xff000000
@@ -42,15 +42,8 @@ class Window
     @destroyed
   end
   def draw(screen)
-    if self.contents && self.visible && !self.destroyed?
-      if self.angle.zero?
-        Surface.blit(self.contents, self.viewport[0], self.viewport[1], self.viewport[2] ,self.viewport[3], screen, self.x, self.y) #直接用*self.viewport，netbeans老给我报错....
-      else
-        contents = self.contents.transform_surface(0x66000000,180,1,1,0)
-        Surface.blit(contents, self.viewport[0], self.viewport[1], self.viewport[2] ,self.viewport[3], screen, self.x, self.y)
-        #Surface.transform_blit(window.contents,$screen,0,1,1,100,100,100,100,Surface::TRANSFORM_AA)#,0,0)
-      end
-    end
+    return unless self.contents && self.visible? && !self.destroyed?
+    Surface.blit(self.contents, *self.viewport, screen, self.x, self.y)
   end
   def clear(x=0, y=0, width=@width, height=@height)
     if $scene and $scene.background

lib/window_login.rb

@@ -8,10 +8,10 @@ class Window_Login < Window
     @button = Surface.load("graphics/login/button.png")
     super(x,y,597,338)
     @username_inputbox = Widget_InputBox.new(@x+192, @y+80, 165, WLH)
-    @username_inputbox.value = @username if @username
+    @username ? @username_inputbox.value = @username : @username_inputbox.refresh
     @password_inputbox = Widget_InputBox.new(@x+192, @y+125, 165, WLH)
     @password_inputbox.type = :password
-    @password_inputbox.value = @password if @password
+    @password ? @password_inputbox.value = @password : @password_inputbox.refresh
     @color = [255,255,255]
     @color_stroke = [0,0,0]
     @font = TTF.open("fonts/WenQuanYi Micro Hei.ttf", 16)