diff --git a/core/src/main/assets/interfaces/toolbar.png b/core/src/main/assets/interfaces/toolbar.png index ac849eada..1fb89beb9 100644 Binary files a/core/src/main/assets/interfaces/toolbar.png and b/core/src/main/assets/interfaces/toolbar.png differ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java index 09f2192d0..e68049b1c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java @@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage; import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions; import com.watabou.noosa.Game; import com.watabou.noosa.audio.Sample; -import com.watabou.utils.Bundle; import com.watabou.utils.Random; import java.util.ArrayList; @@ -190,7 +189,11 @@ public class BloodthirstyThorn extends MeleeWeapon { } //返回圣杯一致的等级 - bloodthirstyThorn.level=chaliceOfBlood.level(); + if(chaliceOfBlood!=null){ + bloodthirstyThorn.level=chaliceOfBlood.level(); + } else { + bloodthirstyThorn.level=Random.NormalIntRange(3,6); + } bloodthirstyThorn.quantity(1).identify(); @@ -272,37 +275,7 @@ public class BloodthirstyThorn extends MeleeWeapon { } - //动态改变图标1 - @Override - public void restoreFromBundle(Bundle bundle) { - super.restoreFromBundle(bundle); - super.image = ItemSpriteSheet.BloodDir; - if (level() >= 5) { - super.image = ItemSpriteSheet.BloodDied; - //在载入存档更新图标的同时更新攻击范围 - RCH=2; - ACC = 1.95f; - } else { - super.image = ItemSpriteSheet.BloodDir; - } - } - - //动态改变图标2 - @Override - public void storeInBundle(Bundle bundle) { - super.storeInBundle(bundle); - super.image = ItemSpriteSheet.BloodDir; - if (level() >= 5) { - //在保存存档更新图标的同时更新攻击范围 - super.image = ItemSpriteSheet.BloodDied; - RCH=2; - ACC = 1.95f; - } else { - super.image = ItemSpriteSheet.BloodDir; - } - } - - //动态改变图标3 + //动态改变图标与范围 @Override public int image() { super.image = ItemSpriteSheet.BloodDir; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java index a56689c39..47b42113e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java @@ -274,11 +274,30 @@ public class GameNewsScene extends PixelScene { //定义GameNewsScene类,继 if (index == 0) { // 如果是桌面版就打开桌面版的下载链接,否则打开安卓版的下载链接 if (DeviceCompat.isDesktop()) { - ShatteredPixelDungeon.platform.openURI(article.DesktopURL); + ShatteredPixelDungeon.scene().add(new WndOptions(Icons.get(Icons.CHANGES), + article.title, + article.summary, + "JAR版下载","NoJVM-版本下载") { + @Override + protected void onSelect(int index) { + if (index == 0) { + ShatteredPixelDungeon.platform.openURI(article.DesktopURL); + } else { + ShatteredPixelDungeon.platform.openURI("https://lingasdj.lanzouo.com/b05rqansf"); + } + Gdx.app.exit(); + } + + @Override + public void onBackPressed() { + // + } + }); } else { ShatteredPixelDungeon.platform.openURI(article.URL); + Gdx.app.exit(); } - Gdx.app.exit(); + } }