[pull] master from FQrabbit:master

.github/ISSUE_TEMPLATE/new_rule_request.yml

@@ -0,0 +1,34 @@
+name: 请求新增规则
+description: 请求新增规则的想法
+body:
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: 欢迎
+      options:
+        - label: 若未使用自动抓ip工具，且在issue中说明已使用的，此issue将会被忽略或关闭。
+          required: true
+        - label: 请使用[自动抓IP工具](https://github.com/oooldtoy/SSTAP_ip_crawl_tool)来帮助我们编写规则，并详细写明游戏细节，如哪个服，哪个版本。
+          required: false
+  - type: input
+    attributes:
+      label: 名称
+      description: 请将需要增加游戏\程序名字填入此区域
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 运行环境
+      description: 该游戏\程序的运行环境
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 代理部分
+      description: 该游戏\程序哪部分需要代理
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 特殊情况
+      description: 如果还有特殊想说明的请在这里描述.

.github/ISSUE_TEMPLATE/rule_bug_report.yml

@@ -0,0 +1,32 @@
+name: 规则失效以及其他错误
+description: 创建报告以帮助我们改进
+body:
+  - type: input
+    attributes:
+      label: 问题描述
+      description: 简单清晰的说一下问题的描述.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 从哪里开始出现这个问题
+      description: |-
+        例如
+        ``某游戏的登陆页面``、
+        ``内置的网页``、
+        ``游戏房间内部``、
+        ``商店页面`` 等
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 截图
+      description: 如果可以，请添加截图以帮助解释您的问题.
+  - type: textarea
+    attributes:
+      label: 运行环境
+      description: |-
+        请说明当前的运行环境
+        例如：
+        ``操作系统``
+        ``网络环境``(如 运营商等

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/.github"
+    schedule:
+      interval: "daily"
+      timezone: "Asia/Hong_Kong"
+      time: "06:00"
+    pull-request-branch-name:
+      separator: "-"

.github/workflows/updategeoip-cn.yaml

@@ -0,0 +1,93 @@
+name: Update China IP
+
+on:  
+  workflow_dispatch:
+
+  schedule: 
+    - cron:  '0 2 */3 * *'
+
+jobs:
+  update:
+    name: Generate rules
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code into directory
+      uses: actions/checkout@v4
+
+    - name: Git config
+      run: |
+        git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+        git config user.name "github-actions[bot]"
+        git fetch --unshallow
+      shell: bash
+
+    - name: Get CIDR field
+      run: |
+        echo "#BypassCNandLan,绕过大陆和局域网,1,1,1,0,0,0," >> BypassCNandLan.rules
+
+        curl https://raw.githubusercontent.com/Hackl0us/GeoIP2-CN/release/CN-ip-cidr.txt >> BypassCNandLan.rules
+
+        sed -i '2{/^$/d;}' BypassCNandLan.rules
+        echo 10.0.0.0/8 >> BypassCNandLan.rules
+        echo 172.16.0.0/12 >> BypassCNandLan.rules
+        echo 192.168.0.0/16 >> BypassCNandLan.rules
+
+
+
+        echo "#BypassCNandLan,绕过大陆和局域网someip,1,1,1,0,0,0," >> BypassCNandLan_someip.rules
+
+        curl https://raw.githubusercontent.com/0x2E/someip/build/cidr.txt >> BypassCNandLan_someip.rules
+
+        sed -i '2{/^$/d;}' BypassCNandLan_someip.rules
+        echo 10.0.0.0/8 >> BypassCNandLan_someip.rules
+        echo 172.16.0.0/12 >> BypassCNandLan_someip.rules
+        echo 192.168.0.0/16 >> BypassCNandLan_someip.rules
+      shell: bash
+
+    - name: Compare New file and Old file
+      run: |
+        (
+          hash1=$(sha256sum "./BypassCNandLan.rules" | awk '{print $1}')
+          hash2=$(sha256sum "./rules/BypassCNandLan.rules" | awk '{print $1}')
+          echo -e "hash1=$hash1\nhash2=$hash2"
+          if [ "$hash1" == "$hash2" ]; then
+            echo "Hashes match. The files are identical."
+            echo "Upstream not updated"
+            echo "STATUS_0=1" >> $GITHUB_ENV
+            rm ./BypassCNandLan.rules
+          else
+            echo "Hashes do not match. The files are different."
+            echo "Upstream updated."
+            echo "STATUS_0=0" >> $GITHUB_ENV
+            cp ./BypassCNandLan.rules ./rules/BypassCNandLan.rules
+          fi
+        )
+        (
+          hash1=$(sha256sum "./BypassCNandLan_someip.rules" | awk '{print $1}')
+          hash2=$(sha256sum "./rules/BypassCNandLan_someip.rules" | awk '{print $1}')
+          echo -e "hash1=$hash1\nhash2=$hash2"
+          if [ "$hash1" == "$hash2" ]; then
+            echo "Hashes match. The files are identical."
+            echo "Upstream not updated"
+            echo "STATUS_1=1" >> $GITHUB_ENV
+            rm ./BypassCNandLan_someip.rules
+          else
+            echo "Hashes do not match. The files are different."
+            echo "Upstream updated."
+            echo "STATUS_1=0" >> $GITHUB_ENV
+            cp ./BypassCNandLan_someip.rules ./rules/BypassCNandLan_someip.rules
+          fi
+        )
+        echo "MESSAGE=\"Update at $(TZ=Asia/Shanghai date)\"" >> $GITHUB_ENV
+      shell: bash
+
+    - uses: planetscale/ghcommit-action@v0.1.6
+      if: env.STATUS_0 == '0' || env.STATUS_1 == '0'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        commit_message: "${{ env.MESSAGE }}"
+        repo: ${{ github.repository }}
+        branch: ${{ github.head_ref || github.ref_name }}
+        file_pattern: './rules/BypassCNandLan.rules ./rules/BypassCNandLan_someip.rules'

.gitignore

@@ -1 +1,2 @@
-*.bak
+*.bak
+removed_reserved_ips.log

Changelog.md

@@ -1,4 +1,31 @@
 # 更新日志 Change Log
+### 2025年6月26日
+
+新增 `MapleStory-Universe,冒险岛N-迅游` 游戏规则 By @hasegawa-taku
+
+新增 `Xbox-Cloud-Gaming-UU,Xbox云游戏-UU` 游戏规则 By @hasegawa-taku
+
+### 2024年1月3日
+
+By @izumiChan16
+
+新增 `Stardew Valley,星露谷物语` 游戏规则
+
+新增 `Lethal Company,致命公司` 游戏规则
+
+### 2023年8月11日
+
+By @zhangdiming
+
+更新 `Diablo4-HK,暗黑破坏神4-亚服` 游戏规则
+
+更新 `PUBG-Asia&-Southeast-Asia,绝地求生亚服&东南亚服` 游戏规则
+
+更新 `Monster-Hunter-World,怪兽世界猎人steam版` 游戏规则
+
+### 2023年8月5日
+
+新增 `猎杀对决 亚服` 游戏规则 By @1779587460
 
 ### 2023年4月19日
 

README.md

@@ -17,6 +17,14 @@
 
 在这里会不定时的更新各个游戏的路由表规则，你只要下载所需的规则或规则包导入对应文件夹即可使用。
 
+## 关于两个GEOIP源
+[GEOIPCN.1](rules/BypassCNandLan.rules?raw=true)  ||   [GEOIPCN.2](rules/BypassCNandLan_someip.rules?raw=true)
+
+- GEOIPCN.1 是[Hackl0us/GeoIP2-CN](https://github.com/Hackl0us/GeoIP2-CN)的完整版本
+- GEOIPCN.2 而是[0x2E/someip](https://github.com/0x2E/someip)的简化版本    
+两者在使用上一般不会有什么差距。  
+如果追求最小错误率请选择GEOIPCN.1，最求最高效率请选择GEOIPCN.2
+
 ## 规则使用方法
 
 -  [点我进入规则包下载页面](https://github.com/FQrabbit/SSTap-Rule/releases)
@@ -41,4 +49,21 @@
 
 如果项目内不存在你所需要的规则，你可以 [开 issue](https://github.com/FQrabbit/SSTap-Rule/issues/new/choose) 来请求新增规则(新增时限不确定) 或 [查看wiki教程](https://github.com/FQrabbit/SSTap-Rule/wiki) 来自己编写路由表。
 
-[常见问题](https://github.com/FQrabbit/SSTap-Rule/blob/master/FAQ.md)  
+[常见问题](https://github.com/FQrabbit/SSTap-Rule/blob/master/FAQ.md) 
+
+## Contributors 贡献者  
+Special thanks to all the contributors who have helped in this project:  
+特别感谢所有为本项目提供帮助的人员：  
+<a href="https://github.com/FQrabbit/SSTap-Rule/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=FQrabbit/SSTap-Rule" />
+</a>
+
+## Star History
+
+<a href="https://star-history.com/#FQrabbit/SSTap-Rule&Date">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=FQrabbit/SSTap-Rule&type=Date&theme=dark" />
+    <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=FQrabbit/SSTap-Rule&type=Date" />
+    <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=FQrabbit/SSTap-Rule&type=Date" />
+  </picture>
+</a>

doc/UU-extract.md

@@ -35,7 +35,7 @@ UU加速模式科普
 
 ![](https://i.loli.net/2018/12/27/5c2432de45f25.png)
 
-## 3.选择节点加速成功后打开 CMD(Win+R输入CMD打开,无需管理员权限) 和 [路由转SSTAP规则工具](https://www.ssrtool.com/tool/routeToRules)
+## 3.选择节点加速成功后打开 CMD(Win+R输入CMD打开,无需管理员权限) 和 [路由转SSTAP规则工具](https://ittuann.github.io/Route2CIDR/)
 
 在CMD里找好目录后输入以下命令将路由信息输出到文件
 
@@ -49,9 +49,9 @@ UU加速模式科普
 
 ![](https://i.loli.net/2018/12/31/5c2a2cc931852.png)
 
-将内容复制到 [路由转SSTAP规则工具](https://www.ssrtool.com/tool/routeToRules) 进行转换
+将内容复制到 [路由转SSTAP规则工具](https://ittuann.github.io/Route2CIDR/) 进行转换
 
-![](https://i.loli.net/2018/12/13/5c11fffe0ffe8.png)
+![Route2CIDR.png](https://s2.loli.net/2024/08/18/bq3FmMJxGzpUyXn.png)
 
 ## 4.把转换后右边输出的一堆东西复制下来在SSTAP根目录rules文件夹新建一个xxx.rules的文件并完善相关信息
 
@@ -69,7 +69,7 @@ UU加速模式科普
 
 如遇到无法转换或转换无反应结果为空，请检查当前加速模式是否为教程所示的3种模式
 
-注：[转换工具](https://www.ssrtool.com/tool/routeToRules)将过滤所有[保留IP](https://zh.wikipedia.org/wiki/%E4%BF%9D%E7%95%99IP%E5%9C%B0%E5%9D%80)，转换失败后可自行对比route.txt里的IP。出现无法访问请挂代理。 ;D
+注：[转换工具](https://ittuann.github.io/Route2CIDR/)将过滤所有[保留IP](https://zh.wikipedia.org/wiki/%E4%BF%9D%E7%95%99IP%E5%9C%B0%E5%9D%80)，转换失败后可自行对比route.txt里的IP。出现无法访问请挂代理。 ;D
 
 
 

remove_reserved_ips.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -eu
+regex="(^0|^127|^255|^10|^172\.(1[6-9]|2[0-9]|3[01])|^192\.168|^169\.254|^22[4-9]|^2[3-5][0-9])\."
+logfile="removed_reserved_ips.log"
+>"$logfile"
+count_files=0
+count_lines=0
+while IFS= read -r -d '' file; do
+  # skip files with Bypass in name
+  if [[ "$(basename "$file")" == *Bypass* ]]; then
+    continue
+  fi
+  # check if file has matches
+  if grep -q -E "$regex" "$file"; then
+    count_files=$((count_files+1))
+    # save removed lines to log with filename header
+    echo "---- $file ----" >>"$logfile"
+    grep -n -E "$regex" "$file" >>"$logfile" || true
+    # remove matching lines in-place (create .bak and move)
+    sed -E "/$regex/d" "$file" >"$file.tmp" && mv "$file.tmp" "$file"
+    # count removed lines
+    n=$(grep -c -E "$regex" "$file" || true)
+    # since we removed them, n should be 0; compute removed by counting in log
+    removed_in_file=$(grep -c "^" <(grep -n -E "$regex" "$file" 2>/dev/null) || true)
+    # instead, count from logfile section
+    # approximate by counting lines under the last header
+    # we'll compute total after loop
+  fi
+done < <(find rules -type f -print0)
+# compute total removed lines from logfile
+count_lines=$(grep -E -c "(^0|^127|^255|^10|^172\.(1[6-9]|2[0-9]|3[01])|^192\.168|^169\.254|^22[4-9]|^2[3-5][0-9])\." "$logfile" || true)
+
+echo "modified_files=$count_files" >removed_summary.tmp
+echo "removed_lines=$count_lines" >>removed_summary.tmp
+cat removed_summary.tmp
+rm -f removed_summary.tmp

rules/300hero-cn.rules

@@ -1,5 +1,4 @@
 #300hero-cn,300英雄,0,0,1,0,1,0,By-FQrabbit
-224.0.0.0/4
 14.17.104.0/24
 14.152.92.0/24
 42.186.14.0/24
@@ -37,7 +36,6 @@
 221.228.230.0/24
 223.112.179.0/24
 223.252.210.0/24
-10.18.129.143/32
 14.17.104.255/32
 14.152.92.255/32
 42.186.14.255/32
@@ -75,4 +73,3 @@
 221.228.230.255/32
 223.112.179.255/32
 223.252.210.255/32
-255.255.255.255/32