Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

添加一些道具的兑换与使用 #202

Merged
TKaxv-7S merged 2 commits into from
Jul 13, 2024
Merged

添加一些道具的兑换与使用 #202

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee04314
添加 隐身卡的兑换与使用
LazyImmortal Jul 13, 2024
bcc2d64
Merge branch 'TKaxv-7S:main' into dev
LazyImmortal Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions app/src/main/java/tkaxv7s/xposed/sesame/model/task/antForest/AntForestV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ public class AntForestV2 extends ModelTask {
@Getter
private IntegerModelField doubleCountLimit;
private BooleanModelField doubleCardConstant;
private BooleanModelField stealthCardConstant;
private BooleanModelField useStealthCard;
private BooleanModelField exchangeStealthCard;
private BooleanModelField helpFriendCollect;
private ChoiceModelField helpFriendCollectType;
private SelectModelField helpFriendCollectList;
Expand Down Expand Up @@ -172,6 +175,8 @@ public ModelFields getFields() {
modelFields.addField(exchangeEnergyDoubleClickLongTime = new BooleanModelField("exchangeEnergyDoubleClickLongTime", "活力值 | 兑换永久双击卡", false));
modelFields.addField(exchangeEnergyDoubleClickCountLongTime = new IntegerModelField("exchangeEnergyDoubleClickCountLongTime", "活力值 | 兑换永久双击卡数量", 6));
modelFields.addField(exchangeCollectHistoryAnimal7Days = new BooleanModelField("exchangeCollectHistoryAnimal7Days", "活力值 | 兑换物种历史卡", false));
modelFields.addField(exchangeStealthCard = new BooleanModelField("exchangeStealthCard", "活力值 | 兑换限时隐身卡", false));
modelFields.addField(useStealthCard = new BooleanModelField("useStealthCard", "使用限时隐身卡", false));
modelFields.addField(whackMole = new BooleanModelField("whackMole", "6秒拼手速", true));
modelFields.addField(collectProp = new BooleanModelField("collectProp", "收集道具", false));
modelFields.addField(collectWateringBubble = new BooleanModelField("collectWateringBubble", "收金球", false));
Expand Down Expand Up @@ -242,6 +247,15 @@ public void run() {
offsetTime.set(0);
}

// 兑换 限时隐身卡
if (exchangeStealthCard.getValue()) {
exchangePropShop(findPropShop("SP20230521000082", "SK20230521000206"), 1);
}
// 使用 限时隐身卡
if (useStealthCard.getValue()) {
usePropBag(findPropBag("LIMIT_TIME_STEALTH_CARD"));
}

collectSelfEnergy();
try {
JSONObject friendsObject = new JSONObject(AntForestRpcCall.queryEnergyRanking());
Expand Down Expand Up @@ -1420,15 +1434,10 @@ private void exchangeEnergyDoubleClickLongTime(int count) {

// 兑换 神奇物种抽历史卡机会
private void exchangeCollectHistoryAnimal7Days() {
try {
// 商店查找 神奇物种抽历史卡机会
JSONObject jo = findPropShop("SP20230518000022", "SK20230518000062");
// 商店兑换 神奇物种抽历史卡机会
exchangePropShop(jo, 1);
} catch (Throwable t) {
Log.i(TAG, "exchangeCollectHistoryAnimal7Days err:");
Log.printStackTrace(TAG, t);
}
// 商店查找 神奇物种抽历史卡机会
JSONObject jo = findPropShop("SP20230518000022", "SK20230518000062");
// 商店兑换 神奇物种抽历史卡机会
exchangePropShop(jo, 1);
}

private void receiveTaskAward() {
Expand Down Expand Up @@ -2429,8 +2438,8 @@ private boolean usePropBag(JSONObject prop) {
} catch (Throwable th) {
Log.i(TAG, "usePropBag err:");
Log.printStackTrace(TAG, th);
return false;
}
return false;
}

/*
Expand Down Expand Up @@ -2513,8 +2522,8 @@ private boolean exchangePropShop(JSONObject sku, int exchangeCountlimit) {
} catch (Throwable th) {
Log.i(TAG, "exchangePropShop err:");
Log.printStackTrace(TAG, th);
return false;
}
return false;
}

/**
Expand Down