Skip to content

Commit 95f8ce1

Browse files
Fix #4
1 parent 9bff0d7 commit 95f8ce1

File tree

12 files changed

+17
-15
lines changed

12 files changed

+17
-15
lines changed

assets/weather/1.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
hail
2-
hailstone.png
2+
hailstone
33
false
44
9DCFCF7F
55
300

assets/weather/2.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rain
2-
raindrop.png
2+
raindrop
33
false
44
5A69B57F
55
-100

assets/weather/3.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sandstorm
2-
sand.png
2+
sand
33
false
44
DEAC007F
55
400

assets/weather/4.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sun
2-
lightparticle.png
2+
lightparticle
33
sun.png
44
false
55
250

assets/weather/hailstone.png

-2.77 KB
Binary file not shown.

assets/weather/lightparticle.png

-2.61 KB
Binary file not shown.

assets/weather/rain

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ timeline0: 0.0
6060
- Scale -
6161
lowMin: 0.0
6262
lowMax: 0.0
63-
highMin: 12.0
64-
highMax: 14.0
63+
highMin: 6.0
64+
highMax: 8.0
6565
relative: false
6666
scalingCount: 1
6767
scaling0: 1.0

assets/weather/raindrop.png

-2.78 KB
Binary file not shown.

assets/weather/sand.png

-2.73 KB
Binary file not shown.

core/src/com/mygdx/game/battlewindow/ContinuousGameFrame.java

+4
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,10 @@ public void setTemporalModifier(float temporalModifier) {
414414
ContinuousGameFrame.temporalModifier = temporalModifier;
415415
}
416416

417+
public static TextureAtlas getBattleAtlas() {
418+
return battleAtlas;
419+
}
420+
417421
public void drawRect(Rectangle rect) {
418422
objectDebugger.rect(rect.getX(), rect.getY(), rect.getWidth(), rect.getHeight());
419423
}

core/src/com/mygdx/game/battlewindow/WeatherAnimation.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
import com.badlogic.gdx.graphics.g2d.Batch;
99
import com.badlogic.gdx.graphics.g2d.ParticleEffect;
1010
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
11-
import com.sun.org.apache.xalan.internal.lib.ExsltDatetime;
1211

1312
import java.io.BufferedReader;
1413
import java.io.InputStreamReader;
15-
import java.util.logging.Logger;
1614

1715
public class WeatherAnimation {
1816
private boolean hasTexture = false;
@@ -57,7 +55,7 @@ public WeatherAnimation(FileHandle pack) {
5755
break;
5856
}
5957
case 1: {
60-
particleImagePath = "weather/" + line;
58+
particleImagePath = line;
6159
break;
6260
}
6361
case 2: {
@@ -103,7 +101,7 @@ public WeatherAnimation(FileHandle pack) {
103101
}
104102

105103
public void load() {
106-
effect.load(Gdx.files.internal(particleEffectPath), Gdx.files.internal("weather/"));
104+
effect.load(Gdx.files.internal(particleEffectPath), ContinuousGameFrame.getBattleAtlas());
107105
effect.setPosition(x, y);
108106
if (hasTexture) {
109107
texture = new Texture(Gdx.files.internal(textureImagePath));

html/src/com/mygdx/game/client/HtmlEvents.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ public void launch(ContinuousGameFrame Frame) {
7171
bridge.log("Check particle info");
7272
MyAssetChecker.checkText(sendevent.getWeather().particleEffectPath, this);
7373
}
74-
if (!sendevent.getWeather().particleImagePath.equals("")) {
75-
queueSize += 1;
76-
bridge.log("Check particle image");
77-
MyAssetChecker.checkImage(sendevent.getWeather().particleImagePath, this);
78-
}
74+
// if (!sendevent.getWeather().particleImagePath.equals("")) {
75+
// queueSize += 1;
76+
// bridge.log("Check particle image");
77+
// MyAssetChecker.checkImage(sendevent.getWeather().particleImagePath, this);
78+
// }
7979
if (!sendevent.getWeather().textureImagePath.equals("")) {
8080
queueSize += 1;
8181
bridge.log("Check weather texture");

0 commit comments

Comments
 (0)