Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Cnotech/flash-collector
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5-rc
Choose a base ref
...
head repository: Cnotech/flash-collector
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on May 23, 2022

  1. 就绪

    Cnotech committed May 23, 2022
    Copy the full SHA
    d0ac012 View commit details

Commits on May 24, 2022

  1. Copy the full SHA
    c5e1d63 View commit details
  2. 优化交互文本

    Cnotech committed May 24, 2022
    Copy the full SHA
    2b637ee View commit details
  3. 禁止虚空搜索

    Cnotech committed May 24, 2022
    Copy the full SHA
    fb0358d View commit details

Commits on May 27, 2022

  1. 修复脚本执行抽风

    Cnotech committed May 27, 2022
    Copy the full SHA
    d79687a View commit details

Commits on May 31, 2022

  1. 港口提示牌颜色

    Cnotech committed May 31, 2022
    Copy the full SHA
    803acfc View commit details

Commits on Jun 2, 2022

  1. Copy the full SHA
    3e597c4 View commit details
  2. Copy the full SHA
    ad02546 View commit details
  3. Copy the full SHA
    7dbc54a View commit details

Commits on Jun 3, 2022

  1. 增加浏览器支持

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    0544cc0 View commit details
  2. 增加h5浏览器选择

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    30c7ae5 View commit details
  3. 增加h5启动浏览器

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    275e087 View commit details
  4. 完成进度模块初始化

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    ba5187d View commit details
  5. 开发时不检测更新

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    92a265b View commit details
  6. 完成手动备份功能

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    c77a85a View commit details
  7. 完成手动恢复功能

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    cc1595d View commit details
  8. 增加确认覆盖弹窗

    Cnotech committed Jun 3, 2022
    Copy the full SHA
    f69c51d View commit details

Commits on Jun 4, 2022

  1. 增加自动备份功能

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    1e34bc1 View commit details
  2. 增加港口进度提示

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    6cb9f8f View commit details
  3. Copy the full SHA
    2e305b6 View commit details
  4. Copy the full SHA
    c2b89dd View commit details
  5. Copy the full SHA
    8405411 View commit details
  6. 更新备份策略

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    ccfdc95 View commit details
  7. 恢复时检查进度开关

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    4ab201a View commit details
  8. h5进度关闭窗口

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    93b1b5e View commit details
  9. Copy the full SHA
    b08dcde View commit details
  10. 自动备份的覆盖确认

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    75ce7e4 View commit details
  11. 完善覆盖确认

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    63f384c View commit details
  12. 修复构建版本的问题

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    a450e95 View commit details
  13. 优化细节

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    232854f View commit details
  14. 优化细节

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    a237fdb View commit details
  15. 增加调试打印

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    d2667f2 View commit details
  16. 恢复prebuild

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    0023c34 View commit details
  17. 删除调试打印

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    c035d65 View commit details
  18. 更新readme

    Cnotech committed Jun 4, 2022
    Copy the full SHA
    5881d71 View commit details

Commits on Jun 5, 2022

  1. Copy the full SHA
    9b3e889 View commit details
  2. 恢复icon.ico

    Cnotech committed Jun 5, 2022
    Copy the full SHA
    bd5b641 View commit details
  3. Copy the full SHA
    e2f2082 View commit details
  4. Copy the full SHA
    7dafbe9 View commit details
  5. Copy the full SHA
    ef4dafb View commit details
  6. Copy the full SHA
    daeee1b View commit details
  7. Copy the full SHA
    da81fcb View commit details
  8. 删除模板.vscode配置

    Cnotech committed Jun 5, 2022
    Copy the full SHA
    8b9dd17 View commit details
  9. 优化首页布局

    Cnotech committed Jun 5, 2022
    Copy the full SHA
    c602710 View commit details
  10. Copy the full SHA
    c9a63d7 View commit details
  11. 更新

    Cnotech committed Jun 5, 2022
    Copy the full SHA
    bc8cd66 View commit details
  12. 使用优化的界面截图

    Cnotech committed Jun 5, 2022
    Copy the full SHA
    6ef85e1 View commit details

Commits on Jun 6, 2022

  1. 修复层叠提示的问题

    Cnotech committed Jun 6, 2022
    Copy the full SHA
    0c2e9bf View commit details
  2. 更新readme

    Cnotech committed Jun 6, 2022
    Copy the full SHA
    d23fda8 View commit details
  3. Copy the full SHA
    40e378a View commit details
Showing with 5,362 additions and 26,032 deletions.
  1. +39 −0 .github/ISSUE_TEMPLATE/bug.yml
  2. +14 −0 .github/ISSUE_TEMPLATE/feature.yml
  3. +46 −0 .github/ISSUE_TEMPLATE/unsolvable.yml
  4. +46 −0 .github/workflows/debug.yml
  5. +6 −3 .gitignore
  6. +0 −14 .vscode/.debug.script.mjs
  7. +0 −3 .vscode/extensions.json
  8. +0 −41 .vscode/launch.json
  9. +0 −4 .vscode/settings.json
  10. +0 −12 .vscode/tasks.json
  11. +1 −0 .yarnrc.yml
  12. +53 −26 README.md
  13. BIN bin/360cse_13.5.2044.0.exe
  14. +3 −0 demo-flash/README.md
  15. BIN demo-flash/createProgressCache.fla
  16. BIN demo-flash/createProgressCache.swf
  17. BIN img/screenshot.jpg
  18. +5 −0 jest.config.js
  19. +11 −4 package.json
  20. +24 −8 packages/class.ts
  21. +13 −143 packages/main/bridge.ts
  22. +92 −5 packages/main/browser.ts
  23. +11 −2 packages/main/config.ts
  24. +114 −90 packages/main/index.ts
  25. +23 −11 packages/main/manager.ts
  26. +23 −0 packages/main/modules/GBKUri.ts
  27. +43 −9 packages/main/modules/_register.ts
  28. +334 −0 packages/main/modules/com17yy.ts
  29. +76 −0 packages/main/modules/com4399.test.ts
  30. +83 −12 packages/main/modules/com4399.ts
  31. +243 −0 packages/main/modules/com7724.ts
  32. +110 −0 packages/main/modules/com7k7k.test.ts
  33. +154 −27 packages/main/modules/com7k7k.ts
  34. +165 −0 packages/main/modules/game773.ts
  35. +0 −24,139 packages/main/modules/gbkEncodeUri.ts
  36. +2 −2 packages/main/p7zip.ts
  37. +210 −0 packages/main/port.ts
  38. +371 −0 packages/main/progress.ts
  39. +16 −0 packages/main/schema/backup.json
  40. +81 −0 packages/main/schema/config.json
  41. +28 −3 packages/main/sniffing.ts
  42. +1 −2 packages/main/update.ts
  43. +12 −0 packages/main/utils.ts
  44. +7 −1 packages/renderer/src/App.vue
  45. +3 −0 packages/renderer/src/assets/banScript.json
  46. +382 −22 packages/renderer/src/components/Game.vue
  47. +54 −27 packages/renderer/src/components/Home.vue
  48. +5 −1 packages/renderer/src/components/HotUpdate.vue
  49. +38 −15 packages/renderer/src/components/Port.vue
  50. +108 −28 packages/renderer/src/components/Setting.vue
  51. +0 −14 retinue/banScript.js
  52. BIN retinue/createProgressCache.swf
  53. +78 −72 scripts/afterbuild.js
  54. +3 −0 scripts/pack.js
  55. +4 −1 scripts/publish.js
  56. +26 −0 update-server/config.json
  57. +11 −1 {userscript → user-script}/flash-collector-script.user.js
  58. +2,190 −1,290 yarn.lock
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: 主程序bug
description: 报告 Flash Collector 主程序的 bug
title: "[bug]: "
assignees:
- Cnotech
body:
- type: input
id: version
attributes:
label: Flash Collector 版本号
description: 遇到此问题时使用的 Flash Collector 版本号
placeholder: e.g. 1.7
validations:
required: true
- type: dropdown
id: win
attributes:
label: Windows 版本
description: 遇到此问题时使用的 Windows 版本
options:
- Windows 10 x64
- Windows 11 x64
- 其他(请在下面描述问题的输入框中写明 Windows 版本)
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: 发生什么事了?
description: 详细描述你遇到的问题,并附上屏幕截图。
placeholder: 输入内容
validations:
required: true
- type: textarea
id: howto-recur
attributes:
label: 如何复现这个问题?
description: 详细描述从启动 Flash Collector 主程序到遇到此问题中间执行的步骤。
placeholder: 输入内容
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 主程序建议
description: 提供优化 Flash Collector 主程序的建议
title: "[feature]: "
assignees:
- Cnotech
body:
- type: textarea
id: what-happened
attributes:
label: 有何高见?
description: 详细描述你所期待实现的特性,最好附上一些草图以便于更好地理解你的想法。
placeholder: 输入内容
validations:
required: true
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/unsolvable.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: 游戏解析出错
description: 报告 Flash Collector 主程序无法正确解析的小游戏
title: "[unsolvable]: "
assignees:
- Cnotech
body:
- type: input
id: version
attributes:
label: Flash Collector 版本号
description: 遇到此问题时使用的 Flash Collector 版本号
placeholder: e.g. 1.7
validations:
required: true
- type: dropdown
id: win
attributes:
label: Windows 版本
description: 遇到此问题时使用的 Windows 版本
options:
- Windows 10 x64
- Windows 11 x64
- 其他(请在下面描述问题的输入框中写明 Windows 版本)
validations:
required: true
- type: input
id: url
attributes:
label: 无法解析的小游戏页面网址
description: 请确认此页面的小游戏不是页游
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: 发生什么事了?
description: 详细描述你遇到的问题,并附上屏幕截图。
placeholder: 输入内容
validations:
required: true
- type: textarea
id: howto-recur
attributes:
label: 如何复现这个问题?
description: 详细描述从启动 Flash Collector 主程序到遇到此问题中间执行的步骤。
placeholder: 输入内容
46 changes: 46 additions & 0 deletions .github/workflows/debug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Debug

on:
pull_request:
branches:
- master
paths:
- 'packages/**'
- 'retinue/**'
- 'package.json'
- '.github/**'

jobs:
serve:
runs-on: windows-2019
steps:
# 获取仓库源码
- uses: actions/checkout@v2
with:
submodules: recursive
ref: ${{ github.ref }}

# 缓存node_modules
- uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

# 安装依赖
- name: Install dependencies
run: yarn

# 单元测试
- name: Build preview
run: yarn test

# 运行构建
- name: Build preview
run: yarn build -p=never

# 上传构建
- name: Upload File
uses: actions/upload-artifact@v2
with:
name: preview
path: release/Flash Collector_*_win-x64.7z
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,13 +10,16 @@ tmp
release
.idea
games
config.json
*.7z
test.*
/test
UNZIP-TEMP
exports
ZIP-TEMP
.bak
.log
/yarn-error.log
TEMP
TEMP
/config.json
.yarn

.vscode
14 changes: 0 additions & 14 deletions .vscode/.debug.script.mjs

This file was deleted.

3 changes: 0 additions & 3 deletions .vscode/extensions.json

This file was deleted.

41 changes: 0 additions & 41 deletions .vscode/launch.json

This file was deleted.

4 changes: 0 additions & 4 deletions .vscode/settings.json

This file was deleted.

12 changes: 0 additions & 12 deletions .vscode/tasks.json

This file was deleted.

1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
Loading