临时提交，不能用

config.yml

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

iduel.cmd

 cd /d %~dp0
 echo ------------------ >> log.txt
 echo ------------------ >> err.txt
-ruby\bin\ruby lib/main.rb >> log.txt 2>> err.txt
+ruby\bin\ruby lib/main.rb 0>>log.txt 2>>err.txt
\ No newline at end of file

lib/fpstimer.rb

@@ -31,10 +31,10 @@ class FPSTimer
     #yield
     nxt = @old + @spf
     #now = 
-    yield if nxt > Time.now.to_f
-    if (sleeptime = nxt - Time.now.to_f) > 0
-      sleep(sleeptime)
-    end
+    yield# if nxt > Time.now.to_f
+    #if (sleeptime = nxt - Time.now.to_f) > 0
+      sleep(0.01)
+    #end
     #end
     @old = nxt
     calc_real_fps

lib/main.rb

@@ -37,7 +37,6 @@ $screen = Screen.open($config["width"], $config["height"], 0, style)
 TTF.init
 
 Mixer.open(Mixer::DEFAULT_FREQUENCY,Mixer::DEFAULT_FORMAT,Mixer::DEFAULT_CHANNELS,512)
-
 require_relative 'scene'
 require_relative 'window'
 require_relative 'window_list'
@@ -45,6 +44,8 @@ require_relative 'window_user'
 require_relative 'scene_title'
 require_relative 'fpstimer'
 require_relative 'widget_msgbox'
+#4.times{Thread.new{loop{sleep 0.01}}}
+Thread.current.priority=20
 $fpstimer = FPSTimer.new
 $scene = Scene_Title.new
 begin

lib/nbx.rb

@@ -4,36 +4,86 @@ class NBX < Iduel
   Version = "20090622"
   Port=2583
   RS = "\xA1\xE9".force_encoding "GBK"
-  attr_accessor :user
+  attr_accessor :user, :room
   def initialize
     require 'socket'
     require 'digest/md5'
     require 'open-uri'
-    #require_relative 'iduel_action'
+    require_relative 'nbx_action'
     require_relative 'nbx_event'
     require_relative 'nbx_user'
-    #require_relative 'iduel_room'
+    require_relative 'nbx_room'
 
     @conn_hall = UDPSocket.new
     @conn_hall.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
     @conn_hall.bind('0.0.0.0', Port)
-    @recv = Thread.new { recv *@conn_hall.recvfrom(1024) while @conn_hall }
+    @recv_hall = Thread.new { recv *@conn_hall.recvfrom(1024) while @conn_hall }
     Thread.abort_on_exception = true
   end
   def send(user, head, *args)
-    @conn_hall.send("#{head}|#{args.join(',')}", 0, user ? user.host : '<broadcast>', Port)
+    case user
+    when NBX::User  #大厅里给特定用户的回复
+      @conn_hall.send("#{head}|#{args.join(',')}", 0, user.host, Port)
+    when nil #大厅里的广播
+      @conn_hall.send("#{head}|#{args.join(',')}", 0, '<broadcast>', Port)
+    when :room #房间里，发给对手和观战者
+      @conn_room.write(head.encode("GBK") + RS)
+    when :watchers #房间里，发给观战者
+      
+    end
+    
   end
+
   def login(username)
-    send(nil, 'USERONLINE', username, 1)
     @user = User.new(username, 'localhost')
+    send(nil, 'USERONLINE', username, 1)
+  end
+  def host
+    @room = NBX::Room.new(@user)
+    #p @room
+    #if room.player2
+    #  @conn_hall.send(nil, "SingleRoomInfo", room.player1.name,room.player2.name, room.player2.host)
+    #else
+    send(nil, "SingleRoomInfo", @room.player1.name)
+    #end
+    @conn_room_server = TCPServer.new '0.0.0.0', Port  #为了照顾NBX强制IPv4
+    
+    @accept_room = Thread.new{Thread.start(@conn_room_server.accept) {|client| accept(client)} while @conn_room_server}
+  end
+  def accept(client)
+    if @conn_room #如果已经连接了，进入观战
+      
+    else #连接
+      @conn_room = client
+      @conn_room.set_encoding "GBK"
+      send(:room, "[LinkOK]|#{Version}")
+      send(:room, "▓SetName:#{@user.name}▓")
+      send(:room, "[☆]开启 游戏王NetBattleX Version  2.7.0\r\n[10年3月1日禁卡表]\r\n▊▊▊E8CB04")
+      @room.player2 = User.new("对手", client.addr[2])
+      while info = @conn_room.gets(RS)
+        recv_room(info)
+      end
+      @conn_room.close
+      #send(:room, "▓SetName:zh▓") #原版协议里还要重复声明一次名字，不过似乎没什么用处，就给省略了
+    end
+  end
+  def recv_room(info)
+    info.chomp!(RS)    
+    info.encode! "UTF-8", :invalid => :replace, :undef => :replace
+    puts ">> #{info}"
+    Event.push Event.parse info
+  end
+  def refresh
+    send(nil, 'USERONLINE', @user.name, 1)
   end
   def connect(server, port=Port)
     #@conn = TCPSocket.open(server, port)
     #@conn.set_encoding "GBK"
-    #@recv = Thread.new { recv @conn.gets(RS) while @conn  }
+    #@recv_hall = Thread.new { recv @conn.gets(RS) while @conn  }
   end
   
   def recv(info, addrinfo)
+    puts ">> #{info} -- #{addrinfo[2]}"
     Socket.ip_address_list.each do |localhost_addrinfo|
       if localhost_addrinfo.ip_address == addrinfo[3]
         addrinfo[2] = 'localhost'

lib/nbx_action.rb

+require_relative 'iduel_action' #偷懒MODE ON
+class NBX::Action < Iduel::Action
+  
+end
\ No newline at end of file

lib/nbx_event.rb

@@ -8,23 +8,89 @@ class NBX::Event
   def self.poll
     @queue.shift
   end
-  def self.parse(info, host)
-    info =~ /^([A-Z]*)\|(.*)$/m
-    case $1
-    when "USERONLINE"
-      NBX::Event::USERONLINE
-    when "Query"
-    end.new($2, host)
+  def self.parse(info, host=nil)
+    if host #来自大厅的udp消息
+      info =~ /^(\w*)\|(.*)$/m
+      case $1
+      when "USERONLINE"
+        NBX::Event::USERONLINE
+      when "SingleRoomInfo"
+        NBX::Event::SingleRoomInfo
+      end.new($2, host)
+    else #来自房间的消息
+      case info
+      when /▓SetName:(.*)▓/
+        NBX::Event::SetName
+      when /\[VerInf\]\|(.*)/
+        NBX::Event::VerInf
+      when /(\[☆\]开启 游戏王NetBattleX Version  .*\r\n\[.*年.*月.*日禁卡表\]\r\n)▊▊▊.*/
+        NBX::Event::Connect
+      when /关闭游戏王NetBattleX  .*▊▊▊.*/
+        NBX::Event::DisConnect
+      when /(\[\d+\] .*▊▊▊.*)/m
+        NBX::Event::Action
+      else
+        p '------unkonwn nbx event--------'
+        p info
+      end.new($1)
+    end
   end
 end
+
 class NBX::Event::USERONLINE < NBX::Event
   attr_reader :user#, :session
   def initialize(info, host)
-    
     username, need_reply = info.split(',')
     @user = NBX::User.new(username, host)
     @need_reply = need_reply == "1"
-    p info, need_reply, @need_reply, @need_reply and @user != $nbx.user
-    $nbx.send(@user, 'USERONLINE', $nbx.user.name) if @need_reply and @user != $nbx.user
+    if @need_reply and @user != $nbx.user
+      $nbx.send(@user, 'USERONLINE', $nbx.user.name) 
+      if $nbx.room and $nbx.room.player1 == $nbx.user #如果自己是主机
+        if $nbx.room.player2
+          $nbx.send(@user, "SingleRoomInfo", $nbx.room.player1.name,$nbx.room.player2.name, $nbx.room.player2.host)
+        else
+          $nbx.send(@user, "SingleRoomInfo", $nbx.room.player1.name)
+        end
+      end
+    end
+  end
+end
+class NBX::Event::RoomConnect
+  attr_reader :user
+  def initialize(info, host)
+    @user = NBX::User.new(info, host)
+    $nbx.room.player2 = @user
+  end
+end
+class NBX::Event::SingleRoomInfo < NBX::Event
+  attr_reader :room
+  def initialize(info, host)
+    player1_name, player2_name, player2_host = info.split(',')
+    player1 = NBX::User.new(player1_name, host)
+    player2 = NBX::User.new(player2_name, player2_host) if player2_name
+    @room = NBX::Room.new(player1, player2)
+  end
+end
+
+class NBX::Event::SetName < NBX::Event
+  def initialize(info)
+    $nbx.room.player2.name = info
+  end
+end
+class NBX::Event::VerInf < NBX::Event
+  def initialize(info)
+  end
+end
+class NBX::Event::Connect < NBX::Event
+  def initialize(info)
+  end
+end
+class NBX::Event::DisConnect < NBX::Event
+  def initialize(info)
+  end
+end
+class NBX::Event::Action < NBX::Event
+  def initialize(info)
+    @action = ::Action.parse info
   end
 end
\ No newline at end of file

lib/nbx_room.rb

+class NBX::Room
+  @@all = []
+  attr_accessor :player1, :player2
+  class << self
+    alias old_new new
+    def new(player1, player2=nil)
+      room = @@all.find{|room| room.player1 == player1 }
+      if room
+        room
+      else
+        room = old_new(player1, player2)
+        @@all << room
+        room
+      end
+    end
+  end
+  def initialize(player1, player2=nil)
+    @player1 = player1
+    @player2 = player2
+  end
+  def id
+    player1.host
+  end
+  def name
+    player1.name
+  end
+  def color
+    [0,0,0]
+  end
+  def private?
+    false
+  end
+  alias full? player2
+end
\ No newline at end of file

lib/nbx_user.rb

@@ -18,7 +18,10 @@ class NBX::User
     @name = name
     @host = host
   end
-  def avatar(size)
+  def status
+    :waiting
+  end
+  def avatar(size=:small)
     Surface.new(SWSURFACE, 1, 1, 32, 0,0,0,0)
   end
 end
\ No newline at end of file

lib/scene.rb

@@ -47,7 +47,9 @@ class Scene
   # ● 更新画面
   #--------------------------------------------------------------------------
   def update
+    #p Thread.list
     while event = Event.poll
+      p event
       handle(event)
     end
     #@fps.clear(0,0,100,24)

lib/scene_config.rb

+#encoding: UTF-8
 #==============================================================================
 # ■ Scene_Config
 #------------------------------------------------------------------------------

lib/scene_duel.rb

@@ -28,7 +28,7 @@ class Scene_Duel < Scene
 		@room = room
   end
   def start
-    $iduel.upinfo
+    $iduel.upinfo if $iduel
     @bgm = Mixer::Music.load "audio/bgm/title.ogg"
     Mixer.fade_in_music(@bgm, 8000, -1)
     @background = Surface.load "graphics/field/main.png"
@@ -55,6 +55,8 @@ class Scene_Duel < Scene
     @action_window = Window_Action.new
     @chat_window = Window_RoomChat.new(@cardinfo_window.x, @cardinfo_window.height, 1024-@cardinfo_window.x, 768-@cardinfo_window.height)
     super
+    #(Thread.list - [Thread.current]).each{|t|t.kill}
+    #p Thread.list
   end
 
   def change_phase(phase)
@@ -160,8 +162,14 @@ class Scene_Duel < Scene
   end
   def update
     @cardinfo_window.update
-    while event = Iduel::Event.poll
-      handle_iduel(event)
+    if $iduel
+      while event = Iduel::Event.poll
+        handle_iduel(event)
+      end
+    elsif $nbx
+      while event = NBX::Event.poll
+        handle_iduel(event)
+      end
     end
     super
   end

lib/scene_hall_nbx.rb

@@ -62,7 +62,12 @@ class Scene_Hall_NBX < Scene
           #$iduel.qroom room
       #  end
         #$iduel.close
-        $scene = Scene_Login.new
+      #  $scene = Scene_Login.new
+      when Key::F2
+        $nbx.host
+        @joinroom_msgbox = Widget_Msgbox.new("创建房间", "正在等待对手"){}
+      when Key::F5
+        $nbx.refresh
       end
     when Event::KeyUp
       case event.sym
@@ -108,7 +113,16 @@ class Scene_Hall_NBX < Scene
       else
         @playerlist.refresh
       end
-      
+    when NBX::Event::SingleRoomInfo
+      if !@roomlist.list.include? event.room
+        @roomlist.list << event.room
+        @roomlist.list = @roomlist.list #OMG...
+      else
+        @roomlist.refresh
+      end
+    when NBX::Event::Connect
+      require_relative 'scene_duel'
+      $scene = Scene_Duel.new($nbx.room)
       #
     #when Iduel::Event::OLIF
     #  @playerlist.list = event.users

lib/scene_title.rb

@@ -29,6 +29,7 @@ class Scene_Title < Scene
   end
   def update
     while event = Event.poll
+      p event
       case event
       when Event::MouseMotion
         if @command_window.include?(event.x, event.y)

lib/widget_inputbox.rb

 class Widget_InputBox < Window
+=begin
   attr_accessor :text, :proc
   require 'tk'
   @@font = TkFont.new("family" => 'WenQuanYi Micro Hei', 
@@ -15,7 +16,8 @@ class Widget_InputBox < Window
     bind('Key-Return'){@@active.proc.call(get);delete(0, get.size);@@root.withdraw(true);true}
     pack
   }
-  Thread.new{Tk.mainloop}.priority = 1
+  
+  Thread.new{Tk.mainloop}
   def initialize(x,y,width,height,z=300, &block)
     super(x,y,width,height,z)
     @font = TTF.open("fonts/WenQuanYi Micro Hei.ttf", 20)
@@ -36,6 +38,9 @@ class Widget_InputBox < Window
     @@root.deiconify
     @@entry.focus :force
   end
-
+=end
+  def method_missing(*args)
+    
+  end
   
 end

lib/window_config.rb

+#encoding: UTF-8
 class Window_Config < Window
   def initialize(x,y)
     super(x,y,$screen.w, $screen.h)

lib/window_playerlist.rb

@@ -43,6 +43,9 @@ class Window_PlayerList < Window_List
     @height = @item_max * WLH
 		refresh
 	end
+  def clear(x=0,y=0,width=@width,height=@height)
+    @contents.fill_rect(x,y,width,height,0x66FFFFFF)
+  end
   def clicked
     #$scene.refresh_rect(*item_rect(@index)){draw_item(@index, 2)} if @index
     @userwindow = Window_User.new(100,100,@list[@index])