diff --git a/build.gradle b/build.gradle index c1c0b2752..eef490fed 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ allprojects { appPackageName = 'com.ansdomagiclingpixeldungeon.ling' appVersionCode =800000 - appVersionName = '0.6.1.0-Beta2(P3)' + appVersionName = '0.6.1.0-Beta3(P3)' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/assets/messages/ui/ui.properties b/core/src/main/assets/messages/ui/ui.properties index 972693026..e8789676e 100644 --- a/core/src/main/assets/messages/ui/ui.properties +++ b/core/src/main/assets/messages/ui/ui.properties @@ -493,5 +493,7 @@ ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x50=-V0.6.1--P3\n1.修复红龙之王 ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x51=-V0.6.1-Beta2\n1.修复冰雪魔女的弹道崩溃\n2.部分文案错误修复\n3.种子文本框崩溃修复\n4.界面优化调整 +ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x52=-V0.6.1-Beta3\n1.修复更多崩溃错误\n-2.部分算法优化 + //ui.changelist.mlpd.vm0_5_x_changes.xxx// \ No newline at end of file diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RedDragon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RedDragon.java index c48207d81..da0fa0ff5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RedDragon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/RedDragon.java @@ -413,7 +413,7 @@ public class RedDragon extends NPC { itemLevel = 3; } weapon.upgrade(itemLevel); - armor.upgrade(itemLevel); + armor.upgrade(0); RingT.upgrade(itemLevel); //10% to be enchanted. We store it separately so enchant status isn't revealed early diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index e0165e714..b1fbb569a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -132,7 +132,6 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.shatteredpixel.shatteredpixeldungeon.windows.WndQuest; import com.shatteredpixel.shatteredpixeldungeon.windows.WndResurrect; -import com.shatteredpixel.shatteredpixeldungeon.windows.WndStartGame; import com.shatteredpixel.shatteredpixeldungeon.windows.WndStory; import com.watabou.glwrap.Blending; import com.watabou.input.PointerEvent; @@ -1275,8 +1274,7 @@ public class GameScene extends PixelScene { protected void onClick() { InterlevelScene.noStory = true; GamesInProgress.selectedClass = Dungeon.hero.heroClass; - GamesInProgress.curSlot = GamesInProgress.firstEmpty(); - GameScene.show(new WndStartGame(GamesInProgress.firstEmpty())); + ShatteredPixelDungeon.switchScene(HeroSelectScene.class); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 1963bf358..3064cebde 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -38,7 +38,7 @@ public class TitleScene extends PixelScene { @Override public void create() { super.create(); - + SPDSettings.systemFont(false); Music.INSTANCE.play(Assets.Music.THEME_1, true); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java index 3a8987bb9..44e7c6da4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java @@ -40,6 +40,7 @@ import java.util.ArrayList; public class vM0_6_7_X_Changes { public static void addAllChanges(ArrayList changeInfos) { + add_v0_6_24_Changes(changeInfos); add_v0_6_23_Changes(changeInfos); add_v0_6_22_Changes(changeInfos); add_v0_6_21_Changes(changeInfos); @@ -65,6 +66,20 @@ public class vM0_6_7_X_Changes { add_v0_6_1_Changes(changeInfos); add_v0_6_0_Changes(changeInfos); } + + public static void add_v0_6_24_Changes( ArrayList changeInfos ) { + ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta2(P3)", true, ""); + changes.hardlight(Window.TITLE_COLOR); + changeInfos.add(changes); + + changes = new ChangeInfo("调整", false, null); + changes.hardlight(Window.GREEN_COLOR); + changeInfos.add(changes); + + changes.addButton(new ChangeButton(new Image("sprites/spinner.png", 144, 0, 16, 16), + Messages.get(ChangesScene.class, "bugfixes"), Messages.get(vM0_6_7_X_Changes.class, "bug_06X52"))); + + } public static void add_v0_6_23_Changes( ArrayList changeInfos ) { ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta2(P3)", true, ""); changes.hardlight(Window.TITLE_COLOR); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java index 3328c1ab0..489a8424f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java @@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.GamesInProgress; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; +import com.shatteredpixel.shatteredpixeldungeon.scenes.HeroSelectScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.InterlevelScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.RankingsScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.TitleScene; @@ -92,7 +93,7 @@ public class WndGame extends Window { protected void onClick() { GamesInProgress.selectedClass = Dungeon.hero.heroClass; InterlevelScene.noStory = false; - GameScene.show(new WndStartGame(GamesInProgress.firstEmpty())); + ShatteredPixelDungeon.switchScene(HeroSelectScene.class); } } ); curBtn.icon(Icons.get(Icons.ENTER));