Fixed More Bug in V0.6.1-Beta2

This commit is contained in:
LingASDJ 2023-03-05 13:36:51 +08:00
parent ebfce4f6b3
commit 19c15493bd
13 changed files with 51 additions and 40 deletions

View File

@ -17,7 +17,7 @@ allprojects {
appPackageName = 'com.ansdomagiclingpixeldungeon.ling'
appVersionCode =800000
appVersionName = '0.6.1.0-Beta1(P3)'
appVersionName = '0.6.1.0-Beta2(P3)'
appJavaCompatibility = JavaVersion.VERSION_1_8

View File

@ -80,7 +80,7 @@ actors.buffs.magicgirldebuff.magicgirlsaymoneymore.desc=贪婪的欲望是人类
### Good Blees Buffs
actors.buffs.clearbleesdgoodbuff.blessgoodstr.name=纯洁的祝福-坚毅
actors.buffs.clearbleesdgoodbuff.blessgoodstr.desc=坚毅是我们不屈的斗志!\n\n本大层玩家额外追加3点力量
actors.buffs.clearbleesdgoodbuff.blessgoodstr.desc=坚毅是我们不屈的斗志!\n\n本大层玩家额外追加2点力量
actors.buffs.clearbleesdgoodbuff.blessnomoney.name=纯洁的祝福-富饶
actors.buffs.clearbleesdgoodbuff.blessnomoney.desc=魔女的气息在我们身旁徘徊,商人们一定会对你毕恭毕敬。\n\n本大层商店全场打3折

View File

@ -491,5 +491,7 @@ ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x40=-P2.940\n1.修复史莱姆王的
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x50=-V0.6.1--P3\n1.修复红龙之王的崩溃\n2.修复雪凛峡谷可能无法出去的问题,如果魔法书失效了,也可以直接与商人领主对话进行离开
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x51=-V0.6.1-Beta2\n1.修复冰雪魔女的弹道崩溃\n2.部分文案错误修复\n3.种子文本框崩溃修复\n4.界面优化调整
//ui.changelist.mlpd.vm0_5_x_changes.xxx//

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

View File

@ -365,7 +365,7 @@ public class SPDSettings extends GameSettings {
}
public static void systemFont(boolean value){
put(KEY_SYSTEMFONT, value);
put(KEY_SYSTEMFONT, false);
}
public static boolean systemFont(){

View File

@ -62,6 +62,7 @@ public class Nyctophobia extends Buff implements Hero.Doom {
}
}
@Override
public int icon() {
if (hero.lanterfire >= 90 && hero.lanterfire <= 100) {

View File

@ -274,7 +274,11 @@ public class MagicGirlDead extends Boss {
//no spend, execute next act
//sprite.attack( enemy.pos );
spend( attackDelay()*5f );
shoot(this, enemy.pos);
if(pos == 0) {
shoot(this, 1);
} else {
shoot(this, enemy.pos);
}
return true;
//else try to lock target

View File

@ -84,6 +84,14 @@ public abstract class TextField extends RedButton {
};
if(Constants.gameIsAndroid()) {
Gdx.input.getTextInput(tinp, text.text(), inputText.text(), hint);
/*
Game.platform.promptTextInput("title", "hint", 100, false, "pos", "neg", new PlatformSupport.TextCallback() {
@Override
public void onSelect(boolean positive, String text) {
text(text);
}
});
*/
}else{
TextInput.getTextInput(tinp, text.text(), inputText.text(), hint);
}
@ -184,4 +192,4 @@ public abstract class TextField extends RedButton {
}
}
}
}

View File

@ -769,8 +769,8 @@ public class HeroSelectScene extends PixelScene {
private static class Avatar extends Image {
private static final int WIDTH = 24;
private static final int HEIGHT = 32;
private static final int WIDTH = 64;
private static final int HEIGHT = 64;
public Avatar( HeroClass cl ) {
super( Assets.Sprites.AVATARS );

View File

@ -40,6 +40,7 @@ import java.util.ArrayList;
public class vM0_6_7_X_Changes {
public static void addAllChanges(ArrayList<ChangeInfo> changeInfos) {
add_v0_6_23_Changes(changeInfos);
add_v0_6_22_Changes(changeInfos);
add_v0_6_21_Changes(changeInfos);
add_v0_6_20_Changes(changeInfos);
@ -64,6 +65,26 @@ 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_23_Changes( ArrayList<ChangeInfo> 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(Icons.get(Icons.NEWS), ("大立绘"),
("英雄界面大立绘现在正式实装感谢DC的绘画。")));
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_06X51")));
}
public static void add_v0_6_22_Changes( ArrayList<ChangeInfo> changeInfos ) {
ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta1(P3)", true, "");

View File

@ -28,12 +28,10 @@ import com.shatteredpixel.shatteredpixeldungeon.custom.messages.M;
import com.shatteredpixel.shatteredpixeldungeon.custom.utils.CustomGameSettings;
import com.shatteredpixel.shatteredpixeldungeon.custom.visuals.TextField;
import com.shatteredpixel.shatteredpixeldungeon.ui.CheckBox;
import com.shatteredpixel.shatteredpixeldungeon.ui.IconButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane;
import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.shatteredpixel.shatteredpixeldungeon.utils.DungeonSeed;
import com.watabou.noosa.Image;
import com.watabou.noosa.ui.Component;
import java.util.ArrayList;
@ -44,11 +42,10 @@ public class WndSeed extends Window {
private static final int HEIGHT = 26;
private static final int GAP = 1;
private boolean editable;
private ArrayList<CanScrollCheckBox> boxes;
private ArrayList<CanScrollInfo> infos;
private CanScrollTextField cstf;
private CanScrollButton deleteSeedInput;
private final boolean editable;
private final ArrayList<CanScrollCheckBox> boxes;
private final CanScrollTextField cstf;
private final CanScrollButton deleteSeedInput;
public WndSeed(boolean editable ) {
@ -64,9 +61,7 @@ public class WndSeed extends Window {
if(cstf.onClick(x, y)){
return;
}
if(deleteSeedInput.onClick(x, y)){
return;
}
deleteSeedInput.onClick(x, y);
}
};
add(pane);
@ -74,7 +69,6 @@ public class WndSeed extends Window {
Component content = pane.content();
boxes = new ArrayList<>();
infos = new ArrayList<>();
float pos = 0;
@ -143,22 +137,6 @@ public class WndSeed extends Window {
}
}
public static class CanScrollInfo extends IconButton{
public CanScrollInfo(Image Icon){super(Icon);}
protected boolean onClick(float x, float y){
if(!inside(x,y)) return false;
if(active) onClick();
return true;
}
@Override
protected void layout(){
super.layout();
hotArea.width = hotArea.height = 0;
}
}
public static class CanScrollTextField extends TextField{
public CanScrollTextField(String label) {

View File

@ -495,7 +495,7 @@ public class WndSettings extends WndTabbed {
ShatteredPixelDungeon.seamlessResetScene(new Game.SceneChangeCallback() {
@Override
public void beforeCreate() {
SPDSettings.systemFont(checked());
SPDSettings.systemFont(false);
}
@Override

View File

@ -123,14 +123,11 @@ public class DesktopPlatformSupport extends PlatformSupport {
resetGenerators(false);
fonts = new HashMap<>();
if (systemfont) {
basicFontGenerator = asianFontGenerator = fallbackFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/droid_sans.ttf"));
} else {
basicFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel_font.ttf"));
//TODO 改成你自己的字库文件名放到fonts文件夹里面
asianFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/fusion_pixel.ttf"));
fallbackFontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/droid_sans.ttf"));
}
fonts.put(basicFontGenerator, new HashMap<>());
fonts.put(asianFontGenerator, new HashMap<>());