Merge branch 'master' of http://192.168.200.25:3000/Lenheart/MXD-Server
# Conflicts: # src/gui/UI_LenheartUI/ExplosiveControl.java
This commit is contained in:
parent
20658bd1d3
commit
f9c37bb84e
|
|
@ -212,6 +212,7 @@ public class ExplosiveControl extends JPanel {
|
||||||
|
|
||||||
File selectedFile = fileChooser.getSelectedFile();
|
File selectedFile = fileChooser.getSelectedFile();
|
||||||
Drop.importDataMob(selectedFile.getAbsolutePath());
|
Drop.importDataMob(selectedFile.getAbsolutePath());
|
||||||
|
刷新怪物爆物数据(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -281,6 +282,7 @@ public class ExplosiveControl extends JPanel {
|
||||||
|
|
||||||
File selectedFile = fileChooser.getSelectedFile();
|
File selectedFile = fileChooser.getSelectedFile();
|
||||||
Drop.importDataQQ(selectedFile.getAbsolutePath());
|
Drop.importDataQQ(selectedFile.getAbsolutePath());
|
||||||
|
刷新怪物爆物数据(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue