Skip to content

Commit acfb8d8

Browse files
committed
Merge branch 'libnoname:PR-Branch' into PR-Branch
Merge pull request libnoname#3036 from xizifu/PR-Branch 添加查看/设置游戏外公共区域功能;bugfix 武将称号拆分到各武将包文件 将player.getStat().card[name]相关的技能进行数值判断再执行减值操作 removeHandeler事件化;lib.element.content.guanxing改为async content Merge pull request libnoname#3036 from xizifu/PR-Branch 添加查看/设置游戏外公共区域功能;bugfix Merge branch 'libnoname:PR-Branch' into PR-Branch
1 parent 4055938 commit acfb8d8

File tree

774 files changed

+12757
-710024
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

774 files changed

+12757
-710024
lines changed

.editorconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,3 @@ indent_size = 4
1313
[*.vue]
1414
indent_style = tab
1515
indent_size = 4
16-
17-
[.prettierrc]
18-
indent_style = tab
19-
indent_size = 4
20-
21-
[.eslintrc.json]
22-
indent_style = tab
23-
indent_size = 4
24-
25-
[deno.json]
26-
indent_style = space
27-
indent_size = 2

.eslintrc.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: build
2+
3+
on:
4+
push:
5+
branches: [PR-Branch]
6+
7+
permissions:
8+
contents: write # 允许 Actions 推送代码到仓库
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
18+
- uses: pnpm/action-setup@v4
19+
with:
20+
version: 10
21+
run_install: false
22+
23+
- name: Install Node.js
24+
uses: actions/setup-node@v4
25+
with:
26+
node-version: 22
27+
cache: 'pnpm'
28+
29+
- name: Install dependencies
30+
run: pnpm install --frozen-lockfile
31+
32+
- name: Run Build
33+
run: pnpm build:full
34+
35+
- name: Deploy dist to branch
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
run: |
39+
git config --global user.name "github-actions[bot]"
40+
git config --global user.email "github-actions[bot]@users.noreply.github.com"
41+
42+
mkdir /tmp/dist
43+
cp -r dist/* /tmp/dist/
44+
45+
git fetch origin
46+
git checkout --orphan build-output
47+
git reset --hard
48+
rm -rf *
49+
50+
cp -r /tmp/dist/* .
51+
52+
git add .
53+
git commit -m "Deploy dist from $GITHUB_SHA"
54+
git push -f origin build-output

.github/workflows/lint-check.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,23 @@ jobs:
99
name: ESLint Check
1010
runs-on: ubuntu-latest
1111
steps:
12-
- name: Checkout Repository
12+
- name: Checkout repository
1313
uses: actions/checkout@v4
1414

15-
- name: Install modules
16-
run: |
17-
yarn add -D eslint @eslint/js globals typescript typescript-eslint eslint-plugin-vue vue-eslint-parser
18-
yarn global add eslint
15+
- uses: pnpm/action-setup@v4
16+
name: Install pnpm
17+
with:
18+
version: 10
19+
run_install: false
20+
21+
- name: Install Node.js
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: 22
25+
cache: 'pnpm'
26+
27+
- name: Install dependencies
28+
run: pnpm install --frozen-lockfile
1929

2030
- name: Run ESLint
21-
run: yarn exec eslint card/ character/ extension/ game/game.js game/entry.js mode/ noname/ noname.js noname-compatible.js service-worker.js
31+
run: pnpm lint

.gitignore

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,32 @@
11
audio/*.TXT
22
image/*.TXT
3-
!extension/boss
4-
!extension/cardpile
5-
!extension/coin
6-
!extension/wuxing
7-
!extension/3D精选
8-
!extension/杀海拾遗
9-
!extension/欢乐卡牌
10-
!extension/玩点论杀
11-
!extension/英雄杀
12-
!node_modules/@types
13-
!node_modules/noname-typings
14-
!node_modules/options
15-
!node_modules/ultron
16-
!node_modules/undici-types
17-
!node_modules/ws
3+
extension/
4+
!extension/boss/
5+
!extension/cardpile/
6+
!extension/coin/
7+
!extension/3D精选/
8+
!extension/杀海拾遗/
9+
!extension/欢乐卡牌/
10+
!extension/玩点论杀/
11+
!extension/英雄杀/
1812
._*
1913
.DS_Store
2014
.DS_Store?
15+
.eslintcache
2116
.idea
2217
.Spotlight-V100
2318
.Trashes
2419
.vscode
2520
app
2621
app.html
22+
dist
2723
ehthumbs.db
28-
extension
2924
Home
30-
jsconfig.json
3125
localStorage.json
32-
main.js
33-
!mode/**/src/main.js
26+
/main.js
3427
node_modules
3528
noname.ico
3629
package-lock.json
37-
package.json
3830
Thumbs.db
3931
bun.lockb
40-
deno.lock
41-
pnpm-lock.yaml
42-
game/*.zip
43-
44-
downloadExtension.html
45-
update.html
46-
update.js
47-
*.txt
48-
*.pdf
32+
game/*.zip

.mise.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

.prettierrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

README.md

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1+
# 无名杀
2+
3+
## 快速启动
4+
5+
### 环境要求
6+
7+
> **提示:** 请参考 [本地文档](./docs/how-to-start.md)[github文档](https://github.com/libnoname/noname/wiki/%E5%A6%82%E4%BD%95%E8%BF%90%E8%A1%8C%E6%97%A0%E5%90%8D%E6%9D%80%EF%BC%88%E7%A8%8B%E5%BA%8F%E5%91%98%E7%89%88%EF%BC%89) 配置环境。
8+
9+
- [Node.js](https://nodejs.org/) ^20.19.0 || >=22.12.0
10+
- [pnpm](https://pnpm.io/) >=8
11+
- Webview >=91
12+
13+
### 安装依赖
14+
15+
```bash
16+
pnpm install
17+
```
18+
19+
### 启动
20+
21+
```bash
22+
pnpm dev
23+
```
24+
25+
---
26+
127
noname-server.exe 的源码见以下仓库:
228

3-
https://github.com/nonameShijian/noname-server
29+
<https://github.com/nonameShijian/noname-server>
430

531
---
632

@@ -16,9 +42,9 @@ https://github.com/nonameShijian/noname-server
1642

1743
客户端下载戳这里:
1844

19-
安卓: https://github.com/nonameShijian/noname-shijian-android/releases/tag/v1.6.8
45+
安卓: <https://github.com/nonameShijian/noname-shijian-android/releases/tag/v1.6.8>
2046

21-
PC: https://github.com/nonameShijian/noname/releases/tag/v1.75
47+
PC: <https://github.com/nonameShijian/noname/releases/tag/v1.75>
2248

2349
网页端推荐使用 Chrome 系内核浏览器游玩,暂不支持 Firefox 浏览器
2450

card/standard.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ game.import("card", function () {
13741374
next.autochoose = lib.filter.autoRespondSha;
13751375
result = await next.forResult();
13761376
}
1377-
if (result.bool === false) {
1377+
if (!result?.bool) {
13781378
await target.damage();
13791379
break;
13801380
} else {
@@ -1762,7 +1762,7 @@ game.import("card", function () {
17621762
next.autochoose = lib.filter.autoRespondShan;
17631763
result = await next.forResult();
17641764
}
1765-
if (result.bool === false) {
1765+
if (!result?.bool) {
17661766
await target.damage();
17671767
break;
17681768
} else {

0 commit comments

Comments
 (0)