From c6fab7e9a54100eff2c253e2adbef627de79068e Mon Sep 17 00:00:00 2001 From: DKChan <524912269@qq.com> Date: Tue, 3 Nov 2026 08:01:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D(CI=E7=BA=A2=E6=80=81?= =?UTF-8?q?=E8=BF=BD=E7=BB=BF=C2=B7fix-ci-mac):=20S9=E4=B8=89=E5=A4=84R1?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8C=96=E8=A1=A5=E9=BD=90(hit/expect/dom?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E7=BB=84=E6=B3=A8=E8=A7=A3=E2=80=94?= =?UTF-8?q?=E2=80=94=E8=BF=AD=E4=BB=A350=E6=96=B0=E7=A0=81,=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0audit=5Ftype=5Fhints=20PASS=E5=BD=92=E9=9B=B6)+?= =?UTF-8?q?=E9=97=B8=E8=84=9A=E6=9C=ACrun=5Fall=5Fgates.sh:367=E7=A9=BA?= =?UTF-8?q?=E6=95=B0=E7=BB=84=E5=B1=95=E5=BC=80bash=20bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D(=5Fuser=5Fargs[@]=E5=9C=A8mac=20bash3.2=C3=97set=20-u?= =?UTF-8?q?=E4=B8=8Bunbound=20variable,=E5=9B=9B=E5=88=86=E7=89=87?= =?UTF-8?q?=E7=A7=92=E6=8C=82=E6=B5=8B=E8=AF=95=E6=9C=AA=E8=B7=91=E2=80=94?= =?UTF-8?q?=E2=80=94=E6=94=B9${var:+${var[@]}}=E6=83=AF=E7=94=A8=E6=B3=95)?= =?UTF-8?q?;=20=E9=81=97=E7=95=99=E7=BA=A2=E9=A1=B9=E5=BD=92=E5=B1=9E?= =?UTF-8?q?=E5=9C=A8=E9=A3=9ECI=E8=BF=81=E7=A7=BB=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=89=B9=E4=B8=8D=E5=9C=A8=E6=9C=AC=E7=AC=94:03/05=E6=8E=A2?= =?UTF-8?q?=E9=92=88mac=E9=80=80=E5=87=BA=E6=8C=82(headless=E4=B8=8E?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=8C=96=E4=B8=A4=E5=BD=A2=E6=80=81,render?= =?UTF-8?q?=E4=BE=A7--quit-after=E5=B7=B2=E4=BF=AE=E4=BB=8D=E6=8C=82124=3D?= =?UTF-8?q?=E5=88=A4=E5=88=AB=E5=AE=9E=E9=AA=8C=E7=BB=93=E8=AE=BA=E5=BE=85?= =?UTF-8?q?=E6=94=B6=E7=BC=96)+mac=20golden=E5=9F=BA=E7=BA=BF=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E7=BC=BA=E5=A4=B1(=E9=9C=80mac=E4=BE=A7golden=5Fbasel?= =?UTF-8?q?ine=5Frefresh=E7=94=9F=E6=88=90)+05b=E6=96=B0=E9=97=B8=E5=9F=BA?= =?UTF-8?q?=E7=BA=BF=E7=99=BB=E8=AE=B0+=E8=BF=9C=E7=AB=AFS10/S13=E4=B8=8E?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=B7=AE=E5=BC=82(runner=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=96=91);=2077=E5=A5=97=E4=BB=B6=E5=85=A8=E7=BB=BF=E5=A4=8D?= =?UTF-8?q?=E6=A0=B8(config=5Fdb=5Ftest=E7=B4=A0=E6=9D=90=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=A1=A5=E5=88=B7=E5=90=8E29=20checks=E7=BB=BF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/core/status_container.gd | 2 +- game/data/schemas/meta_tree_table.gd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/game/core/status_container.gd b/game/core/status_container.gd index cac4f904..4a40a1c5 100644 --- a/game/core/status_container.gd +++ b/game/core/status_container.gd @@ -60,7 +60,7 @@ func _apply_open(effect_id: String, owner_key: String, source: Dictionary, durat var dur: int = int(row.duration_settlements) if duration_override < 1 else duration_override var snap := _grant_snapshot(row, source) var bucket: Array[Dictionary] = _bucket_of(owner_key) - var hit: Dictionary = {} + var hit: Dictionary[Variant, Variant] = {} for inst in bucket: if inst.effect_id == effect_id: hit = inst diff --git a/game/data/schemas/meta_tree_table.gd b/game/data/schemas/meta_tree_table.gd index 352264c7..4d91f524 100644 --- a/game/data/schemas/meta_tree_table.gd +++ b/game/data/schemas/meta_tree_table.gd @@ -132,14 +132,14 @@ func _validate_one_rule_key_params(nid: String, fx_key: String, rk: String, para errs.append({"category": "domain", "message": "%s %s.%s 缺参数（规则键值须为参数字典——零缺省）" % [nid, fx_key, rk]}) return errs var params: Dictionary[Variant, Variant] = params_v - var expect: Dictionary = RULE_KEY_PARAMS[rk] + var expect: Dictionary[Variant, Variant] = RULE_KEY_PARAMS[rk] for pk in params.keys(): if not expect.has(String(pk)): errs.append({"category": "domain", "message": "%s %s.%s 多参数: %s（参数域表封闭）" % [nid, fx_key, rk, String(pk)]}) elif not (params[pk] is int): errs.append({"category": "domain", "message": "%s %s.%s.%s 越域（须 int）" % [nid, fx_key, rk, String(pk)]}) else: - var dom: Array = expect[String(pk)] + var dom: Array[Variant] = expect[String(pk)] var v := int(params[pk]) if v < int(dom[0]) or v > int(dom[1]): errs.append({"category": "domain", "message": "%s %s.%s.%s 越域 [%d,%d]: %d" % [nid, fx_key, rk, String(pk), int(dom[0]), int(dom[1]), v]}) From 64ed22a9f5b2922268e9fabc4f107caf52d8bacb Mon Sep 17 00:00:00 2001 From: DKChan <524912269@qq.com> Date: Tue, 3 Nov 2026 08:03:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D(CI=E7=BA=A2=E6=80=81?= =?UTF-8?q?=E8=BF=BD=E7=BB=BF=C2=B7fix-ci-mac=E7=BB=AD):=20=E9=97=B8?= =?UTF-8?q?=E8=84=9A=E6=9C=ACrun=5Fall=5Fgates.sh:367=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E5=B1=95=E5=BC=80bash=20bug=E2=80=94=E2=80=94=5Fuser?= =?UTF-8?q?=5Fargs[@]=E5=9C=A8mac=20bash3.2=C3=97set=20-u=E4=B8=8Bunbound?= =?UTF-8?q?=20variable=E5=9B=9B=E5=88=86=E7=89=87=E7=A7=92=E6=8C=82(?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9C=AA=E8=B7=91=E5=8D=B3=E7=BA=A2),?= =?UTF-8?q?=E6=94=B9=E5=AE=89=E5=85=A8=E5=B1=95=E5=BC=80=E6=83=AF=E7=94=A8?= =?UTF-8?q?=E6=B3=95(=E7=A9=BA=E5=8F=82=E5=BD=92=E9=9B=B6=E4=B8=8D?= =?UTF-8?q?=E8=B6=8Aset=20-u,=E9=9D=9E=E7=A9=BA=E7=85=A7=E5=B8=B8=E4=BC=A0?= =?UTF-8?q?=E5=8F=82);=20bash=20-n=20=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/run_all_gates.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/run_all_gates.sh b/tools/run_all_gates.sh index b2ad7363..6e867e36 100755 --- a/tools/run_all_gates.sh +++ b/tools/run_all_gates.sh @@ -364,7 +364,7 @@ gate_unit() { # run_all 是 --script 模式，退出码为唯一判据；分 local k for k in $(seq 1 "$_shards"); do ( cd "$REPO" && "$GODOT" --headless --path "$(gate_game_path "$GAME")" --script res://tests/run_all.gd \ - -- "${_user_args[@]}" "--shard=$k" "--shard-count=$_shards" ) \ + -- ${_user_args[@]:+"${_user_args[@]}"} "--shard=$k" "--shard-count=$_shards" ) \ >"$STAMP_DIR/unit_shard_$k.log" 2>&1 & _pids+=($!) done