|
@@ -295,7 +295,11 @@ public class SkeletonJson {
|
|
|
data.intValue = eventMap.getInt("int", 0);
|
|
|
data.floatValue = eventMap.getFloat("float", 0f);
|
|
|
data.stringValue = eventMap.getString("string", "");
|
|
|
- data.audioPath = eventMap.getString("audio", "");
|
|
|
+ data.audioPath = eventMap.getString("audio", null);
|
|
|
+ if (data.audioPath != null) {
|
|
|
+ data.volume = eventMap.getFloat("volume", 1);
|
|
|
+ data.balance = eventMap.getFloat("balance", 0);
|
|
|
+ }
|
|
|
skeletonData.events.add(data);
|
|
|
}
|
|
|
|
|
@@ -736,9 +740,13 @@ public class SkeletonJson {
|
|
|
EventData eventData = skeletonData.findEvent(eventMap.getString("name"));
|
|
|
if (eventData == null) throw new SerializationException("Event not found: " + eventMap.getString("name"));
|
|
|
Event event = new Event(eventMap.getFloat("time"), eventData);
|
|
|
- event.intValue = eventMap.getInt("int", eventData.getInt());
|
|
|
- event.floatValue = eventMap.getFloat("float", eventData.getFloat());
|
|
|
- event.stringValue = eventMap.getString("string", eventData.getString());
|
|
|
+ event.intValue = eventMap.getInt("int", eventData.intValue);
|
|
|
+ event.floatValue = eventMap.getFloat("float", eventData.floatValue);
|
|
|
+ event.stringValue = eventMap.getString("string", eventData.stringValue);
|
|
|
+ if (event.getData().audioPath != null) {
|
|
|
+ event.volume = eventMap.getFloat("volume", eventData.volume);
|
|
|
+ event.balance = eventMap.getFloat("balance", eventData.balance);
|
|
|
+ }
|
|
|
timeline.setFrame(frameIndex++, event);
|
|
|
}
|
|
|
timelines.add(timeline);
|