Commit 7eb249aa authored by fallenstardust's avatar fallenstardust

fix&移除额外禁卡表

parent a6b96c02
...@@ -11,44 +11,8 @@ DeckManager deckManager; ...@@ -11,44 +11,8 @@ DeckManager deckManager;
void DeckManager::LoadLFList(const char* path) { void DeckManager::LoadLFList(const char* path) {
LFList* cur = NULL; LFList* cur = NULL;
FILE* fp = fopen(path, "r"); FILE* fp = fopen(path, "r");
FILE* fp_custom = fopen((workingDir + path("/expansions/lflist.conf")).c_str(), "r");
char linebuf[256]; char linebuf[256];
wchar_t strBuffer[256]; wchar_t strBuffer[256];
if(fp_custom) {
while(fgets(linebuf, 256, fp_custom)) {
if(linebuf[0] == '#')
continue;
int p = 0, sa = 0, code, count;
if(linebuf[0] == '!') {
sa = BufferIO::DecodeUTF8((const char*)(&linebuf[1]), strBuffer);
while(strBuffer[sa - 1] == L'\r' || strBuffer[sa - 1] == L'\n' ) sa--;
LFList newlist;
_lfList.push_back(newlist);
cur = &_lfList[_lfList.size() - 1];
memcpy(cur->listName, (const void*)strBuffer, 40);
cur->listName[sa] = 0;
cur->content = new std::unordered_map<int, int>;
cur->hash = 0x7dfcee6a;
continue;
}
while(linebuf[p] != ' ' && linebuf[p] != '\t' && linebuf[p] != 0) p++;
if(linebuf[p] == 0)
continue;
linebuf[p++] = 0;
sa = p;
code = atoi(linebuf);
if(code == 0)
continue;
while(linebuf[p] == ' ' || linebuf[p] == '\t') p++;
while(linebuf[p] != ' ' && linebuf[p] != '\t' && linebuf[p] != 0) p++;
linebuf[p] = 0;
count = atoi(&linebuf[sa]);
if(cur == NULL) continue;
(*cur->content)[code] = count;
cur->hash = cur->hash ^ ((code << 18) | (code >> 14)) ^ ((code << (27 + count)) | (code >> (5 - count)));
}
fclose(fp_custom);
}
if(fp) { if(fp) {
while(fgets(linebuf, 256, fp)) { while(fgets(linebuf, 256, fp)) {
if(linebuf[0] == '#') if(linebuf[0] == '#')
......
...@@ -1833,6 +1833,11 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) { ...@@ -1833,6 +1833,11 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
u32 pos = mainGame->scrCardText->getPos(); u32 pos = mainGame->scrCardText->getPos();
mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 25, mainGame->textFont, mainGame->showingtext, pos); mainGame->SetStaticText(mainGame->stText, mainGame->stText->getRelativePosition().getWidth() - 25, mainGame->textFont, mainGame->showingtext, pos);
return true; return true;
break;
}
}
break;
}
case irr::gui::EGET_EDITBOX_ENTER: { case irr::gui::EGET_EDITBOX_ENTER: {
switch(id) { switch(id) {
case EDITBOX_CHAT: { case EDITBOX_CHAT: {
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
</ul> </ul>
<pre> <pre>
更新: 更新:
1.更新ygo内核; 1.更新ygo内核;
2.移除版本号修改功能; 2.避免误导用户移除版本号修改功能★
修复: 修复:
1.一些已知的卡图错误; 1.一些已知的卡图错误;
2.下拉列表滚动容易弹回顶部的问题; 2.下拉列表滚动容易弹回顶部的问题;
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
优化: 优化:
1.扩大YGO一些列表视图的行间距; 1.扩大YGO一些列表视图的行间距;
2.局域网房间探测IP端口的成功率; 2.局域网房间探测IP端口的成功率;
3.微调UI;
4.新增启动时检查更新和手动检查更新(设置里);
</pre> </pre>
<ul> <ul>
<li style="color:#ffffff">3.1.9</li> <li style="color:#ffffff">3.1.9</li>
......
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
applicationId "cn.garymb.ygomobile" applicationId "cn.garymb.ygomobile"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 22 targetSdkVersion 22
versionCode 32000505 versionCode 32000506
versionName "3.2.0" versionName "3.2.0"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
ndk { ndk {
......
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