Merge pull request #2 from IamIpanda/master

lib/main.rb

@@ -8,7 +8,7 @@ begin
     $config['bgm'] = true if $config['bgm'].nil?
     $config['screen'] ||= {}
     $config['screen']['width'] ||= 1024
-    $config['screen']['height'] ||= 768
+    $config['screen']['height'] ||= 640
   end
 
   def save_config(file="config.yml")

lib/scene_lobby.rb

@@ -25,7 +25,7 @@ class Scene_Lobby < Scene
 		@userinfo = Window_UserInfo.new(24,24, $game.user)
 		@host_window = Window_LobbyButtons.new(748,18)
     @active_window = @roomlist
-		@chat_window = Window_Chat.new(313,543,698,212)
+		@chat_window = Window_Chat.new(313,$config['screen']['height'] - 225,698,212)
     @count = 0
     super
   end

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
-    @gameselect_window = Window_GameSelect.new(117,269)
-    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 = 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
 end
\ No newline at end of file

lib/window_gameselect.rb

-class Window_GameSelect < Window_List
-  WLH = 56
-  def initialize(x,y)
-    @font = TTF.open("fonts/wqy-microhei.ttc", 24)
-    @color = [255,255,255]
-    @game_color = [47,156,192]
-    @game_stroke_color = [0xFF,0xFF,0xFF]
-    @items = []
-    Dir.glob('lib/**/game.yml') do |file|
-      game = YAML.load_file(file)
-      if game.is_a?(Hash) && game["name"]
-        game['file'] ||= 'game.rb'
-        game['file'] = File.expand_path(game['file'], File.dirname(file))
-        $config[game['name']] ||= {}
-        @items << game 
-      else
-        $log.error "#{game.inspect}读取失败(#{file})"
-      end
-    end
-    super(x,y,160,@items.size*WLH)
-    clear
-    @button = Surface.load("graphics/login/game_background.png")
-    #@button.set_alpha(RLEACCEL,255)
-    self.items = @items
-    self.index = @items.find_index{|game|game["name"] == $config['game']} || 0
-    clicked
-    @announcements_window = Window_Announcements.new(313,265,600,24)
-    refresh
-  end
-  def draw_item(index, status=0)
-    Surface.blit(@button, @button.w/3*status, @game == index ? @button.h/2 : 0, @button.w/3, @button.h/2, @contents, 0, WLH*index)
-    draw_stroked_text(@items[index]["name"], 24, WLH*index+14, 2)
-  end
-  def item_rect(index)
-    return [0,0,0,0] unless index
-    [0, WLH*index, @button.w/3, @button.h/2]
-  end
-  def draw_stroked_text(text,x,y,size=1)
-    [[x-size,y-size], [x-size,y], [x-size,y+size],
-      [x,y-size], [x,y+size],
-      [x+size,y-size], [x+size,y], [x+size,y+size],
-    ].each{|pos|@font.draw_blended_utf8(@contents, text, pos[0], pos[1], *@game_stroke_color)}
-    @font.draw_blended_utf8(@contents, text, x, y, *@game_color)
-  end
-  def mousemoved(x,y)
-    self.index = (y-@y) / WLH
-  end
-  def index=(index)
-    return if @index == index# or index.nil?
-    if @index
-      clear(*item_rect(@index))
-      draw_item(@index, 0)
-    end
-    @index = index
-    clear(*item_rect(@index))
-    draw_item(@index, 1) if @index
-  end
-  def clicked
-    return unless @index
-    load @items[@index]["file"].encode("GBK") #TODO: load的这种架构微蛋疼，一时想不到更好的方案
-    $config['game'] = @items[@index]['name']
-    @login_window.destroy if @login_window
-    @login_window = Window_Login.new(316,316,$config[$config['game']]["username"],$config[$config['game']]["password"])
-    @announcements_window.refresh if @announcements_window
-    @game = @index
-    refresh
-  end
-  def update
-    @login_window.update if @login_window
-    @announcements_window.update if @announcements_window
-  end
-  #def lostfocus
- #   self.index = nil
-  #end
-  #def destroy
-  #  @login_window.destroy if @login_window
-  #  super
-  #end
-end
+class Window_GameSelect < Window_List
+  WLH = 56
+  def initialize(x,y)
+    @font = TTF.open("fonts/wqy-microhei.ttc", 24)
+    @color = [255,255,255]
+    @game_color = [47,156,192]
+    @game_stroke_color = [0xFF,0xFF,0xFF]
+    @items = []
+    Dir.glob('lib/**/game.yml') do |file|
+      game = YAML.load_file(file)
+      if game.is_a?(Hash) && game["name"]
+        game['file'] ||= 'game.rb'
+        game['file'] = File.expand_path(game['file'], File.dirname(file))
+        $config[game['name']] ||= {}
+        @items << game 
+      else
+        $log.error "#{game.inspect}读取失败(#{file})"
+      end
+    end
+    super(x,y,160,@items.size*WLH)
+    clear
+    @button = Surface.load("graphics/login/game_background.png")
+    #@button.set_alpha(RLEACCEL,255)
+    self.items = @items
+    self.index = @items.find_index{|game|game["name"] == $config['game']} || 0
+    clicked
+	#======================================================
+	# We'll pay fpr that soon or later.
+	#======================================================
+	if $config['screen']['height'] == 768
+		@announcements_window = Window_Announcements.new(313,265,600,24)
+	elsif $config['screen']['height'] == 640
+		@announcements_window = Window_Announcements.new(313,130,600,24)
+	else
+		raise "无法分辨的分辨率"
+	end	
+	#======================================================
+	# ENDS HERE
+	#======================================================
+    refresh
+  end
+  def draw_item(index, status=0)
+    Surface.blit(@button, @button.w/3*status, @game == index ? @button.h/2 : 0, @button.w/3, @button.h/2, @contents, 0, WLH*index)
+    draw_stroked_text(@items[index]["name"], 24, WLH*index+14, 2)
+  end
+  def item_rect(index)
+    return [0,0,0,0] unless index
+    [0, WLH*index, @button.w/3, @button.h/2]
+  end
+  def draw_stroked_text(text,x,y,size=1)
+    [[x-size,y-size], [x-size,y], [x-size,y+size],
+      [x,y-size], [x,y+size],
+      [x+size,y-size], [x+size,y], [x+size,y+size],
+    ].each{|pos|@font.draw_blended_utf8(@contents, text, pos[0], pos[1], *@game_stroke_color)}
+    @font.draw_blended_utf8(@contents, text, x, y, *@game_color)
+  end
+  def mousemoved(x,y)
+    self.index = (y-@y) / WLH
+  end
+  def index=(index)
+    return if @index == index# or index.nil?
+    if @index
+      clear(*item_rect(@index))
+      draw_item(@index, 0)
+    end
+    @index = index
+    clear(*item_rect(@index))
+    draw_item(@index, 1) if @index
+  end
+  def clicked
+    return unless @index
+    load @items[@index]["file"].encode("GBK") #TODO: load的这种架构微蛋疼，一时想不到更好的方案
+    $config['game'] = @items[@index]['name']
+    @login_window.destroy if @login_window
+	#======================================================
+	# We'll pay fpr that soon or later.
+	#======================================================
+	if $config['screen']['height'] == 768
+		@login_window = Window_Login.new(316,316,$config[$config['game']]["username"],$config[$config['game']]["password"])
+	elsif $config['screen']['height'] == 640
+		@login_window = Window_Login.new(316,183,$config[$config['game']]["username"],$config[$config['game']]["password"])
+	else
+		raise "无法分辨的分辨率"
+	end	
+	#======================================================
+	# ENDS HERE
+	#======================================================
+    @announcements_window.refresh if @announcements_window
+    @game = @index
+    refresh
+  end
+  def update
+    @login_window.update if @login_window
+    @announcements_window.update if @announcements_window
+  end
+  #def lostfocus
+ #   self.index = nil
+  #end
+  #def destroy
+  #  @login_window.destroy if @login_window
+  #  super
+  #end
+end

lib/window_roomlist.rb

@@ -14,7 +14,7 @@ class Window_RoomList < Window_Scrollable
     @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, 48 * 10)
+    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]

lib/window_userlist.rb

@@ -11,7 +11,7 @@ class Window_UserList < Window_Scrollable
 	def initialize(x, y, items)
     #@contents = Surface.load "graphics/lobby/useritems.png"
     #@background = Surface.load "graphics/lobby/useritems.png"
-    super(x,y,272,540)
+    super(x,y,272,$config['screen']['height'] - 220)
     @font = TTF.open("fonts/wqy-microhei.ttc", 16)
     @color = [0x03, 0x11, 0x22]
     @color_friend = [0, 128, 0]