Commit e5772efc authored by fallenstardust's avatar fallenstardust

补回执行复制lflist

tweak
parent 81c0870e
...@@ -848,7 +848,7 @@ bool Game::Initialize(ANDROID_APP app) { ...@@ -848,7 +848,7 @@ bool Game::Initialize(ANDROID_APP app) {
btnClearDeck = env->addButton(rect<s32>(240 * xScale, 95 * yScale, 290 * xScale, 116 * yScale), wDeckEdit, BUTTON_CLEAR_DECK, dataManager.GetSysString(1304)); btnClearDeck = env->addButton(rect<s32>(240 * xScale, 95 * yScale, 290 * xScale, 116 * yScale), wDeckEdit, BUTTON_CLEAR_DECK, dataManager.GetSysString(1304));
ChangeToIGUIImageButton(btnClearDeck, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnClearDeck, imageManager.tButton_S, imageManager.tButton_S_pressed);
btnSideOK = env->addButton(rect<s32>(510 * xScale, 40 * yScale, 820 * xScale, 80 * yScale), 0, BUTTON_SIDE_OK, dataManager.GetSysString(1334)); btnSideOK = env->addButton(rect<s32>(510 * xScale, 40 * yScale, 820 * xScale, 80 * yScale), 0, BUTTON_SIDE_OK, dataManager.GetSysString(1334));
ChangeToIGUIImageButton(btnSideOK, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSideOK, imageManager.tButton_L, imageManager.tButton_L_pressed);
btnSideOK->setVisible(false); btnSideOK->setVisible(false);
btnSideShuffle = env->addButton(rect<s32>(310 * xScale, 100 * yScale, 370 * xScale, 130 * yScale), 0, BUTTON_SHUFFLE_DECK, dataManager.GetSysString(1307)); btnSideShuffle = env->addButton(rect<s32>(310 * xScale, 100 * yScale, 370 * xScale, 130 * yScale), 0, BUTTON_SHUFFLE_DECK, dataManager.GetSysString(1307));
ChangeToIGUIImageButton(btnSideShuffle, imageManager.tButton_S, imageManager.tButton_S_pressed); ChangeToIGUIImageButton(btnSideShuffle, imageManager.tButton_S, imageManager.tButton_S_pressed);
......
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
35261759 35261759
23002292 23002292
50588353 50588353
37818794 82385847
\ No newline at end of file \ No newline at end of file
...@@ -18,12 +18,13 @@ ...@@ -18,12 +18,13 @@
56364287 56364287
56364287 56364287
56364287 56364287
23434538
23434538
24299458 24299458
24299458 24299458
24299458 24299458
24224830 24224830
24224830 24224830
24224830
86686671 86686671
63995093 63995093
63995093 63995093
...@@ -34,7 +35,6 @@ ...@@ -34,7 +35,6 @@
37630732 37630732
25311006 25311006
25311006 25311006
25311006
18144506 18144506
3659803 3659803
3659803 3659803
...@@ -61,8 +61,6 @@ ...@@ -61,8 +61,6 @@
82385847 82385847
82385847 82385847
23434538 23434538
23434538
23434538
48130397 48130397
48130397 48130397
86686671 86686671
...@@ -71,4 +69,6 @@ ...@@ -71,4 +69,6 @@
5851097 5851097
14532163 14532163
14532163 14532163
14532163 14532163
\ No newline at end of file 20899496
20899496
\ No newline at end of file
...@@ -30,7 +30,11 @@ import ocgcore.CardManager; ...@@ -30,7 +30,11 @@ import ocgcore.CardManager;
import ocgcore.DataManager; import ocgcore.DataManager;
import static cn.garymb.ygomobile.Constants.ASSETS_PATH; import static cn.garymb.ygomobile.Constants.ASSETS_PATH;
import static cn.garymb.ygomobile.Constants.BOT_CONF;
import static cn.garymb.ygomobile.Constants.CORE_BOT_CONF_PATH; import static cn.garymb.ygomobile.Constants.CORE_BOT_CONF_PATH;
import static cn.garymb.ygomobile.Constants.CORE_LIMIT_PATH;
import static cn.garymb.ygomobile.Constants.CORE_STRING_PATH;
import static cn.garymb.ygomobile.Constants.CORE_SYSTEM_PATH;
import static cn.garymb.ygomobile.Constants.DATABASE_NAME; import static cn.garymb.ygomobile.Constants.DATABASE_NAME;
public class ResCheckTask extends AsyncTask<Void, Integer, Integer> { public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
...@@ -354,13 +358,14 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> { ...@@ -354,13 +358,14 @@ public class ResCheckTask extends AsyncTask<Void, Integer, Integer> {
if (count < 3) { if (count < 3) {
return ERROR_CORE_CONFIG_LOST; return ERROR_CORE_CONFIG_LOST;
}*/ }*/
File systemfile = new File(AppsSettings.get().getResourcePath(), Constants.CORE_SYSTEM_PATH); File systemfile = new File(AppsSettings.get().getResourcePath(), CORE_SYSTEM_PATH);
File stringfile = new File(AppsSettings.get().getResourcePath(), Constants.CORE_STRING_PATH); File stringfile = new File(AppsSettings.get().getResourcePath(), CORE_STRING_PATH);
File botfile = new File(AppsSettings.get().getResourcePath(), Constants.BOT_CONF); File botfile = new File(AppsSettings.get().getResourcePath(), BOT_CONF);
if (!systemfile.exists()) { if (!systemfile.exists()) {
IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + Constants.CORE_SYSTEM_PATH, toPath, false); IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + CORE_SYSTEM_PATH, toPath, false);
} }
IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + Constants.CORE_STRING_PATH, toPath, needsUpdate); IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + CORE_LIMIT_PATH, toPath, needsUpdate);
IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + CORE_STRING_PATH, toPath, needsUpdate);
IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + CORE_BOT_CONF_PATH, toPath, needsUpdate); IOUtils.copyFilesFromAssets(mContext, getDatapath("conf") + "/" + CORE_BOT_CONF_PATH, toPath, needsUpdate);
//替换换行符 //替换换行符
fixString(stringfile.getAbsolutePath()); fixString(stringfile.getAbsolutePath());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment