diff --git a/Assets/Data/Stages/stages.csv b/Assets/Data/Stages/stages.csv
index cf5ba53a..a3b51dfe 100644
--- a/Assets/Data/Stages/stages.csv
+++ b/Assets/Data/Stages/stages.csv
@@ -1,5 +1,5 @@
chapter,stage,title,type,place,faction,infantry,spear,cavalry,archer,strategist,generals,bg_theme,note,f_enemy_hp,f_enemy_atk,f_enemy_def
-1,1,탁현 주점 — 장비 구출,normal,탁현,hgj,3,0,0,0,0,,마을 어귀,튜토리얼(조작),,,
+1,1,탁현 저잣거리 — 장비 구출,normal,탁현,hgj,3,0,0,0,0,,마을 어귀,튜토리얼(조작),,,
1,2,탁현 고갯길 — 관우 구출,normal,탁현,hgj,4,0,0,0,0,,산길,튜토리얼(아군 밀치기 · 3턴),,,
1,3,누상촌 어귀 — 포위 돌파,normal,누상촌,hgj,12,0,0,0,0,,마을,튜토리얼(장수 스킬),,,
1,4,대흥산 — 등무,elite,대흥산,hgj,2,2,2,0,0,hgj_boss_dengmao:spear:false,산기슭,튜토리얼(상성 · 무장),,,
diff --git a/Assets/Data/Stages/tutorial_guide.csv b/Assets/Data/Stages/tutorial_guide.csv
index 212e9d43..fb7504dc 100644
--- a/Assets/Data/Stages/tutorial_guide.csv
+++ b/Assets/Data/Stages/tutorial_guide.csv
@@ -1,5 +1,5 @@
n_chapter,n_stage,n_step,e_trigger,n_turn,s_target,e_mode,b_lock,s_text_ko,Memo
-1,1,1,stage_start,0,slot:3,popup,1,장비가 기습에 쓰러졌다! 유비로 비겁한 건달을 혼내 주자.,
+1,1,1,stage_start,0,slot:3,popup,1,장비가 건달들에게 둘러싸였다! 유비로 건달을 물리치자.,
1,1,2,after_step,0,slot:1>slot:2,drag,1,유비를 누른 채 적 쪽으로 끌었다 놓으세요. 놓는 순간의 게이지만큼 날아갑니다.,손가락이 유비에서 2번 건달 쪽으로 끄는 움직임을 되풀이 · 조준선 끝 = 2번 건달
1,1,3,unit_select,0,slot:2,highlight,1,조준선을 건달에 맞추고 손을 떼세요. 부딪힌 적을 공격합니다.,공격 예정 적 표시와 함께
1,1,4,action_end,1,,bar,0,공격받은 적은 곧바로 반격합니다. 머리 위 체력을 확인하세요.,
diff --git a/Assets/Data/Stages/tutorial_stage.csv b/Assets/Data/Stages/tutorial_stage.csv
index 7bf2a863..b8985012 100644
--- a/Assets/Data/Stages/tutorial_stage.csv
+++ b/Assets/Data/Stages/tutorial_stage.csv
@@ -1,5 +1,5 @@
n_chapter,n_stage,s_title_ko,s_place,e_type,s_learn_ko,s_lineup,s_npc,n_turn_limit,s_win_ko,s_lose_ko,s_clear_ko,s_unlock_ko,b_no_defeat,Memo
-1,1,탁현 주점 — 장비 구출,탁현,normal,조작(유닛 선택 · 끌어서 방향 정하고 게이지에 맞춰 놓기 · 조준선 · 공격과 반격 · 아군 턴과 적 턴),liubei,zhangfei,0,건달 전멸,없음(유비·장비 체력 1 아래로 안 내려감),,,1,연의 1회 각색 — 유비·장비는 의용군 방 앞에서 만남 → 건달에게 둘러싸인 장비를 유비가 구함(PD 예시) · 건달 = 황건 앞잡이(황건 보병 그림 재사용)
+1,1,탁현 저잣거리 — 장비 구출,탁현,normal,조작(유닛 선택 · 끌어서 방향 정하고 게이지에 맞춰 놓기 · 조준선 · 공격과 반격 · 아군 턴과 적 턴),liubei,zhangfei,0,건달 전멸,없음(유비·장비 체력 1 아래로 안 내려감),,,1,연의 1회 각색 — 유비·장비는 의용군 방 앞에서 만남 → 건달에게 둘러싸인 장비를 유비가 구함(PD 예시) · 건달 = 황건 앞잡이(황건 보병 그림 재사용)
1,2,탁현 고갯길 — 관우 구출,탁현,normal,아군 밀치기(보병이 아군을 쳐서 멀리 보냄 · 밀린 아군이 적에 닿으면 그 자리에서 1회 공격) · 턴 제한,liubei;zhangfei,guanyu,3,관우를 둘러싼 척후 전멸,관우가 쓰러짐 · 3턴 안에 못 끝냄,,,0,연의 1회 각색 — 관우는 주막에서 만남 → 척후에게 포위된 관우를 구함(PD 예시) · 의도한 해법 = 1턴 유비가 장비를 밀어 4번 척후와 닿게(그 자리 공격으로 쓰러짐) → 장비가 5·6번을 한 줄로 → 2~3턴 7번 · 밀치기 없이도 깰 수는 있음(적 이동은 계산 불가 · 1턴 밀치기는 안내 잠금으로 강제)
1,3,누상촌 어귀 — 포위 돌파,누상촌,normal,장수 스킬(스킬 버튼 · 범위 · 다시 쓰기까지 대기 턴) · 세 사람 모두 조작,liubei;guanyu;zhangfei,,0,적 전멸,아군 전멸,복숭아꽃이 핀 장비의 동산에서 세 사람은 한날한시에 죽기를 맹세하며 의형제를 맺었다.,유비·관우·장비 영입(제안 · 편성 화면에 보유),0,연의 1회(도원결의) 각색 — 포위를 관우 스킬로 일거에 무너뜨림(PD 예시) · 스킬은 지금 규칙으로 첫 턴부터 사용 가능
1,4,대흥산 — 등무,대흥산,elite,병종 상성(보병 > 창병 > 기병 > 보병 · 유리 1.5배 · 불리 0.7배) · 이름 있는 무장,liubei;guanyu;zhangfei,,0,적 전멸,아군 전멸,,,0,연의 1회 · 덤불 벽 2줄로 세 갈래 길 → 각 길에 그 장수가 유리한 적
diff --git a/Assets/Resources/BalanceConfig.asset b/Assets/Resources/BalanceConfig.asset
index 7414d032..bef749c9 100644
--- a/Assets/Resources/BalanceConfig.asset
+++ b/Assets/Resources/BalanceConfig.asset
@@ -186,7 +186,7 @@ MonoBehaviour:
years: 208
map: ch10
stages:
- - title: "\uD0C1\uD604 \uC8FC\uC810 \u2014 \uC7A5\uBE44 \uAD6C\uCD9C"
+ - title: "\uD0C1\uD604 \uC800\uC7A3\uAC70\uB9AC \u2014 \uC7A5\uBE44 \uAD6C\uCD9C"
subtitle: "184\uB144"
aiAccuracy: 0.5
aiAggroRange: 11
diff --git a/Assets/Resources/Board/bg_ev_pass.png b/Assets/Resources/Board/bg_ev_pass.png
new file mode 100644
index 00000000..de5919ce
Binary files /dev/null and b/Assets/Resources/Board/bg_ev_pass.png differ
diff --git a/Assets/Resources/Board/bg_ev_pass.png.meta b/Assets/Resources/Board/bg_ev_pass.png.meta
new file mode 100644
index 00000000..1e4b0fd4
--- /dev/null
+++ b/Assets/Resources/Board/bg_ev_pass.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: bdf16083c91c4d11888d0558a7d2cbad
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 6962303912857251952
+ second: battlefield_01_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: battlefield_01_0
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 2000
+ height: 3200
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: 0703b2855821f9060800000000000000
+ internalID: 6962303912857251952
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ battlefield_01_0: 6962303912857251952
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Board/bg_ev_peach.png b/Assets/Resources/Board/bg_ev_peach.png
new file mode 100644
index 00000000..60411450
Binary files /dev/null and b/Assets/Resources/Board/bg_ev_peach.png differ
diff --git a/Assets/Resources/Board/bg_ev_peach.png.meta b/Assets/Resources/Board/bg_ev_peach.png.meta
new file mode 100644
index 00000000..8538dc7d
--- /dev/null
+++ b/Assets/Resources/Board/bg_ev_peach.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 2a4dd9be138a4da4b61c26e49dd589c7
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 6962303912857251952
+ second: battlefield_01_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: battlefield_01_0
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 2000
+ height: 3200
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: 0703b2855821f9060800000000000000
+ internalID: 6962303912857251952
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ battlefield_01_0: 6962303912857251952
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Board/bg_ev_tavern.png b/Assets/Resources/Board/bg_ev_tavern.png
new file mode 100644
index 00000000..8e23132d
Binary files /dev/null and b/Assets/Resources/Board/bg_ev_tavern.png differ
diff --git a/Assets/Resources/Board/bg_ev_tavern.png.meta b/Assets/Resources/Board/bg_ev_tavern.png.meta
new file mode 100644
index 00000000..d2a92a76
--- /dev/null
+++ b/Assets/Resources/Board/bg_ev_tavern.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 6fdc12ddc61c40a0bfe96d0843e2a4df
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 6962303912857251952
+ second: battlefield_01_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: battlefield_01_0
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 2000
+ height: 3200
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: 0703b2855821f9060800000000000000
+ internalID: 6962303912857251952
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ battlefield_01_0: 6962303912857251952
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Board/bg_ev_village.png b/Assets/Resources/Board/bg_ev_village.png
new file mode 100644
index 00000000..da9d2544
Binary files /dev/null and b/Assets/Resources/Board/bg_ev_village.png differ
diff --git a/Assets/Resources/Board/bg_ev_village.png.meta b/Assets/Resources/Board/bg_ev_village.png.meta
new file mode 100644
index 00000000..60fe5e52
--- /dev/null
+++ b/Assets/Resources/Board/bg_ev_village.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 00216451e19e4691ad72763c21bdbfdc
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 6962303912857251952
+ second: battlefield_01_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: battlefield_01_0
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 2000
+ height: 3200
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: 0703b2855821f9060800000000000000
+ internalID: 6962303912857251952
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ battlefield_01_0: 6962303912857251952
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Board/bg_theme_files.csv b/Assets/Resources/Board/bg_theme_files.csv
new file mode 100644
index 00000000..55099024
--- /dev/null
+++ b/Assets/Resources/Board/bg_theme_files.csv
@@ -0,0 +1,20 @@
+s_theme_id,s_file,Memo
+T01,bg_T01_field,bg
+T02,bg_T02_village,bg
+T03,bg_T03_mountain,bg
+T04,bg_T04_fortress,bg
+T05,bg_T05_town,bg
+T06,bg_T06_camp,bg_edit
+T07,bg_T07_riverside,bg
+T08,T07,share · 공용
+T09,bg_T09_scorched,bg
+T10,bg_T10_stronghold,bg
+T11,bg_T11_reeds,bg
+T12,bg_T12_temple,bg
+T13,bg_T13_formation,bg
+T14,bg_T14_flooded,bg
+T15,bg_T15_snow,bg
+T16,bg_T16_deck,bg
+T17,bg_T17_naval_base,bg
+T18,bg_T18_mud,bg
+T19,T07,share · 공용
diff --git a/Assets/Resources/Board/bg_theme_files.csv.meta b/Assets/Resources/Board/bg_theme_files.csv.meta
new file mode 100644
index 00000000..d807ba95
--- /dev/null
+++ b/Assets/Resources/Board/bg_theme_files.csv.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 653828db8e720d44f9f4e35e0334fee2
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Board/bg_theme_map.csv b/Assets/Resources/Board/bg_theme_map.csv
new file mode 100644
index 00000000..88ecd16f
--- /dev/null
+++ b/Assets/Resources/Board/bg_theme_map.csv
@@ -0,0 +1,68 @@
+s_bg_theme,s_theme_id,e_variant,Memo
+마을 어귀,T02,낮,마을 · 스테이지 1개
+마을,T02,낮,마을 · 스테이지 2개
+산길,T03,낮,산길·협곡·숲 · 스테이지 3개
+산기슭,T03,낮,산길·협곡·숲 · 스테이지 1개
+산기슭 평지,T03,낮,산길·협곡·숲 · 스테이지 1개
+협곡,T03,낮,산길·협곡·숲 · 스테이지 1개
+숲,T03,낮,산길·협곡·숲 · 스테이지 1개
+산,T03,낮,산길·협곡·숲 · 스테이지 1개
+산골,T03,낮,산길·협곡·숲 · 스테이지 1개
+숲길,T03,낮,산길·협곡·숲 · 스테이지 1개
+골짜기,T03,낮,산길·협곡·숲 · 스테이지 1개
+좁은 산길,T03,낮,산길·협곡·숲 · 스테이지 1개
+들판,T01,낮,들판·평원 · 스테이지 31개
+들판·언덕,T01,낮,들판·평원 · 스테이지 1개
+황무지,T01,낮,들판·평원 · 스테이지 1개
+성 밖 들판,T04,낮,성 밖·성문·관문 · 스테이지 4개
+관문 앞 들판,T04,낮,성 밖·성문·관문 · 스테이지 1개
+관문 앞,T04,낮,성 밖·성문·관문 · 스테이지 3개
+관문 측면,T04,낮,성 밖·성문·관문 · 스테이지 1개
+관문,T04,낮,성 밖·성문·관문 · 스테이지 1개
+성 밖,T04,낮,성 밖·성문·관문 · 스테이지 8개
+성문,T04,낮,성 밖·성문·관문 · 스테이지 7개
+성문 앞,T04,낮,성 밖·성문·관문 · 스테이지 2개
+성벽,T04,낮,성 밖·성문·관문 · 스테이지 1개
+성문 밖 밤,T04,밤,성 밖·성문·관문 · 스테이지 1개
+관문 안쪽,T05,낮,성안 · 스테이지 1개
+성안 누각 앞,T05,낮,성안 · 스테이지 1개
+밤 성안,T05,밤,성안 · 스테이지 3개
+진영 앞 평원,T06,낮,군영·진영 · 스테이지 1개
+황건 본진,T06,낮,군영·진영 · 스테이지 1개
+군영,T06,낮,군영·진영 · 스테이지 2개
+군영 앞,T06,낮,군영·진영 · 스테이지 1개
+들판 진영,T06,낮,군영·진영 · 스테이지 2개
+진영 깃발 아래,T06,낮,군영·진영 · 스테이지 1개
+밤 군영,T06,밤,군영·진영 · 스테이지 3개
+강변 들판,T07,낮,강변·나루 · 스테이지 4개
+강변,T07,낮,강변·나루 · 스테이지 6개
+강변 진영,T07,낮,강변·나루 · 스테이지 1개
+강변 나루,T07,낮,강변·나루 · 스테이지 3개
+나루,T07,낮,강변·나루 · 스테이지 3개
+나루 언덕,T07,낮,강변·나루 · 스테이지 1개
+개울가,T07,낮,강변·나루 · 스테이지 1개
+강 건너 들판,T07,낮,강변·나루 · 스테이지 1개
+강 북안,T07,낮,강변·나루 · 스테이지 1개
+다리·강,T08,낮,다리 · 스테이지 1개
+다리,T08,낮,다리 · 스테이지 1개
+불탄 들판,T09,불,불타는 땅·성 · 스테이지 1개
+불탄 마을,T09,불,불타는 땅·성 · 스테이지 1개
+불타는 성안,T09,불,불타는 땅·성 · 스테이지 2개
+불타는 강변,T09,불,불타는 땅·성 · 스테이지 1개
+산채,T10,낮,산채 · 스테이지 3개
+갈대숲,T11,낮,갈대숲 · 스테이지 1개
+불타는 갈대숲,T11,불,갈대숲 · 스테이지 1개
+절간,T12,낮,절간 · 스테이지 1개
+절 마당,T12,낮,절간 · 스테이지 1개
+진형(바닥 문양),T13,낮,진형(바닥 문양) · 스테이지 1개
+물에 잠긴 성,T14,낮,물에 잠긴 성 · 스테이지 1개
+눈 덮인 산길,T15,낮,눈 덮인 산길 · 스테이지 1개
+배 위,T16,낮,배 위·갑판 · 스테이지 3개
+기함 갑판,T16,낮,배 위·갑판 · 스테이지 1개
+연환선 갑판,T16,낮,배 위·갑판 · 스테이지 2개
+강 위,T16,낮,배 위·갑판 · 스테이지 1개
+불타는 갑판,T16,불,배 위·갑판 · 스테이지 1개
+수채,T17,낮,수채 · 스테이지 1개
+불타는 수채,T17,불,수채 · 스테이지 2개
+진흙 습지,T18,낮,진흙 습지 · 스테이지 2개
+안개 낀 강,T19,낮,안개 낀 강 · 스테이지 1개
diff --git a/Assets/Resources/Board/bg_theme_map.csv.meta b/Assets/Resources/Board/bg_theme_map.csv.meta
new file mode 100644
index 00000000..fe7b0500
--- /dev/null
+++ b/Assets/Resources/Board/bg_theme_map.csv.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5f4acb085f0ce8b42bb96642fd0f2456
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/ChapterMap/Data/ch01.json b/Assets/Resources/ChapterMap/Data/ch01.json
index 7e75c5c9..58ba6db9 100644
--- a/Assets/Resources/ChapterMap/Data/ch01.json
+++ b/Assets/Resources/ChapterMap/Data/ch01.json
@@ -731,7 +731,7 @@
"type": "튜토리얼(조작)",
"boss": false,
"place": "탁현",
- "title": "탁현 주점 — 장비 구출",
+ "title": "탁현 저잣거리 — 장비 구출",
"at": [
435.7,
3399.0
diff --git a/Assets/Resources/Scenario/Props.meta b/Assets/Resources/Scenario/Props.meta
new file mode 100644
index 00000000..f43a073a
--- /dev/null
+++ b/Assets/Resources/Scenario/Props.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 466a4168895965d4f9c31760d3a4a2fd
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_fence.png b/Assets/Resources/Scenario/Props/prop_fence.png
new file mode 100644
index 00000000..a436852e
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_fence.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_fence.png.meta b/Assets/Resources/Scenario/Props/prop_fence.png.meta
new file mode 100644
index 00000000..0a3b65a8
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_fence.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: ec896755ebf94680a1242affe8dc4f96
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_fence_broken.png b/Assets/Resources/Scenario/Props/prop_fence_broken.png
new file mode 100644
index 00000000..51fe1359
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_fence_broken.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_fence_broken.png.meta b/Assets/Resources/Scenario/Props/prop_fence_broken.png.meta
new file mode 100644
index 00000000..54a459dd
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_fence_broken.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 19ea16ad3196491690e1e86ce4189d8b
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_haystack.png b/Assets/Resources/Scenario/Props/prop_haystack.png
new file mode 100644
index 00000000..0e503d24
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_haystack.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_haystack.png.meta b/Assets/Resources/Scenario/Props/prop_haystack.png.meta
new file mode 100644
index 00000000..e1770a0b
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_haystack.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: c7b363068e8549ecb2ad5c1321a1e11a
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_haystack_broken.png b/Assets/Resources/Scenario/Props/prop_haystack_broken.png
new file mode 100644
index 00000000..2bf10caf
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_haystack_broken.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_haystack_broken.png.meta b/Assets/Resources/Scenario/Props/prop_haystack_broken.png.meta
new file mode 100644
index 00000000..5974b51f
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_haystack_broken.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 659f8d72db7e47da8d0c18fc808db898
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_pine.png b/Assets/Resources/Scenario/Props/prop_pine.png
new file mode 100644
index 00000000..eb9bf834
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_pine.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_pine.png.meta b/Assets/Resources/Scenario/Props/prop_pine.png.meta
new file mode 100644
index 00000000..ea10451c
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_pine.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 1bd6f5e47007470e9604dde558765eeb
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_pine_broken.png b/Assets/Resources/Scenario/Props/prop_pine_broken.png
new file mode 100644
index 00000000..3e901822
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_pine_broken.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_pine_broken.png.meta b/Assets/Resources/Scenario/Props/prop_pine_broken.png.meta
new file mode 100644
index 00000000..8848788b
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_pine_broken.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 51560e1c2238463aacaef4a3d6fcddc0
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_rocks.png b/Assets/Resources/Scenario/Props/prop_rocks.png
new file mode 100644
index 00000000..92749fe0
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_rocks.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_rocks.png.meta b/Assets/Resources/Scenario/Props/prop_rocks.png.meta
new file mode 100644
index 00000000..fc73a2e5
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_rocks.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 3b1fe376b4db4046928ce86102fc0860
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_rocks_broken.png b/Assets/Resources/Scenario/Props/prop_rocks_broken.png
new file mode 100644
index 00000000..c13f1a7a
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_rocks_broken.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_rocks_broken.png.meta b/Assets/Resources/Scenario/Props/prop_rocks_broken.png.meta
new file mode 100644
index 00000000..5eccd7f4
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_rocks_broken.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 40be7e5c96774334b2e32a41b783d32d
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_tavern_table.png b/Assets/Resources/Scenario/Props/prop_tavern_table.png
new file mode 100644
index 00000000..c35a40df
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_tavern_table.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_tavern_table.png.meta b/Assets/Resources/Scenario/Props/prop_tavern_table.png.meta
new file mode 100644
index 00000000..81605bab
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_tavern_table.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: c6cad2e4654b4d70a16dc91940314e93
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_tavern_table_broken.png b/Assets/Resources/Scenario/Props/prop_tavern_table_broken.png
new file mode 100644
index 00000000..79383ac6
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_tavern_table_broken.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_tavern_table_broken.png.meta b/Assets/Resources/Scenario/Props/prop_tavern_table_broken.png.meta
new file mode 100644
index 00000000..2c5ca743
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_tavern_table_broken.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: 0a41bb595ea0429eb37111124a112eb1
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_wine_jars.png b/Assets/Resources/Scenario/Props/prop_wine_jars.png
new file mode 100644
index 00000000..f41f1e3a
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_wine_jars.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_wine_jars.png.meta b/Assets/Resources/Scenario/Props/prop_wine_jars.png.meta
new file mode 100644
index 00000000..cbb3d056
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_wine_jars.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: e228f92bdc3a4d1da9d3bfaa32ad3d8f
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/Props/prop_wine_jars_broken.png b/Assets/Resources/Scenario/Props/prop_wine_jars_broken.png
new file mode 100644
index 00000000..dcd3b3d8
Binary files /dev/null and b/Assets/Resources/Scenario/Props/prop_wine_jars_broken.png differ
diff --git a/Assets/Resources/Scenario/Props/prop_wine_jars_broken.png.meta b/Assets/Resources/Scenario/Props/prop_wine_jars_broken.png.meta
new file mode 100644
index 00000000..73983140
--- /dev/null
+++ b/Assets/Resources/Scenario/Props/prop_wine_jars_broken.png.meta
@@ -0,0 +1,182 @@
+fileFormatVersion: 2
+guid: d7f59734420045f89ccb7d4409fd1048
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 3902918487487927327
+ second: gim_banner_0
+ externalObjects: {}
+ serializedVersion: 13
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 2
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 0
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 4
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 4
+ buildTarget: iOS
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 0
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: gim_banner_0
+ rect:
+ serializedVersion: 2
+ x: 73
+ y: 13
+ width: 110
+ height: 230
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ customData:
+ outline: []
+ physicsShape: []
+ tessellationDetail: -1
+ bones: []
+ spriteID: f14d5029fa3f92630800000000000000
+ internalID: 3902918487487927327
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ customData:
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spriteCustomMetadata:
+ entries: []
+ nameFileIdTable:
+ gim_banner_0: 3902918487487927327
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/scenario_event.csv b/Assets/Resources/Scenario/scenario_event.csv
index c0874055..1e2ec4eb 100644
--- a/Assets/Resources/Scenario/scenario_event.csv
+++ b/Assets/Resources/Scenario/scenario_event.csv
@@ -139,10 +139,10 @@ taoyuan_3_start,taoyuan,1,3,stage_start,0,12,focus,,,0,0,0.5,1,,
taoyuan_3_win,taoyuan,1,3,win,0,1,wait,,,,,0.5,,,
taoyuan_3_win,taoyuan,1,3,win,0,2,fade,,,,,0.8,out,,
taoyuan_3_win,taoyuan,1,3,win,0,3,bg,,,,,,bg_ev_peach,,복숭아 동산 바닥(없으면 지금 바닥)
-taoyuan_3_win,taoyuan,1,3,win,0,4,show,liubei,,0,0.6,0,,,가운데 = 맏형
-taoyuan_3_win,taoyuan,1,3,win,0,5,show,guanyu,,-1.4,-0.4,0,,,
-taoyuan_3_win,taoyuan,1,3,win,0,6,show,zhangfei,,1.4,-0.4,0,,,
-taoyuan_3_win,taoyuan,1,3,win,0,7,focus,,,0,0,0,1.3,,
+taoyuan_3_win,taoyuan,1,3,win,0,4,show,liubei,,0,8.6,0,,,가운데 = 맏형 · 2026-11-18 제단(복숭아 동산 그림 y 10.6) 앞으로
+taoyuan_3_win,taoyuan,1,3,win,0,5,show,guanyu,,-1.5,7.8,0,,,2026-11-18 제단(복숭아 동산 그림 y 10.6) 앞으로
+taoyuan_3_win,taoyuan,1,3,win,0,6,show,zhangfei,,1.5,7.8,0,,,2026-11-18 제단(복숭아 동산 그림 y 10.6) 앞으로
+taoyuan_3_win,taoyuan,1,3,win,0,7,focus,,,0,9.2,0,1.3,,2026-11-18 제단(복숭아 동산 그림 y 10.6) 앞으로
taoyuan_3_win,taoyuan,1,3,win,0,8,fade,,,,,1.0,in,,
taoyuan_3_win,taoyuan,1,3,win,0,9,caption,,,,,2.5,,장비의 집 뒤 · 복숭아 동산,
taoyuan_3_win,taoyuan,1,3,win,0,10,say,liubei,,,,,,"우리 셋, 성은 달라도 뜻은 하나요.",
@@ -155,5 +155,5 @@ taoyuan_3_win,taoyuan,1,3,win,0,16,say,zhangfei,,,,,,오늘부터 유비 형님
taoyuan_3_win,taoyuan,1,3,win,0,17,emote,zhangfei,,,,,laugh,,
taoyuan_3_win,taoyuan,1,3,win,0,18,say,guanyu,,,,,,"형님, 아우의 절을 받으시오.",
taoyuan_3_win,taoyuan,1,3,win,0,19,say,liubei,,,,,,두 아우와 함께라면 두렵지 않소.,
-taoyuan_3_win,taoyuan,1,3,win,0,20,focus,,,0,0,1.0,1,,
+taoyuan_3_win,taoyuan,1,3,win,0,20,focus,,,0,9.2,1.0,1,,2026-11-18 제단(복숭아 동산 그림 y 10.6) 앞으로
taoyuan_3_win,taoyuan,1,3,win,0,21,fade,,,,,0.8,out,,"끝 → 결말 카드(tutorial_stage 1,3 s_clear_ko)"
diff --git a/Assets/Resources/Scenario/scenario_event_config.csv b/Assets/Resources/Scenario/scenario_event_config.csv
index 8b0f516b..0316b88b 100644
--- a/Assets/Resources/Scenario/scenario_event_config.csv
+++ b/Assets/Resources/Scenario/scenario_event_config.csv
@@ -28,3 +28,9 @@ emote_world_height,0.6,머리 위 표시 글자 높이(월드 칸)
emote_offset,0.25,머리 끝에서 표시까지 높이(월드 칸)
emote_hop,0.15,표시가 튀어 오르는 높이(월드 칸)
extra_shape_size,0.8,연출 인물 그림이 없을 때 대신 그리는 원 지름(월드 칸)
+prop_break_contact,0.08,소품 부서짐 = 움직인 유닛이 (유닛 반지름 + 소품 반지름 + 이 값) 안에 들면(칸)
+prop_break_sec,0.35,부서지는 연출 시간(초)
+prop_break_pop,1.15,부서질 때 크기 배율(부서진 그림 = 이 배율에서 1로 · 없으면 1에서 이 배율로 커지며 사라짐)
+prop_break_shake,0.12,부서질 때 화면 흔들림 세기
+prop_break_shake_sec,0.15,부서질 때 화면 흔들림 시간(초)
+act_transition_sec,1.2,연의 서장 — 막 승리(연출) 뒤 다음 막이 놓이기까지(초)
diff --git a/Assets/Resources/Scenario/scenario_props.csv b/Assets/Resources/Scenario/scenario_props.csv
new file mode 100644
index 00000000..7926bd4f
--- /dev/null
+++ b/Assets/Resources/Scenario/scenario_props.csv
@@ -0,0 +1,18 @@
+s_battle_id,n_chapter,n_stage,s_prop_id,s_art,f_x,f_y,f_w,b_block,f_block_r,Memo
+taoyuan,1,1,_bg,bg_ev_tavern,,,,0,,1-1 바닥 = 탁현 주점(연출 bg 명령 없이도 전투 내내 · 2026-11-18 PD 「주점 내부처럼 꾸미고」)
+taoyuan,1,1,table_zhangfei,prop_tavern_table,0,0.4,1.9,1,0.65,"장비 술상(건달 줄 ±1.3,-1.1 위 · 첫 조준 줄 x 0 은 y -8 ~ -5.5 라 닿지 않음)"
+taoyuan,1,1,table_corner,prop_tavern_table,4.2,-8.6,1.9,1,0.65,"구석 자리(유비가 앉았던 곳 · 연출 시작 3.6,-9.4)"
+taoyuan,1,1,table_left,prop_tavern_table,-3.8,-4.6,1.9,1,0.65,손님 자리
+taoyuan,1,1,table_right,prop_tavern_table,3.6,1.8,1.9,1,0.65,빈 술상
+taoyuan,1,1,jars_counter,prop_wine_jars,-4.3,1.4,1.6,1,0.6,"술독(주인 -3.0,0.6 뒤)"
+taoyuan,1,1,jars_right,prop_wine_jars,4.4,-3.2,1.5,1,0.55,술독
+taoyuan,1,2,_bg,bg_ev_pass,,,,0,,1-2 바닥 = 탁현 외곽 고갯길(양쪽 바위·소나무 · 가운데 흙길 · 2026-11-18 이 세션 제작)
+taoyuan,1,3,_bg,bg_ev_village,,,,0,,1-3 바닥 = 누상촌 어귀(양쪽 초가집·짚더미 · 가운데 수레 자국 흙길 · 승리 연출에서 복숭아 동산으로 바뀜)
+taoyuan,1,2,rocks_a,prop_rocks,-3.6,-10.2,1.8,1,0.65,고갯길 바위(아래 왼쪽 · 유비·장비 x 0 줄과 3칸 이상)
+taoyuan,1,2,pine_a,prop_pine,3.9,-7.0,1.8,1,0.55,소나무
+taoyuan,1,2,rocks_b,prop_rocks,4.3,-2.4,1.6,1,0.6,"바위(척후 시작 4.8,0.6 과 3칸)"
+taoyuan,1,2,pine_b,prop_pine,-4.0,2.2,1.8,1,0.55,소나무(위 왼쪽)
+taoyuan,1,3,hay_a,prop_haystack,-4.3,2.8,1.6,1,0.6,짚더미(둘러싼 황건 고리 2.4칸 밖)
+taoyuan,1,3,hay_b,prop_haystack,4.4,-2.2,1.6,1,0.6,짚더미
+taoyuan,1,3,fence_a,prop_fence,-3.9,-3.9,2.2,1,0.6,울타리
+taoyuan,1,3,fence_b,prop_fence,3.9,3.4,2.2,1,0.6,울타리
diff --git a/Assets/Resources/Scenario/scenario_props.csv.meta b/Assets/Resources/Scenario/scenario_props.csv.meta
new file mode 100644
index 00000000..60d0e86f
--- /dev/null
+++ b/Assets/Resources/Scenario/scenario_props.csv.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 07ecf5eb9d17a944aae119aea7293076
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Scenario/stage_story.csv b/Assets/Resources/Scenario/stage_story.csv
index 8d5bc07c..7dad192e 100644
--- a/Assets/Resources/Scenario/stage_story.csv
+++ b/Assets/Resources/Scenario/stage_story.csv
@@ -1,6 +1,6 @@
n_chapter,n_stage,s_desc_ko,Memo
-1,1,탁현의 주점에서 황건 앞잡이 건달의 기습에 장비가 쓰러졌다. 유비가 자리에서 일어선다.,탁현 주점 — 장비 구출 · 튜토리얼(조작) · 근거 연의 1회 각색(방 앞 만남 → 장비 구출)
-1,2,먼저 길을 나선 관우가 고갯길에서 피란민을 지키다 황건 척후들에게 포위되었다.,탁현 고갯길 — 관우 구출 · 튜토리얼(아군 밀치기 · 3턴) · 근거 연의 1회 각색(주막 만남 → 관우 구출)
+1,1,의용군 방이 붙은 탁현 저잣거리에서 장비가 황건 앞잡이 건달들에게 둘러싸였다.,탁현 저잣거리 — 장비 구출 · 튜토리얼(조작) · 근거 연의 1회 각색(방 앞 만남 → 장비 구출)
+1,2,탁현 외곽 고갯길에서 떠돌던 무사 관우가 황건 척후들에게 포위되었다.,탁현 고갯길 — 관우 구출 · 튜토리얼(아군 밀치기 · 3턴) · 근거 연의 1회 각색(주막 만남 → 관우 구출)
1,3,셋이 함께 누상촌으로 돌아가던 길에 황건 무리가 사방에서 몰려왔다.,누상촌 어귀 — 포위 돌파 · 튜토리얼(장수 스킬) · 근거 연의 1회 각색 · 클리어 뒤 도원결의
1,4,도원에서 의형제를 맺은 세 사람이 대흥산에 닿자 정원지의 부장 등무가 앞을 막았다.,대흥산 — 등무 · 엘리트 · 튜토리얼(상성) · 근거 연의 1회
1,5,부장을 잃고 분노한 정원지가 황건 5만을 이끌고 산기슭으로 몰려왔다.,대흥산 전투 — 정원지 · 보스 · 튜토리얼(보스·바위) · 근거 연의 1회
diff --git a/Assets/Resources/Tutorial/TutorialDb.asset b/Assets/Resources/Tutorial/TutorialDb.asset
index 4877c440..e9fb037c 100644
--- a/Assets/Resources/Tutorial/TutorialDb.asset
+++ b/Assets/Resources/Tutorial/TutorialDb.asset
@@ -2180,8 +2180,8 @@ MonoBehaviour:
targetRaw: slot:3
mode: 0
locked: 1
- textKo: "\uC7A5\uBE44\uAC00 \uAE30\uC2B5\uC5D0 \uC4F0\uB7EC\uC84C\uB2E4! \uC720\uBE44\uB85C
- \uBE44\uAC81\uD55C \uAC74\uB2EC\uC744 \uD63C\uB0B4 \uC8FC\uC790."
+ textKo: "\uC7A5\uBE44\uAC00 \uAC74\uB2EC\uB4E4\uC5D0\uAC8C \uB458\uB7EC\uC2F8\uC600\uB2E4!
+ \uC720\uBE44\uB85C \uAC74\uB2EC\uC744 \uBB3C\uB9AC\uCE58\uC790."
line: 2
- chapter: 1
stage: 1
diff --git a/Assets/Scripts/OutGame/Arena/ArenaScenario.cs b/Assets/Scripts/OutGame/Arena/ArenaScenario.cs
index 66888f47..ad589ba7 100644
--- a/Assets/Scripts/OutGame/Arena/ArenaScenario.cs
+++ b/Assets/Scripts/OutGame/Arena/ArenaScenario.cs
@@ -279,12 +279,7 @@ namespace TKS.OutGame
bool Done(ContentRow b)
{
var d = S.Save;
- if (b.I("n_no") == 0)
- {
- var pd = L("prologue_done"); // 장 칸|막 수 칸
- var st = d.Stage(b.I(Str(pd, 0)), b.I(Str(pd, 1)), false);
- return st != null && st.clears > 0;
- }
+ // 서장도 연의 세이브로(2026-11-18 PD 「연의 전기와 출정은 별개」 · 그 전 = 출정 n_spec_chapter-n_acts 클리어)
var e = d.scenario.Get(b.S("s_id"), false);
return e != null && e.normal[0];
}
@@ -1081,7 +1076,7 @@ namespace TKS.OutGame
public void Go(string id, bool hard)
{
var pb = ContentTables.Find("scenario_battles", "s_id", id);
- if (pb != null && pb.I("n_no") == 0) // 서장 = 출정 학습 판으로(ArenaScreen.PrologueGo · 2026-11-18)
+ if (pb != null && pb.I("n_no") == 0) // 서장 = 연의 모드 전투 n_acts 막(ArenaScreen.PrologueGo · 2026-11-18)
{
CloseDetail();
screen.PrologueGo(id);
diff --git a/Assets/Scripts/OutGame/Arena/ArenaScreen.Scenario.cs b/Assets/Scripts/OutGame/Arena/ArenaScreen.Scenario.cs
index b9f09050..095252e4 100644
--- a/Assets/Scripts/OutGame/Arena/ArenaScreen.Scenario.cs
+++ b/Assets/Scripts/OutGame/Arena/ArenaScreen.Scenario.cs
@@ -114,47 +114,27 @@ namespace TKS.OutGame
}
///
- /// 서장(편 n_no 0 · 도원결의 = 출정 n_spec_chapter 장 학습 판 1 ~ n_acts) 출전 — 아직 안 깬 첫 막(모두 깼으면 1막)을 일반 출정으로 연다
- /// (월드맵 경유 · 군량 · 시나리오 이벤트 · 학습 안내 · 보상 = 출정 규칙 그대로). false = 서장 아님.
- /// 2026-11-18 PD 「이 PC 에서 연의전기가 실행이 안돼」 — 서장은 「1장 학습 판」 알림만 띄우고 들어가지 않았음.
+ /// 서장(편 n_no 0 · 도원결의) 출전 = 연의 모드 전투 n_acts 막(PrologueRules · 지도 = 출정 n_spec_chapter 장 학습 판 표를 빌림 · 진행 · 보상 = 연의 세이브)
+ /// — 2026-11-18 PD 「연의 전기 스테이지와 일반 출정 스테이지는 별개 · 완전히 별개의 스테이지 개념으로」(그 전 = 출정 월드맵 1-1 ~ 1-3 으로 들어감). false = 서장 아님.
///
- static int prologueLast;
-
internal bool PrologueGo(string id)
{
var b = ContentTables.Find("scenario_battles", "s_id", id);
if (b == null || b.I("n_no") != 0) return false;
- var map = Root.Map;
- var cfg = Root.Battle.Config;
- if (map == null || !map.HasData)
+ var rules = new PrologueRules { BattleId = id, TitleKo = b.S("s_title_ko"), Chapter = b.I("n_spec_chapter"), Acts = Mathf.Max(1, b.I("n_acts")), Act = 1 };
+ var stage = rules.MakeStage(Root.Battle.Config, 1);
+ if (stage == null)
{
- Root.Toast("월드맵 자료 없음");
+ Root.Toast(rules.Chapter + "-1 스테이지 정의 없음");
return true;
}
- int ch = b.I("n_spec_chapter"), acts = Mathf.Max(1, b.I("n_acts")), pick = 0;
- for (int s = acts; s >= 1; s--)
+ var w = S.ScenarioEnter(id, false); // 군량(연의 규칙 · 시험 메뉴 「군량 면제」면 면제)
+ if (w != null)
{
- var st = S.Save.Stage(ch, s, false);
- if (st == null || st.clears == 0) pick = s; // 안 깬 막 중 가장 앞
- }
- if (pick == 0) pick = prologueLast % acts + 1; // 모두 깼으면 1막 → 2막 → 3막 차례로 다시 보기
- prologueLast = pick;
- int ci = -1;
- for (int i = 0; i < cfg.chapters.Length; i++)
- if (cfg.chapters[i].no == ch) ci = i;
- var list = ci >= 0 ? cfg.StagesOfChapter(ch) : new List();
- int node = -1;
- for (int n = 0; n < list.Count; n++)
- if (cfg.stages[list[n]].stage == pick) node = n;
- if (node < 0)
- {
- Root.Toast(ch + "-" + pick + " 스테이지 없음");
+ Root.Toast(w);
return true;
}
- if (map.TryEnter != null && !map.TryEnter(list[node])) return true; // 군량(시험 메뉴 「군량 면제」면 통과)
- ScenarioEvent.AllowReplay(ch, pick); // 연의 전기에서 들어오면 깬 판이어도 시작·승리 연출을 다시 튼다
- Root.OpenWorldMap();
- map.EnterStage(ci, node);
+ Root.StartMode(ScenarioModeRules.Kind, id, 0, stage, 0, ScenarioPage, rules);
return true;
}
@@ -171,7 +151,7 @@ namespace TKS.OutGame
{
stage.aiAccuracy = refSt.aiAccuracy;
stage.aiAggroRange = refSt.aiAggroRange;
- stage.bgTheme = refSt.bgTheme;
+ // 바닥 = 판 꾸밈 표(scenario_props · s_battle_id = 편 id) — 출정 기준 판 배경 테마와 연동하지 않음(2026-11-18 PD 「연의 전기와 출정은 별개」)
}
var rules = new ScenarioRules { BattleId = id, Hard = hard, Config = cfg };
var why = rules.Prepare(stage);
diff --git a/Assets/Scripts/OutGame/Scenario/ScenarioModeRules.cs b/Assets/Scripts/OutGame/Scenario/ScenarioModeRules.cs
index ef52de51..57ebc21c 100644
--- a/Assets/Scripts/OutGame/Scenario/ScenarioModeRules.cs
+++ b/Assets/Scripts/OutGame/Scenario/ScenarioModeRules.cs
@@ -53,7 +53,7 @@ namespace TKS.OutGame
public static bool Unlocked(SaveData d, ContentRow b)
{
if (d.scenario.serverView) return d.scenario.serverUnlocked.Contains(b.S("s_id"));
- if (TestOptions.UnlockAllStages) return true; // 플레이 테스트 「전 스테이지 열기」 = 연의 전기 편도 모두 열림(2026-11-18 PD 「이 PC 에서 연의전기가 실행이 안돼」)
+ if (TestOpen) return true; // 플레이 테스트 「전 스테이지 열기」 = 연의 전기 편도 모두 열림(2026-11-18 PD 「이 PC 에서 연의전기가 실행이 안돼」)
int ch, st;
if (!ArenaRules.ParseStageKey(b.S("s_unlock_stage"), out ch, out st)) return true;
var s = d.Stage(ch, st, false);
@@ -70,7 +70,6 @@ namespace TKS.OutGame
{
var b = ContentTables.Find("scenario_battles", "s_id", id);
if (b == null) return "없는 편";
- if (b.I("n_no") == 0) return "서장 = 1장 학습 판(본편 1-1 ~ 1-3)";
if (!Unlocked(d, b)) return b.S("s_unlock_ko") + " 뒤 열림";
if (hard && !HardOpen(d, id)) return "열전 = 연의를 이긴 뒤";
EconomyRules.TickStamina(db, d, nowUtc);
@@ -85,7 +84,13 @@ namespace TKS.OutGame
///
static bool FreeEntry
{
- get { return TestOptions.UnlockAllStages; }
+ get { return TestOpen; }
+ }
+
+ /// 시험 메뉴는 실제 저장(PD Play)에서만 — 메모리 저장(자동 테스트 · 검증 캡처)은 PC 의 시험 설정과 무관하게 실제 규칙.
+ static bool TestOpen
+ {
+ get { return TestOptions.UnlockAllStages && !SaveStore.MemoryOnly; }
}
/// 입장 = 군량 사용.
diff --git a/Assets/Scripts/Runtime/ActionResolver.cs b/Assets/Scripts/Runtime/ActionResolver.cs
index 5b1886a2..e268c67c 100644
--- a/Assets/Scripts/Runtime/ActionResolver.cs
+++ b/Assets/Scripts/Runtime/ActionResolver.cs
@@ -86,6 +86,7 @@ namespace TKS
Vector2 delta = target - origin;
float dist = delta.magnitude;
o.Path.Add(origin);
+ pushImpacted.Clear();
if (dist < 0.001f || !u.IsAlive) yield break;
Vector2 dir = delta / dist;
@@ -1430,7 +1431,17 @@ namespace TKS
var b = Combat.FirstUnitOnPathExcept(target, target.Position, n, force, pusher, out hitDist);
if (b != null && b.IsAlive && !b.Npc && hitDist <= slide + Combat.Epsilon + 0.05f) blocker = b;
}
- if (blocker == null && slide < force - Combat.Epsilon * 2f && pusher != null && pusher.Faction != target.Faction)
+ // 밀린 아군의 충돌(PD 2026-11-18 「알까기와 동일하게 물리적으로 튕기며 즉시 피해 · 멈춘 뒤 견제처럼 공격하는 것이 아니라」):
+ // 같은 편에게 밀린 유닛이 가는 길에서 상대 유닛에 막히면 → 속도를 가진 채 닿고 그 순간 피해·반격 교환 → 알까기 튕김(Bounce · 상대 밀림 + 자기 튕김 · 연쇄)
+ // 그 전 = 막힌 자리에서 멈춘 뒤(밀기 끝) 0.1초 뒤 찌르기 공격(규칙 ⑤ PushedAllyAttack) — 이제 그 공격은 충돌이 없었던 경우에도 하지 않는다(늘 물리 충돌로만)
+ Unit foeHit = null;
+ if (chain == 0 && pusher != null && pusher.Faction == target.Faction && slide < force - Combat.Epsilon * 2f)
+ {
+ float fd;
+ var fb = Combat.FirstUnitOnPathExcept(target, target.Position, n, force, pusher, out fd);
+ if (fb != null && fb.IsAlive && !fb.Npc && fb.Faction != target.Faction && fd <= slide + Combat.Epsilon + 0.05f) foeHit = fb;
+ }
+ if (blocker == null && foeHit == null && slide < force - Combat.Epsilon * 2f && pusher != null && pusher.Faction != target.Faction)
ModeBattleRules.RaiseSlam(target, pusher); // 벽 · 장애물에 막힘(컨텐츠 모드 과제 「밀어내기」 · 2026-11-17)
NoteForced(target, target.Position, target.Position + n * slide); // 강제 이동 기록 → 강가·다리에서 밀려 강물에 들면 빠짐
float moved = 0f;
@@ -1439,13 +1450,19 @@ namespace TKS
Face(target, n); // 밀린 방향을 본다(PD #1082)
Vector2 start = target.Position;
Vector2 end = battle.Board.ClampInside(target.Position + n * slide, target.Radius);
- yield return Fx.MoveAlong(target.transform, target.Position, end, cfg.moveSpeed, null);
+ if (foeHit != null) yield return Fx.MoveAlong(target.transform, target.Position, end, cfg.moveSpeed, null, false, force); // 속도를 가진 채 부딪힘(MoveStraight 와 같은 출발 속도)
+ else yield return Fx.MoveAlong(target.transform, target.Position, end, cfg.moveSpeed, null);
target.Position = end;
moved = Vector2.Distance(start, end);
o.Displaced.Add(new Displacement { Unit = target, From = start, To = end });
}
o.Pushed.Add(target);
battle.NotifyChanged();
+ if (foeHit != null && foeHit.IsAlive && target.IsAlive)
+ {
+ pushImpacted.Add(target);
+ yield return PushedImpact(target, foeHit, n, ImpactPower(force, moved), o, pusher);
+ }
if (blocker != null && blocker.IsAlive)
{
float f2 = ImpactPower(force, moved) * cfg.pushChainRatio * PushTakenMult(blocker); // 밀려가다 부딪힌 힘도 같은 계산(PD 2026-11-16) · 전달 비율 = pushChainRatio(병종의 미는 비율과 따로)
@@ -1465,53 +1482,62 @@ namespace TKS
///
IEnumerator PushedAllyAttack(Unit ally, ActionOutcome o, Unit pusher)
{
- if (ally == null || !ally.IsAlive) yield break;
- if (Combat.TouchingOpponent(ally) == null) yield break;
- Unit foe = Combat.TouchingOpponent(ally);
- if (!ally.IsAlive || foe == null) yield break;
- yield return Fx.Wait(0.1f);
- Face(ally, foe.Position - ally.Position);
- yield return PushedAttack(ally, foe, o, pusher);
+ // 2026-11-18 PD 「멈춘 뒤 견제 공격이 발동하듯 공격 ✕ · 늘 물리적으로 즉시 튕겨지며 피해」 → 밀린 아군의 공격 = 밀리는 길의 충돌(Push → PushedImpact)만 · 멈춘 뒤 찌르기 공격은 없음
+ yield break;
+ }
+
+ /// 이번 행동에서 밀리다 상대와 부딪혀 공격한 같은 편 유닛(테스트 · 표시 확인용).
+ readonly HashSet pushImpacted = new HashSet();
+
+ public bool WasPushImpacted(Unit u)
+ {
+ return u != null && pushImpacted.Contains(u);
}
///
- /// 밀린 유닛의 근접 공격 1회(반격 받음 · Notes 에 기록) — 장합 교변: 민 장합의 공격력 × p1 을 더함 · 장합 자신이 밀려 친 공격 = × p1 ·
- /// 고순 함진영: 민 고순의 「명중 기절」이 이 공격에도(간접 명중). 원거리 병종도 근접 패널티를 받는다.
+ /// 밀린 같은 편 유닛 a 가 상대 d 와 부딪힌 순간(PD 2026-11-18 알까기): 피해·반격 즉시 교환(장합 교변 · 자기 밀림 배율 · 민 유닛의 간접 명중 상태 = 예전 밀린 공격과 같음)
+ /// → 알까기 튕김(d 밀림 + a 튕김 + 연쇄 · Bounce). 행동 유닛의 경로(o.Path)를 더럽히지 않게 따로 받은 결과를 합친다(a 의 이동 = Displaced).
///
- IEnumerator PushedAttack(Unit a, Unit d, ActionOutcome o, Unit pusher = null)
+ IEnumerator PushedImpact(Unit a, Unit d, Vector2 inDir, float power, ActionOutcome o, Unit pusher)
{
+ Face(a, d.Position - a.Position);
if (a.View != null) a.View.PlayAttack();
- yield return Fx.Lunge(a, d.Position);
-
float scale = SkillMods.Product(a, SkillKeys.SelfPushedMult, true);
- if (pusher != null && pusher != a && pusher.Faction == a.Faction && a.Atk > 0)
+ if (pusher != null && pusher != a && a.Atk > 0)
{
float add = SkillMods.Sum(pusher, SkillKeys.PushedAllyAtkAdd, true);
if (add > 0f) scale *= 1f + add * SkillSystem.AtkOf(pusher) / Mathf.Max(1f, SkillSystem.AtkOf(a));
}
- int dmg = SkillSystem.Deal(d, Combat.Damage(cfg, a, d, false, rng, true, scale), a, HitKind.Attack);
+ int raw = Combat.Damage(cfg, a, d, false, rng, true, scale);
+ bool crit = Combat.LastCrit;
+ int dmg = SkillSystem.Deal(d, raw, a, HitKind.Attack);
var sys = SkillSystem.Current;
- if (sys != null && pusher != null && pusher != a && pusher.Faction == a.Faction) sys.ApplyHitStatuses(pusher, d, false, HitKind.Indirect);
- Fx.Popup(d.Position, dmg.ToString(), Color.white);
- battle.NotifyChanged();
- yield return Fx.Wait(0.2f);
-
+ if (sys != null && pusher != null && pusher != a) sys.ApplyHitStatuses(pusher, d, false, HitKind.Indirect);
+ // 행동 유닛 자신의 공격 집계(o.Attacked · DamageDealt)에는 넣지 않는다 — 예전 밀린 공격과 같음(기록 = Notes)
+ Fx.Popup(d.Position, crit ? dmg + "!" : dmg.ToString(), crit ? new Color(1f, 0.7f, 0.2f) : Color.white);
int counter = 0;
if (d.IsAlive && a.IsAlive)
{
- counter = Combat.CounterDamage(cfg, d, a, rng, false);
+ counter = Combat.CounterDamage(cfg, d, a, rng, true);
if (counter > 0)
{
if (d.View != null) d.View.PlayAttack();
- yield return Fx.Lunge(d, a.Position);
counter = SkillSystem.Deal(a, counter, d, HitKind.Counter);
Fx.Popup(a.Position, counter.ToString(), new Color(1f, 0.45f, 0.45f));
- battle.NotifyChanged();
- yield return Fx.Wait(0.2f);
}
}
-
- o.Notes.Add("밀린 " + a.DisplayName + " → " + d.DisplayName + " 공격 " + dmg + (counter > 0 ? " · 반격 " + counter : ""));
+ battle.NotifyChanged();
+ o.Notes.Add("밀린 " + a.DisplayName + " → " + d.DisplayName + " 충돌 " + dmg + (counter > 0 ? " · 반격 " + counter : ""));
+ if (!a.IsAlive) yield break;
+ Vector2 n = d.Position - a.Position;
+ n = n.sqrMagnitude > 1e-6f ? n.normalized : inDir;
+ var side = new ActionOutcome();
+ Vector2 from = a.Position;
+ yield return Bounce(a, d, n, power, side, dmg, Mathf.Max(0, cfg.bounceChainMax), inDir);
+ o.Pushed.AddRange(side.Pushed);
+ o.Displaced.AddRange(side.Displaced);
+ o.Notes.AddRange(side.Notes);
+ if (a.IsAlive && (a.Position - from).sqrMagnitude > 1e-6f) o.Displaced.Add(new Displacement { Unit = a, From = from, To = a.Position });
}
}
}
diff --git a/Assets/Scripts/Runtime/BattleHUD.cs b/Assets/Scripts/Runtime/BattleHUD.cs
index 4737f8da..add103e9 100644
--- a/Assets/Scripts/Runtime/BattleHUD.cs
+++ b/Assets/Scripts/Runtime/BattleHUD.cs
@@ -567,8 +567,9 @@ namespace TKS
void Refresh()
{
var stage = battle.Stage;
- stageText.text = stage.chapter > 0
+ stageText.text = stage.chapter > 0 && battle.Mode == null // 연의 서장(출정 판 정의 사본)은 출정 번호를 붙이지 않음(2026-11-18 PD 「연의 전기와 출정은 별개」)
? stage.chapter + "-" + stage.stage + " · " + stage.title
+ : battle.Mode != null ? stage.title
: "제" + (battle.StageIndex + 1) + "전투 · " + stage.title + (string.IsNullOrEmpty(stage.subtitle) ? "" : " " + stage.subtitle);
var mr = battle.Mode != null ? battle.Mode.rules : null; // 컨텐츠 모드 진행 줄(부순 수 · 과제 · 판정 · 2026-11-17 더미 표시)
string progress = mr != null ? mr.ProgressLine : "";
diff --git a/Assets/Scripts/Runtime/BattleManager.cs b/Assets/Scripts/Runtime/BattleManager.cs
index 7693249c..d2016241 100644
--- a/Assets/Scripts/Runtime/BattleManager.cs
+++ b/Assets/Scripts/Runtime/BattleManager.cs
@@ -113,7 +113,7 @@ namespace TKS
/// 이 전투의 턴 제한(0 = 없음) = 연무장 maxTurns 또는 학습 판 n_turn_limit — 그 턴의 적 턴까지 못 끝내면 패배.
public int TurnLimit
{
- get { return Mode != null ? Mode.maxTurns : Tutorial != null ? Tutorial.TurnLimit : 0; }
+ get { return Mode != null && Mode.maxTurns > 0 ? Mode.maxTurns : Tutorial != null ? Tutorial.TurnLimit : 0; }
}
/// 진영 상시 효과 공급자(보물 crit·range·splash → SkillMods · 아웃게임이 연결) · 전투 시작마다 읽어 둔다.
@@ -255,7 +255,12 @@ namespace TKS
StopAllCoroutines();
BossIntro.Abort();
ScenarioEvent.Abort();
- if (Board != null) Board.ClearEventArt();
+ if (Board != null)
+ {
+ Board.ClearEventArt();
+ Board.SetThemeArt(stage.bgTheme); // 판 배경 테마(그림이 있으면 · 없으면 기본 배경)
+ }
+ ScenarioProps.Clear(); // 앞 판 소품(시나리오 꾸밈) — 이 판 것은 유닛 배치 뒤 Apply
ClearUnits();
Phase = BattlePhase.Setup;
sideEffects[0] = SideEffectsProvider != null ? SideEffectsProvider(Faction.Player) : null;
@@ -266,7 +271,9 @@ namespace TKS
SkillCatalog.Invalidate(); // 임포트로 바뀐 스킬 표를 전투마다 다시 읽음
SkillVfx.Reload(); // 스킬 이펙트 표(skill_vfx.csv)도 전투마다 다시 읽음
HitFeel.Reload(); // 타격감 표(hit_feel.csv)
- Tutorial = Mode == null ? TutorialRules.For(stage) : null; // 1장 학습 판(메모리 세이브 = 자동 테스트·검증 캡처에서는 꺼짐 · TutorialRules.Mode)
+ bool tutorialMode = Mode != null && Mode.rules != null && Mode.rules.UsesTutorialPlan; // 연의 전기 서장 = 학습 판 지도를 빌려 씀(2026-11-18)
+ TutorialRules.ForceFirstPlay = tutorialMode; // 서장 = 안내를 매번(출정 클리어 기록과 무관)
+ Tutorial = Mode == null || tutorialMode ? TutorialRules.For(stage) : null; // 1장 학습 판(메모리 세이브 = 자동 테스트·검증 캡처에서는 꺼짐 · TutorialRules.Mode)
var lineup = LineupProvider != null ? LineupProvider() : null;
if (Tutorial != null) lineup = Tutorial.Lineup(Config, lineup); // 고정 편성 판 = 그 영웅들(보유 여부와 무관)
var rules = Mode != null ? Mode.rules : null;
@@ -325,6 +332,7 @@ namespace TKS
rules.OnBegin(); // 배치 표의 기믹 · 허수아비 · 군량고(컨텐츠 모드 · 2026-11-17)
GimmickLayer.Current.ResolveOverlaps();
}
+ ScenarioProps.Apply(this, stage); // 시나리오 꾸밈(바닥 · 소품 · scenario_props.csv)
TutorialDirector.Ensure(this).BeginStage(Tutorial); // 학습 판 안내 · 남은 턴 · 함정 표시(유닛·기믹 배치 뒤 · 일반 판 = 비움)
TurnNumber = 1;
@@ -335,7 +343,7 @@ namespace TKS
if (tip.Length > 0) LastMessage += " · " + tip; // 1장 튜토리얼 문구(tutorial_tips.csv · PD #1098 §3)
if (StageStarted != null) StageStarted();
// 보스 등장 연출(2026-11-12 시나리오 이벤트 C2 · boss_intro.csv) — 연출 동안 Setup(아군 조작 잠금) → 끝나면 아군 차례 · 연무장(Mode) 전투 제외
- bool cleared = StageClearedProvider != null && StageClearedProvider(stage.chapter, stage.stage);
+ bool cleared = Mode == null && StageClearedProvider != null && StageClearedProvider(stage.chapter, stage.stage); // 연무장 · 연의 전투 = 출정 클리어 기록과 무관
// 시나리오 이벤트(2026-11-18 · scenario_event.csv stage_start) — 처음 할 때만 · 끝나면 보스 등장 → 첫 턴(연출 동안 Setup = 조작·학습 안내 대기)
if (ScenarioEvent.Wants(this, stage, "stage_start", cleared)) ScenarioEvent.Begin(this, stage, "stage_start", () => FirstTurn(stage, cleared, rules));
else FirstTurn(stage, cleared, rules);
@@ -357,13 +365,26 @@ namespace TKS
void ClearStage()
{
var stage = Stage;
- bool cleared = StageClearedProvider != null && StageClearedProvider(stage.chapter, stage.stage);
+ bool cleared = Mode == null && StageClearedProvider != null && StageClearedProvider(stage.chapter, stage.stage);
+ System.Action finish = () =>
+ {
+ if (Mode != null && Mode.rules != null && Mode.rules.NextActOnWin()) return; // 연의 서장 = 다음 막으로(결과 화면 없음)
+ SetPhase(BattlePhase.StageClear);
+ };
if (ScenarioEvent.Wants(this, stage, "win", cleared))
{
SetPhase(BattlePhase.Setup);
- ScenarioEvent.Begin(this, stage, "win", () => SetPhase(BattlePhase.StageClear));
+ ScenarioEvent.Begin(this, stage, "win", finish);
}
- else SetPhase(BattlePhase.StageClear);
+ else finish();
+ }
+
+ /// 같은 모드 전투의 다음 막 판(연의 전기 서장) — 모드 · 규칙은 그대로 · 판만 새로 놓는다.
+ public void BeginActStage(BalanceConfig.StageDef s)
+ {
+ if (Mode == null || s == null) return;
+ Mode.stage = s;
+ Begin(s);
}
/// 선제 판의 첫 적 턴(턴 수 · 제한 턴을 세지 않는다).
@@ -381,6 +402,8 @@ namespace TKS
StopAllCoroutines();
BossIntro.Abort();
ScenarioEvent.Abort();
+ ScenarioProps.Clear();
+ if (Board != null) Board.ClearEventArt();
ClearUnits();
SetPhase(BattlePhase.Setup);
}
diff --git a/Assets/Scripts/Runtime/Board.cs b/Assets/Scripts/Runtime/Board.cs
index b93264f9..d7596df0 100644
--- a/Assets/Scripts/Runtime/Board.cs
+++ b/Assets/Scripts/Runtime/Board.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
using UnityEngine;
namespace TKS
@@ -32,6 +33,8 @@ namespace TKS
// 원화 세션 납품 배경(5:8 · 위 = 적 진영) — 전장 크기에 맞춰 늘린다 · 격자·진영 띠는 그리지 않음
var bg = ProceduralSprites.NewSprite(transform, "Background", art, Color.white, 1f, -20);
bg.transform.localScale = new Vector3(w / art.bounds.size.x, h / art.bounds.size.y, 1f);
+ background = bg;
+ defaultArt = art;
}
else
{
@@ -79,6 +82,63 @@ namespace TKS
MakeWall("WallRight", new Vector2(w * 0.5f + wallT * 0.5f, 0f), new Vector2(wallT, h));
}
+ SpriteRenderer background;
+ Sprite defaultArt;
+ static Dictionary themeOf, fileOf;
+
+ ///
+ /// 판 배경 = 스테이지 bg_theme → 테마(T01~T19 · bg_theme_map.csv) → 그림 이름(bg_theme_files.csv) → Resources/Board/<이름>.
+ /// 그림이 아직 없으면(디자인 PC 납품 전) 기본 배경(battlefield_01) 그대로 — 그림 파일만 넣으면 코드 수정 없이 바뀐다.
+ /// 표 SOT = 기획 tables/bg_theme_map.csv · stage_terrain_art.csv(bg · bg_edit · share 행) → 사본 Resources/Board/(2026-11-18 PD 「배경이 시나리오 상황과 맞지 않아 · 다른 로컬 PC 배경 작업 반영」).
+ /// 반환 = 바꾼 그림 이름(없으면 "").
+ ///
+ public string SetThemeArt(string bgTheme)
+ {
+ if (background == null || defaultArt == null) return "";
+ LoadThemeTables();
+ string theme, file;
+ Sprite art = null;
+ if (!string.IsNullOrEmpty(bgTheme) && themeOf.TryGetValue(bgTheme, out theme) && fileOf.TryGetValue(theme, out file))
+ art = Resources.Load("Board/" + file);
+ if (art == null) art = defaultArt;
+ if (background.sprite != art)
+ {
+ background.sprite = art;
+ background.transform.localScale = new Vector3(Size.x / art.bounds.size.x, Size.y / art.bounds.size.y, 1f);
+ }
+ return art == defaultArt ? "" : art.name;
+ }
+
+ [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+ static void ResetStatics()
+ {
+ themeOf = null;
+ fileOf = null;
+ }
+
+ static void LoadThemeTables()
+ {
+ if (themeOf != null) return;
+ themeOf = new Dictionary();
+ fileOf = new Dictionary();
+ var errors = new List();
+ var a = Resources.Load("Board/bg_theme_map");
+ if (a != null)
+ foreach (var r in StageTable.ReadCsv(a.text, "bg_theme_map.csv", errors))
+ themeOf[Get(r, "s_bg_theme")] = Get(r, "s_theme_id");
+ var b = Resources.Load("Board/bg_theme_files");
+ if (b != null)
+ foreach (var r in StageTable.ReadCsv(b.text, "bg_theme_files.csv", errors))
+ fileOf[Get(r, "s_theme_id")] = Get(r, "s_file");
+ foreach (var e in errors) Debug.LogError("[TKS] 배경 테마 표 " + e);
+ }
+
+ static string Get(Dictionary r, string k)
+ {
+ string v;
+ return r.TryGetValue(k, out v) ? v : "";
+ }
+
SpriteRenderer eventArt;
///
diff --git a/Assets/Scripts/Runtime/ContentModes/ModeBattleRules.cs b/Assets/Scripts/Runtime/ContentModes/ModeBattleRules.cs
index e15cf15e..1d9d718e 100644
--- a/Assets/Scripts/Runtime/ContentModes/ModeBattleRules.cs
+++ b/Assets/Scripts/Runtime/ContentModes/ModeBattleRules.cs
@@ -158,6 +158,30 @@ namespace TKS
get { return true; }
}
+ /// 학습 판 계획(TutorialRules · 배치 표 · 안내)을 이 모드 전투에도 쓰는가 — 연의 전기 서장(2026-11-18 PD 「연의 전기와 출정은 별개」).
+ public virtual bool UsesTutorialPlan
+ {
+ get { return false; }
+ }
+
+ /// 승리 뒤 다음 막으로 이어 가면 true(다음 막 시작은 규칙이 한다 · 결과 화면 없음) — 연의 전기 서장 3막.
+ public virtual bool NextActOnWin()
+ {
+ return false;
+ }
+
+ /// 시나리오 연출 · 판 꾸밈 표의 열쇠 = 연의 편 id(scenario_event · scenario_props 의 s_battle_id) — null = 이 모드는 시나리오 표를 쓰지 않음.
+ public virtual string ScenarioBattleId
+ {
+ get { return null; }
+ }
+
+ /// 시나리오 표 열쇠의 막 번호(표 n_stage).
+ public virtual int ScenarioAct
+ {
+ get { return 1; }
+ }
+
/// 액티브 스킬이 발동했을 때.
public virtual void OnActiveUsed(Unit u)
{
diff --git a/Assets/Scripts/Runtime/ContentModes/PrologueBattle.cs b/Assets/Scripts/Runtime/ContentModes/PrologueBattle.cs
new file mode 100644
index 00000000..5a52f0e9
--- /dev/null
+++ b/Assets/Scripts/Runtime/ContentModes/PrologueBattle.cs
@@ -0,0 +1,74 @@
+using System.Collections;
+using UnityEngine;
+
+namespace TKS
+{
+ ///
+ /// 연의 전기 서장(편 n_no 0 · 도원결의) = 연의 모드 전투 n_acts 막(2026-11-18 PD 「연의 전기 스테이지와 일반 출정 스테이지는 별개 — 완전히 별개의 스테이지 개념으로」).
+ /// 지도(배치 · 기믹 · 학습 안내) = 출정 n_spec_chapter 장 학습 판 1 ~ n_acts 의 표를 빌려 씀(UsesTutorialPlan) — 진행 기록 · 보상 = 연의 세이브(ScenarioModeRules.Result) ·
+ /// 시나리오 연출 · 판 꾸밈 = s_battle_id + 막(출정 판에는 붙지 않음) · 막 승리 → 승리 연출 → 다음 막(결과 화면 없음) → 마지막 막 승리 = 결과.
+ /// 학습 안내는 서장에서 매번 보인다(TutorialRules.ForceFirstPlay · 출정 클리어 기록과 무관).
+ ///
+ public class PrologueRules : ModeBattleRules
+ {
+ public string BattleId = "";
+ public string TitleKo = "";
+ public int Chapter = 1;
+ public int Act = 1;
+ public int Acts = 1;
+
+ public override bool UsesTutorialPlan
+ {
+ get { return true; }
+ }
+
+ public override string ScenarioBattleId
+ {
+ get { return BattleId; }
+ }
+
+ public override int ScenarioAct
+ {
+ get { return Act; }
+ }
+
+ /// 막 a 의 판 정의 = 출정 (chapter, a) 정의의 사본(연출·기믹·배치 표 열쇠는 그대로 · 제목만 연의) — 없으면 null.
+ public BalanceConfig.StageDef MakeStage(BalanceConfig cfg, int a)
+ {
+ if (cfg == null || cfg.stages == null) return null;
+ foreach (var s in cfg.stages)
+ {
+ if (s.chapter != Chapter || s.stage != a) continue;
+ var c = JsonUtility.FromJson(JsonUtility.ToJson(s));
+ c.title = TitleKo + " " + a + "/" + Acts + "막";
+ c.subtitle = "연의 전기";
+ c.bgTheme = ""; // 바닥 = 판 꾸밈 표(scenario_props `_bg`) — 출정 배경 테마와 연동하지 않음
+ return c;
+ }
+ return null;
+ }
+
+ public override void OnBegin()
+ {
+ ScenarioEvent.FaceFrontAll(Battle);
+ }
+
+ public override bool NextActOnWin()
+ {
+ if (Act >= Acts || Battle == null) return false;
+ var s = MakeStage(Battle.Config, Act + 1);
+ if (s == null) return false;
+ Act++;
+ Battle.StartCoroutine(Next(s));
+ return true;
+ }
+
+ IEnumerator Next(BalanceConfig.StageDef s)
+ {
+ Battle.ForcePhase(BattlePhase.Setup);
+ float wait = ScenarioData.EvCfg("act_transition_sec");
+ for (float t = 0f; t < wait; t += Time.unscaledDeltaTime) yield return null;
+ Battle.BeginActStage(s);
+ }
+ }
+}
diff --git a/Assets/Scripts/Runtime/ContentModes/PrologueBattle.cs.meta b/Assets/Scripts/Runtime/ContentModes/PrologueBattle.cs.meta
new file mode 100644
index 00000000..74ab1780
--- /dev/null
+++ b/Assets/Scripts/Runtime/ContentModes/PrologueBattle.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b5e3ddfc173a42240a500dffe7dee77f
\ No newline at end of file
diff --git a/Assets/Scripts/Runtime/ContentModes/ScenarioBattle.cs b/Assets/Scripts/Runtime/ContentModes/ScenarioBattle.cs
index 24238fac..14c5d729 100644
--- a/Assets/Scripts/Runtime/ContentModes/ScenarioBattle.cs
+++ b/Assets/Scripts/Runtime/ContentModes/ScenarioBattle.cs
@@ -214,11 +214,23 @@ namespace TKS
get { return false; }
}
+ /// 시나리오 연출 · 판 꾸밈 표 열쇠 = 편 id · 지금 막(연의 편 1~15 · 2026-11-18).
+ public override string ScenarioBattleId
+ {
+ get { return BattleId; }
+ }
+
+ public override int ScenarioAct
+ {
+ get { return act; }
+ }
+
public override void OnBegin()
{
BindAct();
foreach (var r in layout)
if (r.side == "npc") SpawnNpc(r);
+ ScenarioEvent.FaceFrontAll(Battle); // 연의 전기 = 유닛 기본 방향 아래 좌·우(뒷모습만 보이지 않게 · 2026-11-18 PD)
var inv = Rule("invincible");
if (inv != null && Targets(inv).Count > 0) // 빈 대상 보호(Fable QA 13)
foreach (var u in TagUnits(Targets(inv)[0])) u.MinHp = 1;
diff --git a/Assets/Scripts/Runtime/Scenario/ScenarioData.cs b/Assets/Scripts/Runtime/Scenario/ScenarioData.cs
index 47a1587d..a6f2425a 100644
--- a/Assets/Scripts/Runtime/Scenario/ScenarioData.cs
+++ b/Assets/Scripts/Runtime/Scenario/ScenarioData.cs
@@ -315,15 +315,20 @@ namespace TKS
}
}
- /// 그 판 · 그 발동의 이벤트 묶음(s_event_id 별 · n_order 순). turn_start 는 n_turn 이 같은 것만.
- public static List> Events(int chapter, int stage, string trigger, int turn)
+ ///
+ /// 그 판 · 그 발동의 이벤트 묶음(s_event_id 별 · n_order 순). turn_start 는 n_turn 이 같은 것만.
+ /// 열쇠(2026-11-18 PD 「연의 전기와 출정은 별개」): battleId 있음 = 연의 편 → s_battle_id 같고 n_stage = 막 · battleId 빈칸 = 출정 판 → s_battle_id 빈 줄의 (n_chapter, n_stage).
+ ///
+ public static List> Events(string battleId, int chapter, int stage, string trigger, int turn)
{
Load();
+ battleId = battleId ?? "";
var outList = new List>();
List cur = null;
foreach (var e in events)
{
- if (e.chapter != chapter || e.stage != stage || e.trigger != trigger) continue;
+ if (e.trigger != trigger || e.battle != battleId) continue;
+ if (battleId.Length > 0 ? e.stage != stage : (e.chapter != chapter || e.stage != stage)) continue;
if (trigger == "turn_start" && e.turn != turn) continue;
if (cur == null || cur[0].id != e.id)
{
diff --git a/Assets/Scripts/Runtime/Scenario/ScenarioEvent.cs b/Assets/Scripts/Runtime/Scenario/ScenarioEvent.cs
index 011fd5f3..1f41bf76 100644
--- a/Assets/Scripts/Runtime/Scenario/ScenarioEvent.cs
+++ b/Assets/Scripts/Runtime/Scenario/ScenarioEvent.cs
@@ -70,15 +70,23 @@ namespace TKS
get { return unit != null ? (unit.View != null ? unit.View.gameObject : unit.gameObject) : extra; }
}
+ /// 연출 안 방향 = 앞모습(아래 좌·우)만 — 가로 성분으로 좌우만 바꾼다(위로 걸어도 뒷모습으로 돌지 않음 · 뒷모습 = face 명령 back · 2026-11-18 PD).
public void Face(Vector2 dir)
{
if (unit != null)
{
- if (unit.View != null) unit.View.SetFacing(dir);
+ if (unit.View != null) unit.View.SetFacing(new Vector2(Mathf.Abs(dir.x) > 0.01f ? Mathf.Sign(dir.x) : 0f, -1f));
return;
}
if (anim != null && Mathf.Abs(dir.x) > 0.01f) anim.Renderer.flipX = dir.x < 0f;
}
+
+ /// 뒷모습(위 좌·우) — face 명령 s_arg back · back_left · back_right 만.
+ public void FaceBack(float x)
+ {
+ if (unit != null && unit.View != null) unit.View.SetFacing(new Vector2(x, 1f));
+ else if (anim != null && Mathf.Abs(x) > 0.01f) anim.Renderer.flipX = x < 0f;
+ }
}
BattleManager battle;
@@ -150,12 +158,35 @@ namespace TKS
replayStage = stage;
}
+ /// 시나리오 표 열쇠 — 연의 모드 전투 = (편 id, 막) · 출정 = ("", 장, 판) · 그 밖 모드 = null(표 안 씀).
+ public static bool KeyOf(BattleManager bm, BalanceConfig.StageDef stage, out string battleId, out int chapter, out int st)
+ {
+ battleId = "";
+ chapter = stage != null ? stage.chapter : 0;
+ st = stage != null ? stage.stage : 0;
+ if (bm == null || stage == null) return false;
+ if (bm.Mode == null) return true;
+ var r = bm.Mode.rules;
+ if (r == null || string.IsNullOrEmpty(r.ScenarioBattleId)) return false;
+ battleId = r.ScenarioBattleId;
+ st = r.ScenarioAct;
+ return true;
+ }
+
+ static List> GroupsFor(BattleManager bm, BalanceConfig.StageDef stage, string trigger, int turn)
+ {
+ string bid;
+ int ch, st;
+ if (!KeyOf(bm, stage, out bid, out ch, out st)) return new List>();
+ return ScenarioData.Events(bid, ch, st, trigger, turn);
+ }
+
public static bool Wants(BattleManager bm, BalanceConfig.StageDef stage, string trigger, bool cleared, int turn = 0)
{
if (stage != null && trigger == "stage_start" && (stage.chapter != replayChapter || stage.stage != replayStage)) replayChapter = replayStage = 0;
if (cleared && stage != null && stage.chapter == replayChapter && stage.stage == replayStage) cleared = false;
- if (!Enabled || Sim.Active || bm == null || stage == null || bm.Mode != null || cleared) return false;
- var g = ScenarioData.Events(stage.chapter, stage.stage, trigger, turn);
+ if (!Enabled || Sim.Active || bm == null || stage == null || cleared) return false;
+ var g = GroupsFor(bm, stage, trigger, turn);
if (g.Count == 0) return false;
foreach (var list in g)
foreach (var e in list)
@@ -180,11 +211,66 @@ namespace TKS
ev.stage = stage;
ev.trigger = trigger;
ev.onDone = onDone;
- ev.groups = ScenarioData.Events(stage.chapter, stage.stage, trigger, turn);
+ ev.groups = GroupsFor(bm, stage, trigger, turn);
ev.Build();
ev.StartCoroutine(ev.Run());
}
+ ///
+ /// 연의 전기 유닛 기본 방향 = 앞모습(아래)으로 판 가운데 쪽을 봄(가운데 왼쪽 = 오른쪽 아래 · 오른쪽 = 왼쪽 아래)
+ /// — 2026-11-18 PD 「연의 전기에서 유닛의 기본 방향은 좌/또는 우측 아래(윗 방향이면 뒷모습만 보여) · 뒷모습이 필요할 때만 위」.
+ /// 시나리오 이벤트 시작 · 연의 전기 전투 시작(ScenarioRules.OnBegin)에 부른다. 전투 중 이동 방향 규칙(PD #1082)은 그대로.
+ ///
+ public static void FaceFrontAll(BattleManager bm)
+ {
+ if (bm == null || Sim.Active) return;
+ foreach (var f in new[] { Faction.Player, Faction.Enemy })
+ foreach (var u in bm.AliveUnits(f))
+ {
+ if (u.View == null) continue;
+ // 가장 가까운 상대편 쪽(가로) — 없으면 판 가운데 쪽 · 2026-11-18 PD 「장비가 적들을 바라보지 않고 엉뚱한 방향」
+ Unit near = null;
+ float best = float.MaxValue;
+ foreach (var o in bm.AliveUnits(f == Faction.Player ? Faction.Enemy : Faction.Player))
+ {
+ float dd = (o.Position - u.Position).sqrMagnitude;
+ if (dd < best) { best = dd; near = o; }
+ }
+ float dx = near != null ? near.Position.x - u.Position.x : -u.Position.x;
+ u.View.SetFacing(new Vector2(Mathf.Abs(dx) > 0.05f ? Mathf.Sign(dx) : (u.View.FacingLeft ? -1f : 1f), -1f));
+ }
+ }
+
+ Actor lastSpeaker;
+
+ /// 말할 때 = 화자와 앞 화자가 서로 마주 봄(앞모습 · 가로만) · 앞 화자가 없으면 가장 가까운 상대편 쪽.
+ void FaceTalk(Actor a)
+ {
+ if (a == null) return;
+ var other = lastSpeaker != null && lastSpeaker != a && lastSpeaker.Visual != null && lastSpeaker.Visual.activeInHierarchy ? lastSpeaker : null;
+ if (other != null)
+ {
+ float dx = other.Pos.x - a.Pos.x;
+ if (Mathf.Abs(dx) > 0.05f)
+ {
+ a.Face(new Vector2(dx, 0f));
+ other.Face(new Vector2(-dx, 0f));
+ }
+ }
+ else if (a.unit != null)
+ {
+ Unit near = null;
+ float best = float.MaxValue;
+ foreach (var o in battle.AliveUnits(a.unit.Faction == Faction.Player ? Faction.Enemy : Faction.Player))
+ {
+ float dd = (o.Position - a.Pos).sqrMagnitude;
+ if (dd < best) { best = dd; near = o; }
+ }
+ if (near != null && Mathf.Abs(near.Position.x - a.Pos.x) > 0.05f) a.Face(new Vector2(near.Position.x - a.Pos.x, 0f));
+ }
+ lastSpeaker = a;
+ }
+
/// 지금 실행 중인 줄(테스트·캡처 확인용 · 끝나면 int.MaxValue).
public static string CurrentId = "";
public static int CurrentOrder;
@@ -267,6 +353,7 @@ namespace TKS
HideHud(true);
foreach (var u in battle.AliveUnits(Faction.Player)) startPos[u] = u.Position;
foreach (var u in battle.AliveUnits(Faction.Enemy)) startPos[u] = u.Position;
+ FaceFrontAll(battle);
StartCoroutine(SkipButtonLater());
foreach (var list in groups)
foreach (var e in list)
@@ -303,7 +390,9 @@ namespace TKS
{
case "fade": yield return Fade(e.arg == "out", Sec(e, "fade_sec")); break;
case "caption": yield return Caption(e.text, Sec(e, "caption_sec")); break;
- case "bg": if (battle.Board != null) battle.Board.SetEventArt(e.arg); break;
+ case "bg":
+ if (battle.Board != null && battle.Board.SetEventArt(e.arg) && e.arg != ScenarioProps.StageBg) ScenarioProps.Clear(); // 다른 장소로 바뀜 = 이 판 소품 치움(3막 → 복숭아 동산)
+ break;
case "hide": yield return Show(Get(e.actor), false, e, Sec(e, "show_sec")); break;
case "show": yield return Show(Get(e.actor), true, e, Sec(e, "show_sec")); break;
case "extra": MakeExtra(e); break;
@@ -311,12 +400,16 @@ namespace TKS
case "face":
{
var a = Get(e.actor);
- if (a != null) a.Face(new Vector2(e.arg == "left" ? -1f : 1f, 0f));
+ if (a == null) break;
+ bool left = e.arg == "left" || e.arg == "back_left";
+ if (e.arg == "back" || e.arg == "back_left" || e.arg == "back_right") a.FaceBack(e.arg == "back" ? 0f : (left ? -1f : 1f));
+ else a.Face(new Vector2(left ? -1f : 1f, 0f));
break;
}
case "say":
{
var a = Get(e.actor);
+ FaceTalk(a);
if (a != null && !skip) yield return Say(fx, root, cc.Cam, () => a.Head, a.name, a.tag, e.text, st);
break;
}
diff --git a/Assets/Scripts/Runtime/Scenario/ScenarioProps.cs b/Assets/Scripts/Runtime/Scenario/ScenarioProps.cs
new file mode 100644
index 00000000..89ad0df9
--- /dev/null
+++ b/Assets/Scripts/Runtime/Scenario/ScenarioProps.cs
@@ -0,0 +1,258 @@
+using System.Collections.Generic;
+using System.Globalization;
+using UnityEngine;
+
+namespace TKS
+{
+ ///
+ /// 시나리오 판 꾸밈(2026-11-18 PD 「연의 전기 1 은 주점 내부처럼 꾸미고 술 테이블(맵 지형 오브젝트) 같은 것을 배치한 상태에서 진행 · 시나리오 상황에 맞는 연출 · 배경 · 소품 구성」).
+ /// 표 = Resources/Scenario/scenario_props.csv(SOT = 기획 tables/ · utf-8-sig): s_battle_id,n_chapter,n_stage,s_prop_id,s_art,f_x,f_y,f_w,b_block,f_block_r,Memo
+ /// · s_battle_id 있음 = 연의 편(n_stage = 막) · 빈칸 = 출정 판(n_chapter, n_stage)
+ /// · s_prop_id `_bg` = 그 판 바닥 그림(Resources/Board/<s_art> · 연출 bg 명령 없이도 전투 내내) · 그 밖 = 소품 그림(Resources/Scenario/Props/<s_art>) 을 (f_x, f_y) 에 폭 f_w(칸)로 ·
+ /// b_block 1 = 반지름 f_block_r 의 벽(BoardWall · 유닛이 부딪혀 튕김 · 적 AI 예측도 같은 판정).
+ /// 전투 시작(BattleManager.Begin)마다 앞 판 소품을 치우고 새로 놓는다 · 연무장(Mode) 전투 제외 · 값은 모두 표(C45).
+ ///
+ public static class ScenarioProps
+ {
+ public class Row
+ {
+ public int chapter, stage;
+ public string battle, id, art;
+ public float x, y, w, blockR;
+ public bool block;
+ }
+
+ static List rows;
+ static GameObject rootGo;
+
+ public static readonly List Errors = new List();
+
+ [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+ static void ResetStatics()
+ {
+ rows = null;
+ rootGo = null;
+ StageBg = "";
+ }
+
+ static void Load()
+ {
+ if (rows != null) return;
+ rows = new List();
+ Errors.Clear();
+ var ta = Resources.Load(ScenarioData.Root + "scenario_props");
+ if (ta == null) return;
+ foreach (var r in StageTable.ReadCsv(ta.text, "scenario_props.csv", Errors))
+ {
+ var row = new Row
+ {
+ battle = S(r, "s_battle_id"),
+ chapter = I(r, "n_chapter"),
+ stage = I(r, "n_stage"),
+ id = S(r, "s_prop_id"),
+ art = S(r, "s_art"),
+ x = F(r, "f_x"),
+ y = F(r, "f_y"),
+ w = F(r, "f_w"),
+ block = I(r, "b_block") == 1,
+ blockR = F(r, "f_block_r"),
+ };
+ if (row.art.Length == 0) Errors.Add("scenario_props.csv 행 " + S(r, "#") + ": s_art 빈칸");
+ rows.Add(row);
+ }
+ foreach (var e in Errors) Debug.LogError("[TKS] 시나리오 소품 표 " + e);
+ }
+
+ public static IList All
+ {
+ get
+ {
+ Load();
+ return rows;
+ }
+ }
+
+ static string S(Dictionary r, string k)
+ {
+ string v;
+ return r.TryGetValue(k, out v) ? v : "";
+ }
+
+ static int I(Dictionary r, string k)
+ {
+ int v;
+ return int.TryParse(S(r, k), NumberStyles.Integer, CultureInfo.InvariantCulture, out v) ? v : 0;
+ }
+
+ static float F(Dictionary r, string k)
+ {
+ float v;
+ return float.TryParse(S(r, k), NumberStyles.Float, CultureInfo.InvariantCulture, out v) ? v : 0f;
+ }
+
+ /// 앞 판 소품 치우기 → 이 판 바닥 · 소품 놓기(그림이 없으면 그 줄만 건너뜀 · 경고 1줄).
+ public static void Apply(BattleManager bm, BalanceConfig.StageDef stage)
+ {
+ Clear();
+ // 켜짐 = 시나리오 연출과 같은 규칙(메모리 저장 = 자동 테스트 · 검증 캡처에서는 꺼짐 — 1-1 을 일반 전투로 쓰는 기존 테스트 보호)
+ if (bm == null || stage == null || bm.Board == null || !ScenarioEvent.Enabled) return;
+ string bid;
+ int ch, st;
+ if (!ScenarioEvent.KeyOf(bm, stage, out bid, out ch, out st)) return; // 연의 편 = (편 id, 막) · 출정 = s_battle_id 빈 줄(2026-11-18 PD 「연의 전기와 출정은 별개」)
+ Load();
+ foreach (var r in rows)
+ {
+ if (r.battle != bid) continue;
+ if (bid.Length > 0 ? r.stage != st : (r.chapter != ch || r.stage != st)) continue;
+ if (r.id == "_bg")
+ {
+ bm.Board.SetEventArt(r.art);
+ StageBg = r.art;
+ continue;
+ }
+ var sp = Resources.Load(ScenarioData.Root + "Props/" + r.art);
+ if (sp == null)
+ {
+ Debug.LogWarning("[TKS] 시나리오 소품 그림 없음: Scenario/Props/" + r.art);
+ continue;
+ }
+ if (rootGo == null)
+ {
+ rootGo = new GameObject("ScenarioProps");
+ rootGo.transform.SetParent(bm.Board.transform, false);
+ }
+ var go = new GameObject("Prop_" + r.id);
+ go.transform.SetParent(rootGo.transform, false);
+ go.transform.position = new Vector3(r.x, r.y, 0f);
+ var sr = go.AddComponent();
+ sr.sprite = sp;
+ sr.sortingOrder = -1; // 유닛(0) 아래 · 바닥(−20 · 이벤트 바닥 −19) 위
+ float s = sp.bounds.size.x > 0.001f ? r.w / sp.bounds.size.x : 1f;
+ go.transform.localScale = new Vector3(s, s, 1f);
+ if (r.block && r.blockR > 0.01f)
+ {
+ var col = go.AddComponent();
+ col.radius = r.blockR / s; // 로컬 반지름(그림 배율로 나눔)
+ go.AddComponent();
+ var pb = go.AddComponent();
+ pb.Init(bm, r, sr, Resources.Load(ScenarioData.Root + "Props/" + r.art + "_broken"));
+ }
+ }
+ }
+
+ /// 이 판의 바닥 그림(_bg 행 · 없으면 "") — 연출 bg 명령이 다른 장소로 바꾸면 이 판 소품을 치운다(ScenarioEvent).
+ public static string StageBg = "";
+
+ public static void Clear()
+ {
+ StageBg = "";
+ if (rootGo != null) Object.Destroy(rootGo);
+ rootGo = null;
+ }
+
+ /// 지금 놓인 소품 수(테스트·캡처 확인용).
+ public static int Count
+ {
+ get { return rootGo != null ? rootGo.transform.childCount : 0; }
+ }
+ }
+}
+
+namespace TKS
+{
+ ///
+ /// 막히는 소품 = 유닛이 움직이다 닿으면 부서짐(2026-11-18 PD 「소품은 유닛과 부딪힐 경우 부서지게」).
+ /// 판정 = 전투 행동 중(Resolving · 적 턴)에만 · 이번 프레임에 움직인 유닛이 (유닛 반지름 + 소품 반지름 + prop_break_contact) 안 → 부서짐
+ /// (연출 중 걸음 · 가만히 붙어 선 유닛은 부수지 않음 · 가상 실행 제외). 부서지면 벽을 바로 치우고 「그림_broken」 이 있으면 그 그림으로 남기고 없으면 튀어 오르며 사라진다.
+ /// 값 = scenario_event_config.csv prop_break_*(C45).
+ ///
+ public class PropBody : MonoBehaviour
+ {
+ BattleManager bm;
+ ScenarioProps.Row row;
+ SpriteRenderer sr;
+ Sprite broken;
+ bool done;
+ readonly System.Collections.Generic.Dictionary last = new System.Collections.Generic.Dictionary();
+
+ public bool Broken
+ {
+ get { return done; }
+ }
+
+ public void Init(BattleManager battle, ScenarioProps.Row r, SpriteRenderer renderer, Sprite brokenArt)
+ {
+ bm = battle;
+ row = r;
+ sr = renderer;
+ broken = brokenArt;
+ }
+
+ void Update()
+ {
+ if (done || bm == null || Sim.Active) return;
+ bool acting = bm.Phase == BattlePhase.Resolving || bm.Phase == BattlePhase.EnemyTurn;
+ float contact = ScenarioData.EvCfg("prop_break_contact");
+ Vector2 me = transform.position;
+ foreach (var f in new[] { Faction.Player, Faction.Enemy })
+ foreach (var u in bm.AliveUnits(f))
+ {
+ Vector2 p = u.Position, prev;
+ bool moved = last.TryGetValue(u, out prev) && (p - prev).sqrMagnitude > 0.0001f;
+ last[u] = p;
+ if (acting && moved && Vector2.Distance(p, me) <= u.Radius + row.blockR + contact)
+ {
+ Break();
+ return;
+ }
+ }
+ }
+
+ /// 부숨(테스트도 부른다).
+ public void Break()
+ {
+ if (done) return;
+ done = true;
+ foreach (var c in GetComponents()) Destroy(c);
+ var wall = GetComponent();
+ if (wall != null) Destroy(wall);
+ var cc = FindFirstObjectByType();
+ if (cc != null) cc.Shake(ScenarioData.EvCfg("prop_break_shake_sec"), ScenarioData.EvCfg("prop_break_shake"));
+ StartCoroutine(Pop());
+ }
+
+ System.Collections.IEnumerator Pop()
+ {
+ float dur = Mathf.Max(0.01f, ScenarioData.EvCfg("prop_break_sec"));
+ Vector3 s0 = transform.localScale;
+ float peak = ScenarioData.EvCfg("prop_break_pop");
+ if (broken != null)
+ {
+ // 부서진 그림으로 바꾸고 바닥에 남김(같은 폭)
+ float w0 = sr.bounds.size.x;
+ sr.sprite = broken;
+ float k = broken.bounds.size.x > 0.001f ? w0 / sr.bounds.size.x : 1f;
+ s0 = s0 * k;
+ for (float t = 0f; t < dur; t += Time.deltaTime)
+ {
+ float q = t / dur;
+ transform.localScale = s0 * Mathf.Lerp(peak, 1f, q);
+ yield return null;
+ }
+ transform.localScale = s0;
+ sr.sortingOrder = -2;
+ yield break;
+ }
+ Color c0 = sr.color;
+ for (float t = 0f; t < dur; t += Time.deltaTime)
+ {
+ float q = t / dur;
+ transform.localScale = s0 * Mathf.Lerp(1f, peak, q);
+ transform.localRotation = Quaternion.Euler(0f, 0f, 25f * q);
+ sr.color = new Color(c0.r, c0.g, c0.b, c0.a * (1f - q));
+ yield return null;
+ }
+ gameObject.SetActive(false);
+ }
+ }
+}
diff --git a/Assets/Scripts/Runtime/Scenario/ScenarioProps.cs.meta b/Assets/Scripts/Runtime/Scenario/ScenarioProps.cs.meta
new file mode 100644
index 00000000..06bf9e29
--- /dev/null
+++ b/Assets/Scripts/Runtime/Scenario/ScenarioProps.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 8442e2e1c17a9a042943b016ceb33261
\ No newline at end of file
diff --git a/Assets/Scripts/Runtime/Tutorial/TutorialRules.cs b/Assets/Scripts/Runtime/Tutorial/TutorialRules.cs
index b04c32bc..8e44c544 100644
--- a/Assets/Scripts/Runtime/Tutorial/TutorialRules.cs
+++ b/Assets/Scripts/Runtime/Tutorial/TutorialRules.cs
@@ -25,6 +25,7 @@ namespace TKS
static void ResetStatics()
{
Mode = TutorialMode.Auto;
+ ForceFirstPlay = false;
}
public static bool Enabled
@@ -48,8 +49,12 @@ namespace TKS
}
/// 그 판을 깬 적이 있는가(세이브의 클리어 기록 · 세션이 없으면 false).
+ /// 연의 전기 서장(학습 판 지도를 빌린 모드 전투) = 출정 클리어 기록을 보지 않음 → 안내를 매번(BattleManager.Begin 이 정함 · 2026-11-18).
+ public static bool ForceFirstPlay;
+
public static bool Cleared(int chapter, int stage)
{
+ if (ForceFirstPlay) return false;
var s = Session;
if (s == null || s.Save == null) return false;
var st = s.Save.Stage(chapter, stage, false);
diff --git a/Assets/Tests/PlayMode/BattleFlowTests.cs b/Assets/Tests/PlayMode/BattleFlowTests.cs
index 4e9edefd..46b0d7b2 100644
--- a/Assets/Tests/PlayMode/BattleFlowTests.cs
+++ b/Assets/Tests/PlayMode/BattleFlowTests.cs
@@ -216,7 +216,8 @@ namespace TKS.Tests
public IEnumerator Infantry_PushesAlly_AllyAttacksTouchingEnemy_OncePerPush()
{
yield return Fresh();
- // A(보병) 가 B(아군 창병)를 +x 로 밀어 적에게 붙이면 B 가 공격 · C 가 B 를 다시 밀면 B 가 또 공격 (규칙 ⑤)
+ // A(보병) 가 B(아군 창병)를 +x 로 밀어 적 옆에 붙여도 부딪히지 않았으면 공격 없음 · C 가 B 를 위로 밀어 적과 부딪히게 하면 그 순간 피해 + 튕김
+ // (2026-11-18 PD 「알까기와 동일하게 물리적으로 튕기며 즉시 피해 · 멈춘 뒤 견제처럼 공격 ✕」 — 그 전 규칙 ⑤ = 닿아 있기만 해도 멈춘 뒤 공격)
var a = bm.SpawnUnit(UnitType.Infantry, Faction.Player, new Vector2(-3f, -2f), "보병A");
var b = bm.SpawnUnit(UnitType.Spear, Faction.Player, new Vector2(0f, -2f), "창병B");
float pushX = Impact(3f, 3f - CastContact(a, b)) * cfg.collisionPushRatio * b.PushTaken; // A 는 3 을 쏴 3 − 접촉거리 만큼 가서 닿는다 → 부딪히는 힘 × 밀림 가중치(창병) = B 가 밀리는 거리
@@ -229,19 +230,20 @@ namespace TKS.Tests
Assert.Contains(b, o.Pushed);
Assert.AreEqual(pushX, b.Position.x, 0.1f, "B 가 부딪히는 힘만큼 밀려남");
Assert.LessOrEqual(Gap(b, foe), Combat.ContactTolerance + 0.05f, "밀려서 적과 닿음");
- Assert.Less(foe.Hp, foe.MaxHp, "밀린 아군 B 가 적을 공격");
+ Assert.AreEqual(foe.MaxHp, foe.Hp, "밀린 길에서 적과 부딪히지 않았다 → 공격 없음(닿아 있기만 한 경우)");
Assert.AreEqual(a.MaxHp, a.Hp, "A 는 피해 없음");
Assert.Less(a.Position.x, -pushX - 0.2f, "A 도 반대로 튕김(아군과 부딪혀도 알까기)");
- Assert.IsFalse(b.ActedThisTurn, "B 의 공격은 자기 행동을 소모하지 않음");
- Assert.AreEqual(1, o.Notes.Count);
+ Assert.IsFalse(b.ActedThisTurn, "B 는 행동을 소모하지 않음");
+ Assert.AreEqual(0, o.Notes.Count);
int hp = foe.Hp;
var c = bm.SpawnUnit(UnitType.Infantry, Faction.Player, new Vector2(pushX, -5f), "보병C");
var o2 = new ActionOutcome();
yield return bm.ResolveForTest(c, new Vector2(pushX, -2.2f), false, o2);
Assert.Contains(b, o2.Pushed, "C 가 B 를 다시 밀었다");
- Assert.Less(foe.Hp, hp, "B 가 C 의 기회로 또 공격");
- Assert.AreEqual(0, o2.Attacked.Count);
+ Assert.Less(foe.Hp, hp, "밀린 B 가 적과 부딪힌 순간 피해(즉시)");
+ Assert.AreEqual(0, o2.Attacked.Count, "C 자신의 공격 집계에는 넣지 않음");
+ StringAssert.Contains("충돌", string.Join(" ", o2.Notes.ToArray()), "밀린 아군 충돌 기록");
}
// ---------- 기병 ----------
@@ -766,12 +768,12 @@ namespace TKS.Tests
yield return bm.ResolveForTest(spear, new Vector2(0f, 0f), false, o);
Assert.AreEqual(0, o.Attacked.Count, "아군에 부딪힌 창병 자신은 공격하지 않음");
Assert.Contains(ally, o.Pushed);
- Assert.Greater(ally.Position.y, -2f + plow * 0.5f, "아군을 밀쳐 적진으로(적에 닿을 때까지)");
- Assert.LessOrEqual(Gap(ally, foe), Combat.ContactTolerance + 0.05f, "밀린 아군이 적과 닿음");
+ // 2026-11-18 PD 알까기: 밀린 아군은 적과 부딪히는 순간 피해를 주고 튕겨 나온다(적에 닿은 자리에 멈추지 않음) → 위치 대신 충돌 기록 · 피해로 본다
+ Assert.IsTrue(bm.Resolver.WasPushImpacted(ally), "아군을 밀쳐 적진으로 — 밀리는 길에서 적과 부딪힘(아군 " + ally.Position + ")");
float contactY = -2f - CastContact(spear, ally);
float push = Impact(4f, contactY + 4f); // 부딪히는 힘 = 쏜 4 · 접촉까지 간 거리
Assert.AreEqual(contactY - push * cfg.collisionSelfBounceRatio * UnitHitKeep() * cfg.spearRecoilRatio, spear.Position.y, 0.1f, "창병 반작용 = 부딪히는 힘 × collisionSelfBounceRatio × spearRecoilRatio 만큼 뒤로(PD 2026-11-16 · 보병 튕김의 절반)");
- Assert.Less(foe.Hp, foe.MaxHp, "밀린 아군이 적을 공격(규칙 ⑤)");
+ Assert.Less(foe.Hp, foe.MaxHp, "밀린 아군이 적과 부딪힌 순간 피해(즉시)");
Assert.AreEqual(spear.MaxHp, spear.Hp, "창병은 피해 없음");
Assert.AreEqual(1, o.Notes.Count);
Assert.IsTrue(allyHp >= ally.Hp, "아군은 밀려서 피해를 받지 않는다(근접 공격 반격만 가능)");
diff --git a/Assets/Tests/PlayMode/ScenarioEventTests.cs b/Assets/Tests/PlayMode/ScenarioEventTests.cs
index 641a3bee..ba7a6ab4 100644
--- a/Assets/Tests/PlayMode/ScenarioEventTests.cs
+++ b/Assets/Tests/PlayMode/ScenarioEventTests.cs
@@ -43,6 +43,18 @@ namespace TKS.Tests
yield return null;
}
+ /// 연의 전기 서장(도원결의) n 막을 연의 모드 전투로 시작(2026-11-18 PD 「연의 전기와 출정은 별개」).
+ PrologueRules StartPrologue(int act = 1)
+ {
+ var b = ContentTables.Find("scenario_battles", "s_id", "taoyuan");
+ Assert.IsNotNull(b, "scenario_battles taoyuan");
+ var rules = new PrologueRules { BattleId = "taoyuan", TitleKo = b.S("s_title_ko"), Chapter = b.I("n_spec_chapter"), Acts = Mathf.Max(1, b.I("n_acts")), Act = act };
+ var stage = rules.MakeStage(cfg, act);
+ Assert.IsNotNull(stage, "서장 막 판 정의");
+ bm.StartMode(new BattleMode { kind = "scenario", stage = stage, maxTurns = 0, rules = rules });
+ return rules;
+ }
+
int Index(int chapter, int stage)
{
for (int i = 0; i < cfg.stages.Length; i++)
@@ -86,11 +98,11 @@ namespace TKS.Tests
}
[UnityTest]
- public IEnumerator Stage1_1_Start_Skip_EndsAtLayoutWithZhangfeiFainted()
+ public IEnumerator Prologue1_Start_Skip_EndsAtLayoutWithZhangfeiFainted()
{
- bm.StartStage(Index(1, 1));
+ StartPrologue(1);
yield return null;
- Assert.IsTrue(ScenarioEvent.Running, "1-1 시작 연출");
+ Assert.IsTrue(ScenarioEvent.Running, "서장 1막 시작 연출");
Assert.AreEqual(BattlePhase.Setup, bm.Phase, "연출 동안 조작 잠금");
yield return new WaitForSecondsRealtime(0.3f);
ScenarioEvent.SkipForTest();
@@ -110,23 +122,53 @@ namespace TKS.Tests
}
[UnityTest]
- public IEnumerator Stage1_1_Win_PlaysEventThenStageClear()
+ public IEnumerator Prologue1_Win_PlaysEvent_ThenNextAct_LastActClears()
{
- bm.StartStage(Index(1, 1));
+ var rules = StartPrologue(1);
+ yield return null;
+ ScenarioEvent.SkipForTest();
+ yield return UntilEventEnds(5f);
+ var zf = bm.Tutorial.UnitAt(3);
+ foreach (var e in bm.AliveUnits(Faction.Enemy)) e.TakeDamage(e.MaxHp * 10);
+ bm.CheckBattleEnd();
+ yield return null;
+ Assert.IsTrue(ScenarioEvent.Running, "1막 승리 연출");
+ Assert.AreEqual(BattlePhase.Setup, bm.Phase, "승리 연출 동안 결과 대기");
+ yield return new WaitForSecondsRealtime(0.3f);
+ ScenarioEvent.SkipForTest();
+ yield return UntilEventEnds(5f);
+ Assert.Less(Quaternion.Angle(zf.View.Anim != null ? zf.View.Anim.transform.localRotation : zf.View.transform.localRotation, Quaternion.identity), 1f, "장비 일어남(wake)");
+ // 1막 승리 → 결과 화면 없이 2막
+ for (float t = 0f; t < 6f && rules.Act < 2; t += Time.unscaledDeltaTime) yield return null;
+ for (float t = 0f; t < 6f && bm.Stage.stage != 2; t += Time.unscaledDeltaTime) yield return null;
+ Assert.AreEqual(2, rules.Act, "다음 막");
+ Assert.AreEqual(2, bm.Stage.stage, "2막 판");
+ Assert.IsNotNull(bm.Mode, "연의 모드 전투 그대로");
+ Assert.AreNotEqual(BattlePhase.StageClear, bm.Phase, "중간 막 = 결과 화면 없음");
+ ScenarioEvent.SkipForTest();
+ yield return UntilEventEnds(5f);
+ // 3막으로 건너뛰고 승리 = 결과(StageClear)
+ rules.Act = 3;
+ bm.BeginActStage(rules.MakeStage(cfg, 3));
yield return null;
ScenarioEvent.SkipForTest();
yield return UntilEventEnds(5f);
foreach (var e in bm.AliveUnits(Faction.Enemy)) e.TakeDamage(e.MaxHp * 10);
bm.CheckBattleEnd();
yield return null;
- Assert.IsTrue(ScenarioEvent.Running, "1-1 승리 연출");
- Assert.AreEqual(BattlePhase.Setup, bm.Phase, "승리 연출 동안 결과 대기");
- yield return new WaitForSecondsRealtime(0.3f);
ScenarioEvent.SkipForTest();
yield return UntilEventEnds(5f);
- Assert.AreEqual(BattlePhase.StageClear, bm.Phase, "연출 뒤 승리");
- var zf = bm.Tutorial.UnitAt(3);
- Assert.Less(Quaternion.Angle(zf.View.Anim != null ? zf.View.Anim.transform.localRotation : zf.View.transform.localRotation, Quaternion.identity), 1f, "장비 일어남(wake)");
+ Assert.AreEqual(BattlePhase.StageClear, bm.Phase, "마지막 막 승리 = 결과");
+ }
+
+ [UnityTest]
+ public IEnumerator Chuljeong1_1_HasNoScenarioStaging()
+ {
+ bm.StartStage(Index(1, 1));
+ yield return null;
+ Assert.IsFalse(ScenarioEvent.Running, "출정 1-1 = 연의 연출 없음");
+ Assert.IsFalse(bm.Board.EventArtOn, "출정 1-1 = 연의 바닥 없음");
+ Assert.AreEqual(0, ScenarioProps.Count, "출정 1-1 = 연의 소품 없음");
}
///
@@ -150,8 +192,8 @@ namespace TKS.Tests
var hud = Object.FindFirstObjectByType(FindObjectsInactive.Include);
if (hud != null) hud.gameObject.SetActive(true);
- // 1-1 시작
- bm.StartStage(Index(1, 1));
+ // 서장 1막 시작
+ StartPrologue(1);
yield return null;
var want = new[] { 11, 17, 29, 41, 43, 47, 52 };
yield return Follow(want, "1-1_start", shot);
@@ -163,13 +205,13 @@ namespace TKS.Tests
bm.CheckBattleEnd();
yield return Follow(new[] { 6, 16, 21 }, "1-1_win", shot);
- // 1-2 시작
- bm.StartStage(Index(1, 2));
+ // 서장 2막 시작
+ StartPrologue(2);
yield return null;
yield return Follow(new[] { 14, 22, 30, 35 }, "1-2_start", shot);
- // 1-3 승리(맹세)
- bm.StartStage(Index(1, 3));
+ // 서장 3막 승리(맹세)
+ StartPrologue(3);
yield return null;
ScenarioEvent.SkipForTest();
yield return UntilEventEnds(5f);
diff --git a/Assets/Tests/PlayMode/TutorialTests.cs b/Assets/Tests/PlayMode/TutorialTests.cs
index 31d582c9..f907edf1 100644
--- a/Assets/Tests/PlayMode/TutorialTests.cs
+++ b/Assets/Tests/PlayMode/TutorialTests.cs
@@ -196,8 +196,8 @@ namespace TKS.Tests
var e6 = Slot(6);
Vector2 before = zhangfei.Position;
yield return Shoot(liubei, zhangfei.Position - liubei.Position, pull);
- Assert.Greater(zhangfei.Position.y - before.y, 0.5f, "당김 " + pull + ": 장비가 밀려남(" + before + " → " + zhangfei.Position + ")");
- Assert.IsFalse(e4.IsAlive, "당김 " + pull + ": 밀린 장비가 4번 척후에 닿아 그 자리 공격 → 쓰러짐(장비 " + zhangfei.Position + " · 4번 HP " + e4.Hp + ")");
+ // 2026-11-18 PD 알까기: 밀린 장비는 4번 척후와 부딪히는 순간 피해를 주고 튕겨 나온다(멈춘 뒤 공격 ✕) → 최종 위치는 거의 제자리일 수 있다
+ Assert.IsFalse(e4.IsAlive, "당김 " + pull + ": 밀린 장비가 4번 척후와 부딪혀(즉시 피해) 쓰러짐(장비 " + before + " → " + zhangfei.Position + " · 4번 HP " + e4.Hp + ")");
Assert.IsTrue(bm.CanAct(zhangfei), "밀린 아군은 행동을 쓰지 않는다");
yield return Shoot(zhangfei, Vector2.up, pull);
Assert.IsFalse(e5.IsAlive, "당김 " + pull + ": 장비 돌진 한 줄 1(5번 HP " + e5.Hp + ")");