gahusb/maplecontest
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge: origin/main 통합 — hand.mjs 공격 라운드는 main의 RunAttackSequence 채택(히트별 정수 데미지로 floor 수정 대체), 산출물 재생성

Browse Source 
- 충돌 해소: tools/deck/cb/hand.mjs = main 버전(RunAttackSequence 리팩터가 total/hitN 나눗셈 자체를 제거해 수정② 소수 데미지 픽스를 구조적으로 대체)
- SlayDeckController.codeblock = 재생성 (수동 편집 없음)
- 수정①③④⑤⑥은 자동 머지로 유지 확인 (combat.mjs ShowDmgPop 중복 없음, items.mjs 물약 중복팝업 제거 유지, shop.mjs HasRelic 필터 유지, reward.mjs 스킵 조건 유지, deckview.mjs CodexMode 처리 유지)
- 가드: cardkinds 261장 이상 0 · cbprops 0 · cbgap GAP 0 · 테스트 126/126

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_016Ten5ewG6HUZMqgzFLfQ8d
This commit is contained in:
gahusb
2026-07-15 04:37:35 +09:00
parent b796ffbbaf 89f2e2e149
commit af740fcb9b
37 changed files with 25997 additions and 5263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/deck/cb/deckview.mjs
View File

@@ -44,7 +44,7 @@ end
self:SetText("/ui/DeckUIGroup/DeckInspectHud/Title", title .. suffix)
self:SetEntityEnabled("/ui/DeckUIGroup/DeckInspectHud/Empty", count <= 0)
for i = 1, 60 do
local path = "/ui/DeckUIGroup/DeckInspectHud/Grid/Card" .. tostring(i)
local path = "/ui/DeckUIGroup/DeckInspectHud/Grid/Card" .. self:IntStr(i)
local cardId = nil
if pile ~= nil then
cardId = pile[i]
@@ -59,7 +59,7 @@ end`, [
{ Type: 'any', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'pile' },
{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'title' },
]),
method('ApplyInspectCardVisual', `self:ApplyCardFace("/ui/DeckUIGroup/DeckInspectHud/Grid/Card" .. tostring(slot), cardId)`, [
method('ApplyInspectCardVisual', `self:ApplyCardFace("/ui/DeckUIGroup/DeckInspectHud/Grid/Card" .. self:IntStr(slot), cardId)`, [
{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' },
{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' },
]),
@@ -227,7 +227,7 @@ self:SetText("/ui/DeckUIGroup/DeckAllHud/Title", title .. " (" .. tostring(count
self:RenderClassDeckTabs()
self:SetEntityEnabled("/ui/DeckUIGroup/DeckAllHud/Empty", count <= 0)
for i = 1, 120 do
local path = "/ui/DeckUIGroup/DeckAllHud/Grid/Card" .. tostring(i)
local path = "/ui/DeckUIGroup/DeckAllHud/Grid/Card" .. self:IntStr(i)
local cardId = pile[i]
if cardId == nil then
self:SetEntityEnabled(path, false)
@@ -236,7 +236,7 @@ for i = 1, 120 do
self:ApplyAllDeckCardVisual(i, cardId)
end
end`),
method('ApplyAllDeckCardVisual', `self:ApplyCardFace("/ui/DeckUIGroup/DeckAllHud/Grid/Card" .. tostring(slot), cardId)`, [
method('ApplyAllDeckCardVisual', `self:ApplyCardFace("/ui/DeckUIGroup/DeckAllHud/Grid/Card" .. self:IntStr(slot), cardId)`, [
{ Type: 'number', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'slot' },
{ Type: 'string', DefaultValue: null, SyncDirection: 0, Attributes: [], Name: 'cardId' },
]),