Merge branch 'master' into server

ceaea8b3 · nanahira · 2773374f · bdf19eb0 · f88b5698 · faa7e1d1
Commit ceaea8b3 authored Jun 03, 2024 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

ocgcore ocgcore +1 -1

script script +1 -1

strings.conf strings.conf +1 -0

No files found.
--- a/ocgcore @ f88b5698
+++ b/ocgcore @ f88b5698
-Subproject commit d4430f0ae3f415b322bd58de7b3c3fdec849feb3
+Subproject commit f88b5698f42a4fc506b8570d25c4d7a95e49af91
--- a/script @ faa7e1d1
+++ b/script @ faa7e1d1
-Subproject commit 2a5ecebe6ecb339b956862dac77d2b67eb139007
+Subproject commit faa7e1d1552c13e26f430d6594c0c46435dc3ccb
--- a/strings.conf
+++ b/strings.conf
@@ -139,6 +139,7 @@
 !system 572 请选择要放置指示物的卡
 !system 573 请选择要无效的卡
 !system 574 请选择要操作的卡
+!system 575 请选择场上的卡（按取消可选择其他区域的卡）
 !system 1000 卡组
 !system 1001 手卡
 !system 1002 怪兽区