Compare commits

...

7 Commits

Author SHA1 Message Date
physligl
432ce1bb14 update repo.json
Some checks failed
Build repo.json / build (18.x) (push) Has been cancelled
Build repo.json / upload (push) Has been cancelled
2025-05-16 10:55:10 +00:00
秋云
627336891b fix: git diff 2025-05-16 18:54:09 +08:00
秋云
87beabf167 Merge remote-tracking branch 'upstream/main' 2025-05-16 18:49:30 +08:00
秋云
d14aed4c89 Revert "自动修复 JSON 格式和版本号 [ci skip]"
This reverts commit d17a9c5d08.
2025-05-16 18:49:05 +08:00
physligl
37bc64a821 update repo.json 2025-05-16 10:39:08 +00:00
秋云
6d28820c5f Merge remote-tracking branch 'upstream/main' 2025-05-16 18:35:46 +08:00
秋云
c48a991b3a fix: origin 2025-05-16 18:35:18 +08:00
3094 changed files with 14901 additions and 15171 deletions

View File

@@ -32,6 +32,32 @@ jobs:
pull-requests: write
steps:
- name: Set environment variables based on trigger type
id: set_env
run: |
# 根据触发类型设置环境变量
if [ "${{ github.event_name }}" = "pull_request_target" ]; then
echo "触发类型: PR触发"
echo "trigger_type=pr" >> $GITHUB_OUTPUT
echo "validate_path=pr_files" >> $GITHUB_OUTPUT
echo "auto_fix=true" >> $GITHUB_OUTPUT
echo "pr_number=${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
echo "head_ref=${{ github.event.pull_request.head.ref }}" >> $GITHUB_OUTPUT
echo "head_repo=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_OUTPUT
echo "base_ref=${{ github.event.pull_request.base.ref }}" >> $GITHUB_OUTPUT
echo "base_sha=${{ github.event.pull_request.base.sha }}" >> $GITHUB_OUTPUT
else
echo "触发类型: 手动触发"
echo "trigger_type=manual" >> $GITHUB_OUTPUT
echo "validate_path=${{ github.event.inputs.path }}" >> $GITHUB_OUTPUT
echo "auto_fix=${{ github.event.inputs.auto_fix }}" >> $GITHUB_OUTPUT
echo "pr_number=${{ github.event.inputs.pr_number }}" >> $GITHUB_OUTPUT
echo "head_ref=" >> $GITHUB_OUTPUT
echo "head_repo=" >> $GITHUB_OUTPUT
echo "base_ref=main" >> $GITHUB_OUTPUT
echo "base_sha=" >> $GITHUB_OUTPUT
fi
- name: Checkout code
uses: actions/checkout@v4
with:
@@ -51,6 +77,10 @@ jobs:
- name: Debug file structure
run: |
echo "触发类型: ${{ steps.set_env.outputs.trigger_type }}"
echo "验证路径: ${{ steps.set_env.outputs.validate_path }}"
echo "自动修复: ${{ steps.set_env.outputs.auto_fix }}"
echo "PR号: ${{ steps.set_env.outputs.pr_number }}"
echo "Current directory: $(pwd)"
echo "List files in root:"
ls -la
@@ -71,15 +101,25 @@ jobs:
echo "当前远程仓库配置:"
git remote -v
# 设置上游仓库(upstream)和origin
UPSTREAM_REPO="https://github.com/${{ github.repository }}.git"
ORIGIN_REPO="https://github.com/${{ github.event.pull_request.head.repo.full_name || github.repository }}.git"
# 设置变量
MAIN_REPO="${{ github.repository }}"
PR_REPO="${{ github.event.pull_request.head.repo.full_name || github.repository }}"
# 设置上游仓库(upstream)指向主仓库
UPSTREAM_REPO="https://github.com/${MAIN_REPO}.git"
echo "设置upstream指向主仓库: $UPSTREAM_REPO"
git remote remove upstream 2>/dev/null || true
git remote add upstream $UPSTREAM_REPO
echo "确保origin指向正确的仓库: $ORIGIN_REPO"
# 确保origin指向PR的fork仓库
if [ "$PR_REPO" != "$MAIN_REPO" ] && [ "${{ steps.set_env.outputs.trigger_type }}" = "pr" ]; then
ORIGIN_REPO="https://github.com/${PR_REPO}.git"
echo "PR来自fork仓库设置origin指向: $ORIGIN_REPO"
else
ORIGIN_REPO=$UPSTREAM_REPO
echo "PR来自同一仓库或非PR触发origin与upstream相同: $ORIGIN_REPO"
fi
git remote set-url origin $ORIGIN_REPO 2>/dev/null || git remote add origin $ORIGIN_REPO
# 获取最新的主仓库和分支
@@ -91,20 +131,35 @@ jobs:
echo "更新后的远程仓库配置:"
git remote -v
# 检查是否处于PR环境
if [ -n "${{ github.event.pull_request.head.ref }}" ]; then
echo "检测到PR切换到PR分支: ${{ github.event.pull_request.head.ref }}"
git checkout "${{ github.event.pull_request.head.ref }}"
# 检查是否处于PR环境并切换到正确的分支
if [ "${{ steps.set_env.outputs.trigger_type }}" = "pr" ] && [ -n "${{ steps.set_env.outputs.head_ref }}" ]; then
echo "检测到PR切换到PR分支: ${{ steps.set_env.outputs.head_ref }}"
if [ "$PR_REPO" != "$MAIN_REPO" ]; then
# fork仓库的PR需要先创建本地分支追踪fork的远程分支
git checkout -b "${{ steps.set_env.outputs.head_ref }}" --track "origin/${{ steps.set_env.outputs.head_ref }}" || \
git checkout -b "${{ steps.set_env.outputs.head_ref }}" --no-track && \
git push --set-upstream origin "${{ steps.set_env.outputs.head_ref }}"
else
# 同一仓库的PR
git checkout "${{ steps.set_env.outputs.head_ref }}" || git checkout -b "${{ steps.set_env.outputs.head_ref }}"
fi
elif [ -n "${{ github.ref_name }}" ]; then
echo "切换到分支: ${{ github.ref_name }}"
git checkout "${{ github.ref_name }}"
if [[ "${{ github.ref_name }}" == "main" ]]; then
# main分支需要明确指定
git checkout upstream/main -b main
else
git checkout "${{ github.ref_name }}" || git checkout -b "${{ github.ref_name }}"
fi
else
echo "创建临时分支"
git checkout -b temp-validation-branch
fi
- name: Prepare validation script
run: |
run: |
# 尝试从upstream/main获取validate.py
echo "尝试从上游仓库获取validate.py文件"
git show upstream/main:build/validate.py > build/validate.py 2>/dev/null
# 检查文件是否成功获取并且非空
@@ -113,11 +168,17 @@ jobs:
exit 1
else
echo "成功获取validate.py"
# 替换origin/main为upstream/main
sed -i 's/origin\/main/upstream\/main/g' build/validate.py
# 替换git来源标识
sed -i 's/"git"/"upstream"/g' build/validate.py
# 修改提示信息
sed -i 's/本地文件/PR提交的文件/g' build/validate.py
fi
- name: Get PR information
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.pr_number != '' }}
- name: Get PR information for workflow_dispatch
if: ${{ steps.set_env.outputs.trigger_type == 'manual' && steps.set_env.outputs.pr_number != '' }}
id: pr_info
uses: actions/github-script@v6
with:
@@ -127,7 +188,7 @@ jobs:
const pr = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: parseInt(${{ github.event.inputs.pr_number }})
pull_number: parseInt(${{ steps.set_env.outputs.pr_number }})
});
core.setOutput('head_sha', pr.data.head.sha);
@@ -135,7 +196,7 @@ jobs:
core.setOutput('head_repo', pr.data.head.repo.full_name);
core.setOutput('found', 'true');
console.log(`找到 PR #${{ github.event.inputs.pr_number }}`);
console.log(`找到 PR #${{ steps.set_env.outputs.pr_number }}`);
console.log(`Head SHA: ${pr.data.head.sha}`);
console.log(`Head Ref: ${pr.data.head.ref}`);
console.log(`Head Repo: ${pr.data.head.repo.full_name}`);
@@ -144,49 +205,104 @@ jobs:
const exec = require('child_process').execSync;
if (pr.data.head.ref) {
console.log(`切换到PR分支: ${pr.data.head.ref}`);
exec(`git checkout ${pr.data.head.ref}`);
exec(`git checkout ${pr.data.head.ref} || git checkout -b ${pr.data.head.ref}`);
}
} catch (error) {
console.log(`获取 PR #${{ github.event.inputs.pr_number }} 信息失败: ${error.message}`);
console.log(`获取 PR #${{ steps.set_env.outputs.pr_number }} 信息失败: ${error.message}`);
core.setOutput('found', 'false');
}
- name: Get changed files
- name: Get changed files for PR trigger
id: changed_files
if: github.event_name == 'pull_request_target'
if: ${{ steps.set_env.outputs.trigger_type == 'pr' }}
run: |
# 使用upstream/main作为比较基准
CHANGED_FILES=$(git diff --name-only upstream/main HEAD | grep -E '^repo/pathing/.*\.json$' || true)
echo "Changed JSON files in repo/pathing compared to upstream/main:"
echo "$CHANGED_FILES"
echo "changed_files=$CHANGED_FILES" >> $GITHUB_OUTPUT
# 输出分支信息便于调试
echo "当前分支: $(git branch --show-current)"
echo "HEAD指向: $(git rev-parse HEAD)"
echo "PR基础分支: ${{ steps.set_env.outputs.base_ref }}"
if [ -z "$CHANGED_FILES" ]; then
echo "No JSON files changed in repo/pathing directory"
# 确保有upstream/main分支
git fetch upstream main
echo "Upstream/main SHA: $(git rev-parse upstream/main)"
# 创建临时变量来存储修改的文件列表
CHANGED_FILES=""
# 方法1尝试使用git diff检测变化
echo "检测方法1: 使用git diff检测"
FILES_METHOD_1=$(git diff --name-only upstream/main HEAD | grep -E '^repo/pathing/.*\.json$' || true)
if [ -n "$FILES_METHOD_1" ]; then
echo "方法1找到的JSON文件:"
echo "$FILES_METHOD_1"
CHANGED_FILES="$FILES_METHOD_1"
else
echo "方法1未找到修改的JSON文件"
fi
# 方法2如果方法1失败尝试直接查询PR API获取修改的文件
if [ -z "$CHANGED_FILES" ] && [ -n "${{ steps.set_env.outputs.pr_number }}" ]; then
echo "检测方法2: 使用GitHub API检测"
PR_FILES=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/${{ github.repository }}/pulls/${{ steps.set_env.outputs.pr_number }}/files" | \
jq -r '.[] | select(.filename | test("^repo/pathing/.*\\.json$")) | .filename')
if [ -n "$PR_FILES" ]; then
echo "方法2找到的JSON文件:"
echo "$PR_FILES"
CHANGED_FILES="$PR_FILES"
else
echo "方法2未找到修改的JSON文件"
fi
fi
# 方法3如果前两种方法都失败列出所有repo/pathing中的JSON文件但限制在最近修改的
if [ -z "$CHANGED_FILES" ]; then
echo "检测方法3: 列出最近修改的JSON文件"
# 列出过去5次提交中修改的JSON文件
RECENT_FILES=$(git log -n 5 --name-only --pretty=format: | grep -E '^repo/pathing/.*\.json$' | sort -u || true)
if [ -n "$RECENT_FILES" ]; then
echo "最近修改的JSON文件:"
echo "$RECENT_FILES"
CHANGED_FILES="$RECENT_FILES"
echo "⚠️ 警告: 使用最近修改的文件作为回退方案"
else
echo "方法3未找到最近修改的JSON文件"
fi
fi
# 最后回退方案:直接指定验证目录
if [ -z "$CHANGED_FILES" ]; then
echo "⚠️ 警告: 所有方法均未检测到修改的JSON文件将验证整个repo/pathing目录"
CHANGED_FILES="repo/pathing"
fi
# 输出结果
echo "changed_files=$CHANGED_FILES" >> $GITHUB_OUTPUT
echo "最终找到的修改文件:"
echo "$CHANGED_FILES"
- name: Run validation and correction
- name: Run validation for PR trigger
if: ${{ steps.set_env.outputs.trigger_type == 'pr' }}
env:
GITHUB_ACTOR: ${{ github.actor }}
PR_NUMBER: ${{ github.event.pull_request.number || github.event.inputs.pr_number }}
PR_NUMBER: ${{ steps.set_env.outputs.pr_number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HEAD_REF: ${{ github.event.pull_request.head.ref || steps.pr_info.outputs.head_ref || '' }}
PR_REPO: ${{ github.event.pull_request.head.repo.full_name || steps.pr_info.outputs.head_repo || github.repository }}
VALIDATE_PATH: ${{ github.event.inputs.path || 'repo/pathing' }}
AUTO_FIX: ${{ github.event.inputs.auto_fix || 'true' }}
HEAD_REF: ${{ steps.set_env.outputs.head_ref }}
PR_REPO: ${{ steps.set_env.outputs.head_repo || github.repository }}
CHANGED_FILES: ${{ steps.changed_files.outputs.changed_files }}
run: |
# 根据触发方式决定验证路径和是否自动修复
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
echo "手动触发模式,验证路径: ${VALIDATE_PATH}"
python build/validate.py ${VALIDATE_PATH} $([[ "${AUTO_FIX}" == "true" ]] && echo "--fix")
echo "PR 触发模式,验证修改的 JSON 文件"
if [ -z "$CHANGED_FILES" ]; then
echo "没有找到修改的 JSON 文件,跳过验证"
exit 0
fi
# 检查CHANGED_FILES是否包含整个目录
if [ "$CHANGED_FILES" = "repo/pathing" ]; then
echo "验证整个目录: repo/pathing"
python build/validate.py "repo/pathing" --fix
else
echo "PR 触发模式,仅验证修改的 JSON 文件"
if [ -z "$CHANGED_FILES" ]; then
echo "没有找到修改的 JSON 文件,跳过验证"
exit 0
fi
# 单独验证每个修改的文件
for file in $CHANGED_FILES; do
echo "验证文件: $file"
@@ -220,16 +336,55 @@ jobs:
else
echo "没有文件被修改,无需提交"
fi
- name: Run validation for manual trigger
if: ${{ steps.set_env.outputs.trigger_type == 'manual' }}
env:
GITHUB_ACTOR: ${{ github.actor }}
PR_NUMBER: ${{ steps.set_env.outputs.pr_number }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HEAD_REF: ${{ steps.pr_info.outputs.head_ref || '' }}
PR_REPO: ${{ steps.pr_info.outputs.head_repo || github.repository }}
VALIDATE_PATH: ${{ steps.set_env.outputs.validate_path }}
AUTO_FIX: ${{ steps.set_env.outputs.auto_fix }}
run: |
echo "手动触发模式,验证路径: ${VALIDATE_PATH}"
python build/validate.py ${VALIDATE_PATH} $([[ "${AUTO_FIX}" == "true" ]] && echo "--fix")
# 如果关联了PR尝试提交更改
if [ -n "$PR_NUMBER" ] && [ -n "$HEAD_REF" ] && [ -n "$(git status --porcelain)" ]; then
echo "发现修改提交更改到PR: #$PR_NUMBER"
git add .
git commit -m "自动修复 JSON 格式和版本号 [ci skip]"
# 确定当前分支
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
echo "当前分支: ${CURRENT_BRANCH}"
if [ "$CURRENT_BRANCH" = "HEAD" ]; then
# 如果在detached HEAD状态使用正确的方式推送
echo "在detached HEAD状态使用HEAD_REF推送: ${HEAD_REF}"
git push origin HEAD:${HEAD_REF}
else
# 常规推送
echo "推送到分支: ${CURRENT_BRANCH}"
git push origin ${CURRENT_BRANCH}
fi
elif [ -n "$(git status --porcelain)" ]; then
echo "发现修改但未关联PR或无法确定分支跳过提交"
else
echo "没有文件被修改,无需提交"
fi
- name: Add PR comment
if: ${{ github.event_name == 'pull_request_target' || (github.event_name == 'workflow_dispatch' && github.event.inputs.pr_number != '' && steps.pr_info.outputs.found == 'true') }}
if: ${{ (steps.set_env.outputs.trigger_type == 'pr') || (steps.set_env.outputs.trigger_type == 'manual' && steps.set_env.outputs.pr_number != '' && steps.pr_info.outputs.found == 'true') }}
continue-on-error: true
uses: actions/github-script@v6
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const fs = require('fs');
const pr_number = ${{ github.event.pull_request.number || github.event.inputs.pr_number }};
const pr_number = ${{ steps.set_env.outputs.pr_number }};
if (fs.existsSync('validation_notes.md')) {
const message = fs.readFileSync('validation_notes.md', 'utf8');

Binary file not shown.

18988
repo.json

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,7 @@
"name": "01-奇异的龙牙-眠龙谷左-1个",
"type": "collect",
"author": "Tool_tingsu",
"version": "1.1",
"version": "1.0",
"description": "",
"map_name": "Teyvat",
"bgi_version": "0.45.0"

View File

@@ -3,7 +3,7 @@
"name": "02-奇异的龙牙-眠龙谷右-1个",
"type": "collect",
"author": "Tool_tingsu",
"version": "1.1",
"version": "1.0",
"description": "",
"map_name": "Teyvat",
"bgi_version": "0.45.0"

View File

@@ -3,7 +3,7 @@
"name": "03-奇异的龙牙-眠龙谷上-1个",
"type": "collect",
"author": "Tool_tingsu",
"version": "1.1",
"version": "1.0",
"description": "",
"map_name": "Teyvat",
"bgi_version": "0.45.0"

View File

@@ -3,7 +3,7 @@
"name": "04-奇异的龙牙-寒天之钉右下-1个",
"type": "collect",
"author": "Tool_tingsu",
"version": "1.1",
"version": "1.0",
"description": "",
"map_name": "Teyvat",
"bgi_version": "0.45.0"

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-漓月-石门",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-云来海",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-天遒谷",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-庆云顶",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-明蕴镇",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-灵矩关",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-翠玦坡",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-璃月-轻策庄",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-蒙德-奔狼领",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-蒙德-望风山地",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-蒙德-誓言岬",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-蒙德-达达乌帕谷",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-蒙德-风起地",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "大伟丘-蒙德-风龙废墟",
"type": "collect",
"author": "起个名字好难",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "天降正义!",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "《哈南帕查记事·卷一》",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "《哈南帕查记事·卷三》",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "《哈南帕查记事·卷二》",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "《玛阿威与幻写灵·第一卷》",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "《玛阿威与幻写灵·第三卷》",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "《玛阿威与幻写灵·第二卷》",
"type": "collect",
"author": "花见木易",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "01-苍晶区西南",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "02-厄里那斯东",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "03-厄里那斯东北",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "04-秋分山西岸",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "05-(较远)枫丹庭南",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "06-(自己上桥)枫丹钓鱼协会",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "07-(自己进水圈)欧庇克莱歌剧院东游船",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "08-欧庇克莱歌剧院北",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "09-芒索斯山东麓",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "10-枫丹研究院神像西",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "11-佩特莉可镇西",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-卡布南钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-卡布南钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-厄里那斯南",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-歌剧院钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-厄里那斯右上钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-厄里那斯右上钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-厄里那斯右下钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-厄里那斯右下钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-实验室钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-实验室钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-幽林南钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-幽林南钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-歌剧院钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-歌剧院钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-白淞镇钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-白淞镇钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-秋分山北钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-秋分山北",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "枫丹-芒索斯山东钓点",
"type": "collect",
"author": "龙弗山权",
"version": "1.1",
"version": "1.0",
"description": "枫丹-芒索斯山东钓点",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "01-轻策庄",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "02-璃月港",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "03-荻花洲",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "可能会奖励一个突发事件",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "04-碧水原",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "05-碧水原2",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "钓鱼点附近有丘丘人打手",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "06-奥藏山",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "07-琥牢山",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "需要开启周本“伏龙树之底”",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "08-天遒谷",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "右后方可能会有一只<大伟丘>",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "09-珉林",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "10-归离原",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "11-渌华池",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "需完成解谜“渌华池之影”并开启副本风场",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "12-沉玉谷上谷·东侧水域",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "13-古茶树坡·北侧水域",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "14-悬练山·西南水域",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "01-离岛",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "02-甘金岛",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "03-名椎滩",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "04-水月池",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "05-珊瑚宫",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "07-越石村",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "08-越石村2",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "09-千来神祠",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "10-逢岳之野(钓点处扫描雷鸟雕像)",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "01-烟谜主西·镜壁山",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "02-花羽会·西侧海岸",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "03-花羽会·北侧海岸",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "04-奥奇卡纳塔·东南水域",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "05-奥奇卡纳塔·南侧水域",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "06-奥奇卡纳塔·北岸",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "07-奥奇卡纳塔·拖佐兹之岛",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "08-奥奇卡纳塔·东侧水域",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "01-望风山地",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "02-果酒湖",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "03-风起地",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "04-果酒湖",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "05-晨曦酒庄",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "06-风龙废墟",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "07-风龙废墟2有怪",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "08-龙脊雪山",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "01-无郁稠林",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "02-须弥城",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "03-天臂池",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "04-二净甸",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "05-维摩庄",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "06-降诸魔山",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "07-奥摩斯港",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "08-阿如村",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "09-荒石苍漠",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "10-下风蚀地",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "11-(有怪)五绿洲的孑遗",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.42.0"
},

View File

@@ -3,7 +3,7 @@
"name": "自动钓鱼路线-枫丹-伊黎耶林区南岸",
"type": "collect",
"author": "鸿羽er",
"version": "1.1",
"version": "1.0",
"description": "",
"bgi_version": "0.43.0"
},

Some files were not shown because too many files have changed in this diff Show More