diff -ur OgamePlayer_v2beta_src/Bot/FuncionesBot.cs OgamePlayer_v2beta_jarfil0.1.1-src/Bot/FuncionesBot.cs --- OgamePlayer_v2beta_src/Bot/FuncionesBot.cs 2006-06-02 19:05:24.000000000 +0200 +++ OgamePlayer_v2beta_jarfil0.1.1-src/Bot/FuncionesBot.cs 2007-06-02 09:26:09.000000000 +0200 @@ -15,7 +15,8 @@ { public partial class CuentaBot { - public static string UrlLogin = "http://www.ogame.com.es/portal/?lang=es&frameset=1"; + // public static string UrlLogin = "http://www.ogame.com.es/portal/?lang=es&frameset=1"; + public static string UrlLogin = "http://ogame.com.es/"; /// /// Hace login en Ogame y devuelve la cadena de sesi髇 obtenida @@ -64,7 +65,7 @@ res[1] = ServerUniverso.Match(WebBrowser.Document.Body.OuterHtml).Value; foreach (HtmlElement elemento in WebBrowser.Document.All) { - if (elemento.Name == "Uni") + if (elemento.Name == "universe") { elemento.SetAttribute("value", res[1]); } @@ -79,7 +80,7 @@ } } //Simular tecla Enter - WebBrowser.PulsarBoton(null, "Login"); + WebBrowser.PulsarBoton("button", null); //Obtener la sesion try S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src: oGamePlayer.suo S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirBatalla.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirBatalla.designer.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirBatalla.resx S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirDatos.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirDatos.Designer.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirDatos.resx S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirEnemigo.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirEnemigo.Designer.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirEnemigo.resx S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirSistemaSolar.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirSistemaSolar.Designer.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirSistemaSolar.resx S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirVariosInformes.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirVariosInformes.Designer.cs S贸lo en OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas: A帽adirVariosInformes.resx S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirBatalla.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirBatalla.designer.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirBatalla.resx S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirDatos.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirDatos.Designer.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirDatos.resx S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirEnemigo.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirEnemigo.Designer.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirEnemigo.resx S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirSistemaSolar.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirSistemaSolar.Designer.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirSistemaSolar.resx S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirVariosInformes.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirVariosInformes.Designer.cs S贸lo en OgamePlayer_v2beta_src/Ventanas: A写adirVariosInformes.resx diff -ur OgamePlayer_v2beta_src/Ventanas/Principal.cs OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas/Principal.cs --- OgamePlayer_v2beta_src/Ventanas/Principal.cs 2006-06-02 18:03:56.000000000 +0200 +++ OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas/Principal.cs 2007-06-02 09:26:05.000000000 +0200 @@ -40,6 +40,7 @@ SimularBatalla(null, null); CalcularCostes(null, null); + CalcularTiempos(null, null); tab.SelectedIndex = 0; @@ -477,7 +478,12 @@ private void CalcularCostes(object sender, EventArgs e) { - A帽adirTab("Calcular costes", ObtenerWebBrowser("http://o-calc.noradim.de/index.php?sec=_cost&lang=es")); + A帽adirTab("Calcular costes", ObtenerWebBrowser("http://o-calc.com/?sec=_cost&lang=es")); + } + + private void CalcularTiempos(object sender, EventArgs e) + { + A帽adirTab("Calcular tiempos", ObtenerWebBrowser("http://o-calc.com/?sec=_timer&lang=es")); } private void CargarImperio() diff -ur OgamePlayer_v2beta_src/Ventanas/Principal.Designer.cs OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas/Principal.Designer.cs --- OgamePlayer_v2beta_src/Ventanas/Principal.Designer.cs 2006-05-31 23:30:56.000000000 +0200 +++ OgamePlayer_v2beta_jarfil0.1.1-src/Ventanas/Principal.Designer.cs 2007-06-02 09:26:05.000000000 +0200 @@ -162,6 +162,7 @@ this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); this.ejecutarAlInicioDeWindowsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton12 = new System.Windows.Forms.ToolStripButton(); this.menuStrip1.SuspendLayout(); this.botonesHerramientas.SuspendLayout(); this.tab.SuspendLayout(); @@ -538,19 +539,19 @@ // this.actualizarListasToolStripMenuItem1.Name = "actualizarListasToolStripMenuItem1"; this.actualizarListasToolStripMenuItem1.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.actualizarListasToolStripMenuItem1.Size = new System.Drawing.Size(178, 22); + this.actualizarListasToolStripMenuItem1.Size = new System.Drawing.Size(167, 22); this.actualizarListasToolStripMenuItem1.Text = "Actualizar listas"; this.actualizarListasToolStripMenuItem1.Click += new System.EventHandler(this.RecargarListas); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(175, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(164, 6); // // salirToolStripMenuItem1 // this.salirToolStripMenuItem1.Name = "salirToolStripMenuItem1"; - this.salirToolStripMenuItem1.Size = new System.Drawing.Size(178, 22); + this.salirToolStripMenuItem1.Size = new System.Drawing.Size(167, 22); this.salirToolStripMenuItem1.Text = "Salir"; this.salirToolStripMenuItem1.Click += new System.EventHandler(this.salirToolStripMenuItem1_Click); // @@ -566,7 +567,7 @@ // this.borrarSeleccionadosToolStripMenuItem.Name = "borrarSeleccionadosToolStripMenuItem"; this.borrarSeleccionadosToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.borrarSeleccionadosToolStripMenuItem.Size = new System.Drawing.Size(213, 22); + this.borrarSeleccionadosToolStripMenuItem.Size = new System.Drawing.Size(202, 22); this.borrarSeleccionadosToolStripMenuItem.Text = "Borrar seleccionados"; this.borrarSeleccionadosToolStripMenuItem.Click += new System.EventHandler(this.BotonSuprPulsado); // @@ -590,33 +591,33 @@ // acercaDeToolStripMenuItem // this.acercaDeToolStripMenuItem.Name = "acercaDeToolStripMenuItem"; - this.acercaDeToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.acercaDeToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.acercaDeToolStripMenuItem.Text = "Acerca de"; this.acercaDeToolStripMenuItem.Click += new System.EventHandler(this.acercaDeToolStripMenuItem_Click); // // paginaWebDeOgamePlayerToolStripMenuItem // this.paginaWebDeOgamePlayerToolStripMenuItem.Name = "paginaWebDeOgamePlayerToolStripMenuItem"; - this.paginaWebDeOgamePlayerToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.paginaWebDeOgamePlayerToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.paginaWebDeOgamePlayerToolStripMenuItem.Text = "Pagina web de OgamePlayer"; this.paginaWebDeOgamePlayerToolStripMenuItem.Click += new System.EventHandler(this.paginaWebDeOgamePlayerToolStripMenuItem_Click); // // toolStripMenuItem6 // this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(219, 6); + this.toolStripMenuItem6.Size = new System.Drawing.Size(208, 6); // // comprobarActualizaci贸nToolStripMenuItem // this.comprobarActualizaci贸nToolStripMenuItem.Name = "comprobarActualizaci贸nToolStripMenuItem"; - this.comprobarActualizaci贸nToolStripMenuItem.Size = new System.Drawing.Size(222, 22); + this.comprobarActualizaci贸nToolStripMenuItem.Size = new System.Drawing.Size(211, 22); this.comprobarActualizaci贸nToolStripMenuItem.Text = "Comprobar actualizaci贸n"; this.comprobarActualizaci贸nToolStripMenuItem.Click += new System.EventHandler(this.comprobarActualizaci贸nToolStripMenuItem_Click); // // salirToolStripMenuItem // this.salirToolStripMenuItem.Name = "salirToolStripMenuItem"; - this.salirToolStripMenuItem.Size = new System.Drawing.Size(223, 22); + this.salirToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.salirToolStripMenuItem.Text = "Salir"; this.salirToolStripMenuItem.Click += new System.EventHandler(this.salir); // @@ -643,6 +644,7 @@ this.toolStripButton3, this.toolStripButton4, this.toolStripButton6, + this.toolStripButton12, this.toolStripButton8, this.toolStripButton9, this.toolStripButton10}); @@ -1264,10 +1266,10 @@ // VisorUniversos // this.VisorUniversos.Dock = System.Windows.Forms.DockStyle.Fill; - this.VisorUniversos.Galaxia = 1; + this.VisorUniversos.Galaxia = 0; this.VisorUniversos.Location = new System.Drawing.Point(3, 3); this.VisorUniversos.Name = "VisorUniversos"; - this.VisorUniversos.Sistema = 1; + this.VisorUniversos.Sistema = 0; this.VisorUniversos.Size = new System.Drawing.Size(907, 359); this.VisorUniversos.TabIndex = 0; // @@ -1424,44 +1426,54 @@ this.toolStripMenuItem7, this.salirToolStripMenuItem}); this.menuContextual.Name = "contextMenuStrip1"; - this.menuContextual.Size = new System.Drawing.Size(224, 110); + this.menuContextual.Size = new System.Drawing.Size(213, 110); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(220, 6); + this.toolStripMenuItem4.Size = new System.Drawing.Size(209, 6); // // a帽adirEnemigoToolStripMenuItem // this.a帽adirEnemigoToolStripMenuItem.Name = "a帽adirEnemigoToolStripMenuItem"; - this.a帽adirEnemigoToolStripMenuItem.Size = new System.Drawing.Size(223, 22); + this.a帽adirEnemigoToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.a帽adirEnemigoToolStripMenuItem.Text = "A帽adir datos"; this.a帽adirEnemigoToolStripMenuItem.Click += new System.EventHandler(this.A帽adirDatos); // // definirAlarmaToolStripMenuItem // this.definirAlarmaToolStripMenuItem.Name = "definirAlarmaToolStripMenuItem"; - this.definirAlarmaToolStripMenuItem.Size = new System.Drawing.Size(223, 22); + this.definirAlarmaToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.definirAlarmaToolStripMenuItem.Text = "Definir alarma"; this.definirAlarmaToolStripMenuItem.Click += new System.EventHandler(this.A帽adirAlarma); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(220, 6); + this.toolStripMenuItem3.Size = new System.Drawing.Size(209, 6); // // ejecutarAlInicioDeWindowsToolStripMenuItem // this.ejecutarAlInicioDeWindowsToolStripMenuItem.CheckOnClick = true; this.ejecutarAlInicioDeWindowsToolStripMenuItem.Name = "ejecutarAlInicioDeWindowsToolStripMenuItem"; - this.ejecutarAlInicioDeWindowsToolStripMenuItem.Size = new System.Drawing.Size(223, 22); + this.ejecutarAlInicioDeWindowsToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.ejecutarAlInicioDeWindowsToolStripMenuItem.Text = "Ejecutar al inicio de Windows"; this.ejecutarAlInicioDeWindowsToolStripMenuItem.CheckedChanged += new System.EventHandler(this.EjecutarAlInicioCambiado); // // toolStripMenuItem7 // this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(220, 6); + this.toolStripMenuItem7.Size = new System.Drawing.Size(209, 6); + // + // toolStripButton12 + // + this.toolStripButton12.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.toolStripButton12.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton12.Name = "toolStripButton12"; + this.toolStripButton12.Size = new System.Drawing.Size(89, 22); + this.toolStripButton12.Text = "Calcular tiempos"; + this.toolStripButton12.ToolTipText = "Calcula tiempos para vuelos"; + this.toolStripButton12.Click += new System.EventHandler(this.CalcularTiempos); // // Principal // @@ -1648,6 +1660,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripMenuItem6; private System.Windows.Forms.ToolStripMenuItem ejecutarAlInicioDeWindowsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem7; + private System.Windows.Forms.ToolStripButton toolStripButton12; } } S贸lo en OgamePlayer_v2beta_src: Versiones