Skip to content

Y
YGOMobile
Commit 46365978 authored by fallenstardust's avatar fallenstardust
Browse files
Options

3.10.0 LOG

parent 3b628668
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 124 deletions
Classes/gframe/event_handler.cpp
View file @ 46365978
......@@ -1748,7 +1748,10 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
break;
if(mainGame->wCardSelect->isVisible())
break;
if (mainGame->wQuery->isVisible() || mainGame->wANAttribute->isVisible() || mainGame->wANCard->isVisible() || mainGame->wANNumber->isVisible() || mainGame->wOptions->isVisible()){
if (mainGame->wQuery->isVisible() || mainGame->wANAttribute->isVisible()
|| mainGame->wANCard->isVisible() || mainGame->wANNumber->isVisible()
|| mainGame->wCardSelect->isVisible()
||mainGame->wOptions->isVisible()){
display_cards.clear();
int loc_id = 0;
switch(hovered_location) {
......
Classes/gframe/game.cpp
View file @ 46365978
......@@ -707,7 +707,7 @@ bool Game::Initialize(ANDROID_APP app, android::InitOptions *options) {
btnOption[i] = env->addButton(rect<s32>(20 * xScale, (20 + 60 * i) * yScale, 370 * xScale, (70 + 60 * i) * yScale), wOptions, BUTTON_OPTION_0 + i, L"");
ChangeToIGUIImageButton(btnOption[i], imageManager.tButton_L, imageManager.tButton_L_pressed);
}
scrOption = env->addScrollBar(false, rect<s32>(350 * xScale, 30 * yScale, 380 * xScale, 220 * yScale), wOptions, SCROLL_OPTION_SELECT);
scrOption = env->addScrollBar(false, rect<s32>(0 * xScale, 0 * yScale, 0 * xScale, 0 * yScale), wOptions, SCROLL_OPTION_SELECT);
scrOption->setLargeStep(1);
scrOption->setSmallStep(1);
scrOption->setMin(0);
......
mobile/assets/changelog.html
View file @ 46365978
......@@ -16,27 +16,27 @@
特别感谢： 尸体233,废话多,大毛,幻兽L 的支持与努力.
</pre>
<ul>
<li style="color:#ffff00">3.9.8</li>
<li style="color:#ffff00">3.10.0</li>
</ul>
<pre>
更新：
1.更新ygo内核；
2.新卡DP27+VP22+T1108+AC02+VJ；
3.2022-7-1OCG禁卡表；
4.2022-5-17TCG禁卡表；
2.新卡SD44+1110+vj；
3.增加询问弹窗时可以点击查看墓地除外的场景；
变更：
1.修复bot一些出牌问题；
2.先行卡覆盖时删除旧的卡组展示文件；
3.修复卡组码保存卡组后无法刷新的问题；
4.竖屏卡组管理
·增加显示主卡组第一张卡预览；
·增加是否符合最新禁卡表标识；
·增加是否含有先行卡标识；
·增加主卡额外副卡统计数量；
·增加主卡数量不够的高亮显示；
1.更改UI；
（软件基本重做了太多了写不完了）
2.完善萌卡功能：
·新闻推送
·聊天室
3.更改包名，让纯净模式下可以安装
</pre>
<h3 style="color:#ff0000">注意</h3>
<pre>
此次更新会和旧版共存，但旧版不会再更新，给用户备份数据的时间；
从旧版转移卡组可以使用竖屏组卡器的备份功能，备份后再在新版的同位置使用还原功能。
卸载本软件将删除包含卡组在内的重要文件，卸载前请慎重；
</pre>
</body>
......
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @ 46365978
......@@ -284,112 +284,4 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
protected abstract void openGame();
/*
//https://www.jianshu.com/p/99649af3b191
public void showNewbieGuide(String scene) {
HighlightOptions options = new HighlightOptions.Builder()//绘制一个高亮虚线圈
.setOnHighlightDrewListener(new OnHighlightDrewListener() {
@Override
public void onHighlightDrew(Canvas canvas, RectF rectF) {
Paint paint = new Paint();
paint.setColor(Color.WHITE);
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(20);
paint.setPathEffect(new DashPathEffect(new float[]{20, 20}, 0));
canvas.drawCircle(rectF.centerX(), rectF.centerY(), rectF.width() / 2 + 10, paint);
}
}).build();
HighlightOptions options2 = new HighlightOptions.Builder()//绘制一个高亮虚线矩形
.setOnHighlightDrewListener(new OnHighlightDrewListener() {
@Override
public void onHighlightDrew(Canvas canvas, RectF rectF) {
Paint paint = new Paint();
paint.setColor(Color.WHITE);
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(20);
paint.setPathEffect(new DashPathEffect(new float[]{20, 20}, 0));
canvas.drawRect(rectF, paint);
}
}).build();
if (scene == "homePage") {
NewbieGuide.with(this)//with方法可以传入Activity或者Fragment，获取引导页的依附者
.setLabel("homepageGuide")
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(findViewById(R.id.menu), HighLight.Shape.CIRCLE, options)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
//可只创建一个引导layout并把相关内容都放在其中并GONE，获得ID并初始化相应为显示
view.findViewById(R.id.view_abt_menu).setVisibility(View.VISIBLE);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(findViewById(R.id.mycard), HighLight.Shape.CIRCLE, options)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_about);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_mycard);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(findViewById(R.id.list_server), HighLight.Shape.ROUND_RECTANGLE, options2)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_about);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_serverlist);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
view.findViewById(R.id.view_abt_server_edit).setVisibility(View.VISIBLE);
}
})
)
//.alwaysShow(true)//总是显示，调试时可以打开
.show();
} else if (scene == "joinRoom") {
NewbieGuide.with(this)
.setLabel("joinRoomGuide")
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
view.findViewById(R.id.view_abt_join_room).setVisibility(View.VISIBLE);
}
})
)
.show();
}
}*/
}
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java
View file @ 46365978
......@@ -4,6 +4,11 @@ import static cn.garymb.ygomobile.Constants.ASSET_SERVER_LIST;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.DashPathEffect;
import android.graphics.Paint;
import android.graphics.RectF;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
......@@ -32,6 +37,13 @@ import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.app.hubert.guide.NewbieGuide;
import com.app.hubert.guide.core.Controller;
import com.app.hubert.guide.listener.OnHighlightDrewListener;
import com.app.hubert.guide.listener.OnLayoutInflatedListener;
import com.app.hubert.guide.model.GuidePage;
import com.app.hubert.guide.model.HighLight;
import com.app.hubert.guide.model.HighlightOptions;
import com.ourygo.assistant.base.listener.OnDuelAssistantListener;
import com.ourygo.assistant.util.DuelAssistantManagement;
import com.ourygo.assistant.util.Util;
......@@ -116,12 +128,12 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
private CardView cv_help;
private Bundle mBundle;
private View layoutView;
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
View layoutView;
layoutView = inflater.inflate(R.layout.fragment_home, container, false);
initView(layoutView);
initBanner(layoutView, savedInstanceState);
......@@ -133,6 +145,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
if (!EventBus.getDefault().isRegistered(this)) {//加上判断
EventBus.getDefault().register(this);
}
//showNewbieGuide("homePage");
return layoutView;
}
......@@ -693,4 +706,146 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
break;
}
}
/*//https://www.jianshu.com/p/99649af3b191
public void showNewbieGuide(String scene) {
HighlightOptions options = new HighlightOptions.Builder()//绘制一个高亮虚线圈
.setOnHighlightDrewListener(new OnHighlightDrewListener() {
@Override
public void onHighlightDrew(Canvas canvas, RectF rectF) {
Paint paint = new Paint();
paint.setColor(Color.WHITE);
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(20);
paint.setPathEffect(new DashPathEffect(new float[]{20, 20}, 0));
canvas.drawCircle(rectF.centerX(), rectF.centerY(), rectF.width() / 2 + 10, paint);
}
}).build();
HighlightOptions options2 = new HighlightOptions.Builder()//绘制一个高亮虚线矩形
.setOnHighlightDrewListener(new OnHighlightDrewListener() {
@Override
public void onHighlightDrew(Canvas canvas, RectF rectF) {
Paint paint = new Paint();
paint.setColor(Color.WHITE);
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(20);
paint.setPathEffect(new DashPathEffect(new float[]{20, 20}, 0));
canvas.drawRect(rectF, paint);
}
}).build();
if (scene == "homePage") {
NewbieGuide.with(this)//with方法可以传入Activity或者Fragment，获取引导页的依附者
.setLabel("homepageGuide")
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(layoutView.findViewById(R.id.cv_banner), HighLight.Shape.RECTANGLE, options)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
//可只创建一个引导layout并把相关内容都放在其中并GONE，获得ID并初始化相应为显示
TextView tv = view.findViewById(R.id.text_about);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_view_banner);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(layoutView.findViewById(R.id.list_server), HighLight.Shape.ROUND_RECTANGLE, options2)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_abt_mid_right);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_serverlist);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_abt_mid_right);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_serverlist);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_abt_mid_right);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_serverlist);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(layoutView.findViewById(R.id.action_help), HighLight.Shape.RECTANGLE, options)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_abt_mid_left);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_help);
}
})
)
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.addHighLightWithOptions(layoutView.findViewById(R.id.nav_webpage), HighLight.Shape.RECTANGLE, options)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
TextView tv = view.findViewById(R.id.text_abt_mid_left);
tv.setVisibility(View.VISIBLE);
tv.setText(R.string.guide_help);
}
})
)
//.alwaysShow(true)//总是显示，调试时可以打开
.show();
} else if (scene == "joinRoom") {
NewbieGuide.with(this)
.setLabel("joinRoomGuide")
.addGuidePage(
GuidePage.newInstance().setEverywhereCancelable(true)
.setBackgroundColor(0xbc000000)
.setLayoutRes(R.layout.view_guide_home)
.setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
@Override
public void onLayoutInflated(View view, Controller controller) {
view.findViewById(R.id.view_abt_join_room).setVisibility(View.VISIBLE);
}
})
)
.show();
}
}*/
}
mobile/src/main/res/values-ko/strings.xml
View file @ 46365978
......@@ -319,6 +319,7 @@
<string name="guide_button_search_result">검색 결과를 보려면 여기를 클릭하세요. 즐겨찾는 카드도 표시됩니다.</string>
<string name="guide_view_deck_manager">덱 관리에서 덱 카테고리와 덱을 클릭하여 관리할 수 있습니다.</string>
<string name="guide_view_move_card">원하는 카드를 길게 누르거나 다른 위치로 이동할 수 있고, 제거할 수 있습니다.</string>
<string name="guide_view_banner">Mycard News, you can click to see\only in Chinese now, Sorry</string>
<string name="title_delete_ex">확장 삭제</string>
<string name="ask_delete_ex">지우려면 확인을 클릭하십시오.</string>
<string name="about_delete_ex">만약 확장 카드를 사용하면서 문제가 발생했을 경우, 삭제하는 것도 좋은 선택이다</string>
......
mobile/src/main/res/values-zh/strings.xml
View file @ 46365978
......@@ -319,6 +319,7 @@
<string name="guide_button_search_result">点击显示搜索结果\n默认显示收藏的卡片</string>
<string name="guide_view_deck_manager">点击切换卡组\n也可以在此管理多个卡组分类</string>
<string name="guide_view_move_card">按住一张卡片可以拖动到其他位置\n长按这张卡片即可删除它</string>
<string name="guide_view_banner">萌卡新闻轮播，可以点击查看内容</string>
<string name="title_delete_ex">删除扩展卡包</string>
<string name="ask_delete_ex">点击确认以清空</string>
<string name="about_delete_ex">如果遇到拓展卡包问题时删除是个不错的办法</string>
......
mobile/src/main/res/values/strings.xml
View file @ 46365978
......@@ -320,6 +320,7 @@
<string name="guide_button_search_result">click to see search result\n also here will shows favorite cards</string>
<string name="guide_view_deck_manager">click to change Decks\n you can manage deck categories here</string>
<string name="guide_view_move_card">press a card to move it to other place\nlong-press this card to delete it</string>
<string name="guide_view_banner">Mycard News, you can click to see\only in Chinese now, Sorry</string>
<string name="title_delete_ex">delete expansions</string>
<string name="about_delete_ex">if you need to delte all expansion cards</string>
<string name="file_installed">file loaded</string>
......
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