Fixed Less Question in V0.6.1.0b7

README.md

@@ -22,10 +22,4 @@
 | - 美工：Naiyazi,龙蚊| - 美工：冷群怪,落白,Om9
 | - 音乐：Prohonor | - 测试协力：所有魔绫的测试人员 |
 
-</div>
+</div>
-
-
-
-
-
-</div>

core/src/main/assets/messages/ui/ui.properties

@@ -511,5 +511,7 @@ ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x61=-V0.6.1-Beta5.3\n1.修复一些
 
 ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x62=-V0.6.1-Beta6\n1.修复一些错误\n2.初始载入快捷栏可能有问题，请通过调整显示比列解决\n3.部分区域UI迭代更新
 
+ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x63=-V0.6.1-Beta7\n1.修复染血金币控制终端的一些小错误\n2.修复魔法坐标房间重复生成的问题
+
 
 //ui.changelist.mlpd.vm0_5_x_changes.xxx//

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -2116,7 +2116,7 @@ public class Hero extends Char {
 			Buff.prolong(this, Bless.class, Bless.GODSPOERF);
 		}
 
-		//监狱之水 祝福效果
+		//监狱之水 祝福效果 水里隐身
 		//如果是污泥浊水则触发Debuff
 		if(Dungeon.PrisonWaterLevel() && Dungeon.level.water[pos] && flying && Dungeon.isChallenged(AQUAPHOBIA)) {
 			for (Buff buff : hero.buffs()) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/LanFire.java

@@ -69,9 +69,8 @@ public class LanFire extends NPC {
                                     hero.healIcehp(Math.max(0, 3));
                                     GameScene.pickUp(chargrilledMeat, Dungeon.hero.pos);
                                     chargrilledMeat.quantity(3).collect();
-                                    mysteryMeat.detach(hero.belongings.backpack);
+                                    mysteryMeat.quantity(mysteryMeat.quantity() - 3);
-                                    mysteryMeat.detach(hero.belongings.backpack);
+                                    //mysteryMeat.detach(hero.belongings.backpack);
-                                    mysteryMeat.detach(hero.belongings.backpack);
                                     hero.spend(9f);
                                     hero.busy();
                                     hero.sprite.operate(hero.pos);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagicTorch.java

@@ -67,20 +67,8 @@ public class MagicTorch extends MeleeWeapon {
     @Override
     public void execute(Hero hero, String action) {
         super.execute(hero, action);
-        //当英雄使用魔法火把时，给英雄添加一个光环buff，光环buff会对周围的敌人造成伤害，
+        if (AC_EQUIP.equals(action)) {
-        // 伤害值为英雄的魔法火把的最大伤害值，持续时间为5回合，每回合造成一次伤害，伤害值为英雄的魔法火把的最大伤害值，光环buff的名称为“光环”
+            Buff.affect(hero, MagicLight.class).set((100), 1);
-        switch (action) {
-            case AC_EQUIP:
-                Buff.affect(hero, MagicLight.class).set((100), 1);
-                break;
-            case AC_UNEQUIP:
-                doUnequip(hero, true);
-                Buff.detach(hero, MagicLight.class);
-                break;
-            case AC_THROW:
-                super.doThrow(hero);
-                Buff.detach(hero, MagicLight.class);
-                break;
         }
     }
 
@@ -138,13 +126,13 @@ public class MagicTorch extends MeleeWeapon {
                 return false;
             }
         }
-        MagicTorch item = Dungeon.hero.belongings.getItem(MagicTorch.class);
+//        MagicTorch item = Dungeon.hero.belongings.getItem(MagicTorch.class);
         @Override
         public boolean act() {
             if (target.isAlive()) {
 
                 spend(interval);
-                if (level <= 0 || hero.belongings.weapon != item) {
+                if (level <= 0 || !(hero.belongings.weapon instanceof MagicTorch)) {
                     detach();
                 }
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/ZeroLevel.java

@@ -181,7 +181,7 @@ public class ZeroLevel extends Level {
         god1.pos = (this.width * 28 + 30);
         mobs.add(god1);
 
-        if (!Badges.isUnlocked(Badges.Badge.NYZ_SHOP)){
+        if (Badges.isUnlocked(Badges.Badge.NYZ_SHOP)){
             Nyz npc4= new Nyz();
             npc4.pos = (this.width * 28 + 7);
             mobs.add(npc4);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java

@@ -49,6 +49,7 @@ import java.util.ArrayList;
 public class vM0_6_7_X_Changes {
 
     public static void addAllChanges(ArrayList<ChangeInfo> changeInfos) {
+        add_v0_6_34_Changes(changeInfos);
         add_v0_6_33_Changes(changeInfos);
         add_v0_6_32_Changes(changeInfos);
         add_v0_6_31_Changes(changeInfos);
@@ -85,6 +86,32 @@ public class vM0_6_7_X_Changes {
         add_v0_6_0_Changes(changeInfos);
     }
 
+    public static void add_v0_6_34_Changes( ArrayList<ChangeInfo> changeInfos ) {
+        ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta7(P3)", true, "");
+        changes.hardlight(Window.TITLE_COLOR);
+        changeInfos.add(changes);
+
+        changes = new ChangeInfo("改动", false, null);
+        changes.hardlight(Window.CYELLOW);
+        changeInfos.add(changes);
+
+        Image issxsaxs =new LanFireSprites();
+        issxsaxs.scale.set(PixelScene.align(0.8f));
+        changes.addButton(new ChangeButton(issxsaxs, ("篝火系统V0.4"),
+                ("改进了篝火系统，现在可以将神秘的肉转换为烤肉，无需炼金能量，还能回复大量温度")));
+
+        changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.CHALLANEESICON_14), ("寒冷系统0.2测试版"),
+                ("寒冷值增加延迟时间增加")));
+
+        changes.addButton(new ChangeButton(new NyzSprites(), ("奈亚子商店改动"),
+                ("0层的奈亚子商店进一步改进")));
+
+
+        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_06X63")));
+
+    }
+
     public static void add_v0_6_33_Changes( ArrayList<ChangeInfo> changeInfos ) {
         ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta6(P3)", true, "");
         changes.hardlight(Window.TITLE_COLOR);