fix: remove invalid Hakurei statue assets

2026-07-01 00:53:51 +08:00 · 2026-07-01 00:53:51 +08:00 · ed7062336b
commit ed7062336b
parent f75fa82a74
19 changed files with 458 additions and 923 deletions
--- a/MD/ChronicIssueList/2026-07-01-hakurei-statue-obsolete-assets.md
+++ b/MD/ChronicIssueList/2026-07-01-hakurei-statue-obsolete-assets.md
@ -0,0 +1,60 @@
+# TH1-CI-2026-07-01-002 Hakurei Statue Obsolete Asset Family
+
+- Status: Fixed in assets; guardrail added; Unity validation pending
+- First recorded date: 2026-07-01
+- Severity: Critical
+
+## Raw Symptom
+
+User report: Hakurei empire statue buildings and build actions still used wrong icons, including the horse statue build action. The five `ReimuForces_Norway_Statue_*` PNGs were not just assigned to the wrong rows; they were invalid assets that should not exist in the game.
+
+Affected files:
+
+- `Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_*.png`
+- `Unity/Assets/BundleResources/DataAssets/ActionDataAssets.asset`
+- `Unity/Assets/BundleResources/DataAssets/GridAndResourceDataAssets.asset`
+- `Unity/Assets/BundleResources/DataAssets/CultureCardDataAssets.asset`
+- Matching `Unity/Assets/BundleResources/Export/*` runtime assets
+
+## Why This Recurs
+
+The prior fix treated newly introduced statue PNGs as the expected Hakurei/Reimu art instead of comparing against existing civilization temple/statue rows. That also caused the guardrail script to encode the wrong GUIDs as expected values, so future checks would have preserved the bad assets instead of rejecting them.
+
+## Root Cause
+
+Two mistakes compounded:
+
+- The asset family `TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_*` was introduced even though Hakurei/Reimu already has the correct temple/statue sprite family under `TH1BuildingsCommon/Temple/Hakurei`.
+- The 1-based enum value `CivEnum.Norway = 5` / `ForceEnum.Reimu = 5` was confused with DataAsset ids, polluting `CivId: 5` / `ForceId: 5` rows even though Hakurei/Reimu is `CivId: 4` / `ForceId: 4`.
+
+## Root-Cause Fix
+
+- Removed the invalid `ReimuForces_Norway_Statue_Horse/Queen/Chariot/Minister/King` PNGs and their `.meta` files.
+- Repointed Hakurei/Reimu `CivId: 4` / `ForceId: 4` action, map-resource, and culture-card sprite references to the existing `TH1BuildingsCommon/Temple/Hakurei` series:
+  - Horse statue: `NorwayAunn_Temple1..5`
+  - Queen statue: `NorwaySumireko_Temple1..5`
+  - Chariot statue: `NorwaySuika_Temple1..5`
+  - Minister statue: `NorwayKasen_Temple1..5`
+  - King statue: `NorwayReimu_Temple1..5`
+- Removed the erroneous `CivId: 5` / `ForceId: 5` Hakurei temple rows from grid/resource data.
+
+## Guardrail Added
+
+`Tools/CheckHakureiStatueActionIcons.ps1` now fails if:
+
+- Any obsolete `ReimuForces_Norway_Statue_*` file exists.
+- Any DataAssets or Export asset still references the obsolete GUIDs.
+- Hakurei/Reimu statue action, map-resource, or culture-card rows for `CivId: 4` / `ForceId: 4` do not use the existing `TH1BuildingsCommon/Temple/Hakurei` GUIDs.
+- Any Hakurei temple GUID leaks into `CivId: 5` / `ForceId: 5`.
+- The hero action hint UI bypasses `ActionInfo.GetIcon`.
+
+## Verification Performed
+
+- `Tools/CheckHakureiStatueActionIcons.ps1`
+- `Tools/CheckUnityAssetReferenceIntegrity.ps1`
+- `rg` scan for obsolete GUIDs under `Unity/Assets/BundleResources`
+- `git diff --check`
+
+## Remaining Validation Gaps
+
+- Unity Editor visual validation is still required to confirm all five Hakurei/Reimu statue build actions, culture-card icons, and completed map resources render with the intended Aunn/Sumireko/Suika/Kasen/Reimu temple series.
--- a/MD/ChronicIssueList/index.md
+++ b/MD/ChronicIssueList/index.md
@ -6,6 +6,7 @@

 | ID | 日期 | 状态 | 严重度 | 问题 | 根治方向 | 记录 |
 | --- | --- | --- | --- | --- | --- | --- |
+| TH1-CI-2026-07-01-002 | 2026-07-01 | Fixed in assets; guardrail added; Unity validation pending | Critical | 博丽/灵梦神像错误 PNG 资源族被引入，并被 action、地图资源、文化卡引用，守护脚本还把错误 GUID 当期望值 | 删除无效 `ReimuForces_Norway_Statue_*` 资源，统一回到现有 `TH1BuildingsCommon/Temple/Hakurei` 系列，并黑名单旧 GUID/文件与 5/5 污染 | [record](2026-07-01-hakurei-statue-obsolete-assets.md) |
 | TH1-CI-2026-07-01-001 | 2026-07-01 | Workflow rule added; memory/rule guardrail added | Critical | Codex repeatedly confused 1-based `CivEnum`/`ForceEnum` with 0-based `CivId`/`ForceId`, causing wrong Hakurei/Reimu table ids | Encode enum-id conversion as a hard rule in global Codex rules, user memory, repo `AGENTS.md`, and `th1-base`; require conversion APIs before editing related data | [record](2026-07-01-civ-force-enum-id-confusion.md) |
 | TH1-CI-2026-06-30-003 | 2026-06-30 | Fixed in code; guardrail added; Unity validation pending | High | 博丽/灵梦神像 action 配置已有变体图标，但英雄提示 action 圆按钮仍绕过变体选择使用默认图 | 所有 action 图标展示入口必须通过 `ActionInfo.GetIcon` 按当前玩家文明/势力解析，并增加配置/UI 双重校验 | [record](2026-06-30-hakurei-statue-action-icon-context.md) |
 | TH1-CI-2026-06-30-002 | 2026-06-30 | Fixed in code; guardrail added; Unity validation pending | High | 上下船移动的数据形态已变化，但 `FragmentMove` 开始动画时仍可能显示旧船/旧陆地外观 | 在移动 Fragment 起步前用当前 `UnitData` 刷新单位图片，同时保留终点 settle 刷新 | [record](2026-06-30-move-transform-visual-refresh.md) |
--- a/Tools/CheckHakureiStatueActionIcons.ps1
+++ b/Tools/CheckHakureiStatueActionIcons.ps1
@ -3,6 +3,14 @@ param(
        "Unity/Assets/BundleResources/DataAssets/ActionDataAssets.asset",
        "Unity/Assets/BundleResources/Export/ActionDataAssets.asset"
    ),
+    [string[]]$GridAndResourceDataAssetFiles = @(
+        "Unity/Assets/BundleResources/DataAssets/GridAndResourceDataAssets.asset",
+        "Unity/Assets/BundleResources/Export/GridAndResourceDataAssets.asset"
+    ),
+    [string[]]$CultureCardDataAssetFiles = @(
+        "Unity/Assets/BundleResources/DataAssets/CultureCardDataAssets.asset",
+        "Unity/Assets/BundleResources/Export/CultureCardDataAssets.asset"
+    ),
    [string]$HeroHintActionCircleFile = "Unity/Assets/Scripts/TH1_UI/HintUI/HeroHintPanelCommonCircleMono.cs"
 )

@ -37,10 +45,13 @@ function Read-RepoText {
    return Get-Content -LiteralPath $path -Raw -Encoding UTF8
 }

-function Get-BuildActionBlock {
+function Get-YamlListBlock {
    param(
        [string]$RelativePath,
-        [int]$ResourceType
+        [string]$StartPattern,
+        [string]$NextPattern,
+        [string]$RequiredPattern,
+        [string]$MissingMessage
    )

    $path = Resolve-RepoPath $RelativePath
@ -49,59 +60,318 @@ function Get-BuildActionBlock {
        return ""
    }

-    $lines = Get-Content -LiteralPath $path -Encoding UTF8
+    $lines = @(Get-Content -LiteralPath $path -Encoding UTF8)
    for ($i = 0; $i -lt $lines.Count; $i++) {
-        if ($lines[$i] -notmatch '^  - ActionId:\s*$') {
+        if ($lines[$i] -notmatch $StartPattern) {
            continue
        }

        $start = $i
        $end = $lines.Count - 1
        for ($j = $i + 1; $j -lt $lines.Count; $j++) {
-            if ($lines[$j] -match '^  - ActionId:\s*$') {
+            if ($lines[$j] -match $NextPattern) {
                $end = $j - 1
                break
            }
        }

        $block = $lines[$start..$end] -join "`n"
-        if ($block -match "(?m)^\s+ActionType:\s+1\s*$" -and
-            $block -match "(?m)^\s+ResourceType:\s+$ResourceType\s*$") {
+        if ($block -match $RequiredPattern) {
            return $block
        }
    }

-    Add-Failure "$RelativePath missing Build action ResourceType $ResourceType."
+    Add-Failure "$RelativePath $MissingMessage"
    return ""
 }

-function Get-EmpireIconGuid {
-    param([string]$ActionBlock)
+function Get-BuildActionBlock {
+    param(
+        [string]$RelativePath,
+        [int]$ResourceType
+    )

-    $entryPattern = '(?ms)^    - IgnoreCivId: 0\s*$' +
-        '(?:(?!^    - IgnoreCivId:).)*?^      CivId: 4\s*$' +
-        '(?:(?!^    - IgnoreCivId:).)*?^      ForceId: 4\s*$' +
-        '(?:(?!^    - IgnoreCivId:).)*?guid: ([0-9a-f]{32})'
-    $match = [regex]::Match($ActionBlock, $entryPattern)
-    if (-not $match.Success) {
-        return ""
+    return Get-YamlListBlock `
+        -RelativePath $RelativePath `
+        -StartPattern '^  - ActionId:\s*$' `
+        -NextPattern '^  - ActionId:\s*$' `
+        -RequiredPattern "(?m)^\s+ActionType:\s+1\s*$[\s\S]*?^\s+ResourceType:\s+$ResourceType\s*$" `
+        -MissingMessage "missing Build action ResourceType $ResourceType."
+}
+
+function Get-GridResourceBlock {
+    param(
+        [string]$RelativePath,
+        [int]$ResourceType
+    )
+
+    return Get-YamlListBlock `
+        -RelativePath $RelativePath `
+        -StartPattern '^  - Resource:\s+\d+\s*$' `
+        -NextPattern '^  - Resource:\s+\d+\s*$|^  - Wonder:\s+\d+\s*$' `
+        -RequiredPattern "(?m)^  - Resource:\s+$ResourceType\s*$" `
+        -MissingMessage "missing GridAndResource Resource $ResourceType."
+}
+
+function Get-CultureCardBlock {
+    param(
+        [string]$RelativePath,
+        [int]$ResourceType
+    )
+
+    return Get-YamlListBlock `
+        -RelativePath $RelativePath `
+        -StartPattern '^  - CardType:\s+\d+\s*$' `
+        -NextPattern '^  - CardType:\s+\d+\s*$|^  - TaskType:\s+\d+\s*$' `
+        -RequiredPattern "(?m)^\s+ResourceType:\s+$ResourceType\s*$" `
+        -MissingMessage "missing CultureCard ResourceType $ResourceType."
+}
+
+function Get-VariantEntries {
+    param([string]$Block)
+
+    $entries = @()
+    if ([string]::IsNullOrEmpty($Block)) {
+        return $entries
    }

-    return $match.Groups[1].Value
+    $lines = @($Block -split "`r?`n")
+    for ($i = 0; $i -lt $lines.Count; $i++) {
+        if ($lines[$i] -notmatch '^    - IgnoreCivId:') {
+            continue
+        }
+
+        $start = $i
+        $end = $lines.Count
+        for ($j = $i + 1; $j -lt $lines.Count; $j++) {
+            if ($lines[$j] -match '^    - IgnoreCivId:') {
+                $end = $j
+                break
+            }
+        }
+
+        $entryLines = @($lines[$start..($end - 1)])
+        $entryText = $entryLines -join "`n"
+        $civId = $null
+        $forceId = $null
+        $spriteGuid = ""
+        $levelGuids = @()
+
+        if ($entryText -match '(?m)^\s+CivId:\s+(\d+)\s*$') {
+            $civId = [int]$Matches[1]
+        }
+        if ($entryText -match '(?m)^\s+ForceId:\s+(\d+)\s*$') {
+            $forceId = [int]$Matches[1]
+        }
+        if ($entryText -match '(?m)^\s+Sprite:\s+\{fileID:\s+21300000,\s+guid:\s+([0-9a-f]{32}),\s+type:\s+3\}\s*$') {
+            $spriteGuid = $Matches[1]
+        }
+
+        foreach ($line in $entryLines) {
+            if ($line -match '^\s+- \{fileID:\s+21300000,\s+guid:\s+([0-9a-f]{32}),\s+type:\s+3\}\s*$') {
+                $levelGuids += $Matches[1]
+            }
+        }
+
+        $entries += [pscustomobject]@{
+            CivId = $civId
+            ForceId = $forceId
+            SpriteGuid = $spriteGuid
+            LevelGuids = $levelGuids
+            Text = $entryText
+        }
+
+        $i = $end - 1
+    }
+
+    return $entries
 }

-$expectedHakureiActionIcons = @{
-    19 = "b2f4a0f7de7b4d6cadd036f59061465f" # Horse
-    20 = "20071dc3a43a456e8a4c753340625c0b" # Mountain
-    21 = "9dddeb2a6c4f4ff6ab1f4714caf8fbb1" # Water
-    22 = "9931e374408c4dbfa254eca565417b33" # Peace
-    28 = "0a7f4ac077094d2686205d65132d0ddf" # Forest
+function Get-VariantEntry {
+    param(
+        [object[]]$Entries,
+        [int]$CivId,
+        [int]$ForceId
+    )
+
+    return @($Entries | Where-Object { $_.CivId -eq $CivId -and $_.ForceId -eq $ForceId } | Select-Object -First 1)
 }

-$hakureiGuidAlternation = (($expectedHakureiActionIcons.Values | ForEach-Object { [regex]::Escape($_) }) -join "|")
+function Test-HakureiGuidLeakToWrongEmpire {
+    param(
+        [string]$Context,
+        [object[]]$Entries,
+        [hashtable]$HakureiGuidSet
+    )
+
+    $wrongEntries = @($Entries | Where-Object { $_.CivId -eq 5 -and $_.ForceId -eq 5 })
+    foreach ($entry in $wrongEntries) {
+        if ($HakureiGuidSet.ContainsKey($entry.SpriteGuid)) {
+            Add-Failure "$Context still assigns Hakurei temple guid $($entry.SpriteGuid) to CivId 5 ForceId 5."
+        }
+
+        foreach ($guid in $entry.LevelGuids) {
+            if ($HakureiGuidSet.ContainsKey($guid)) {
+                Add-Failure "$Context still assigns Hakurei temple level guid $guid to CivId 5 ForceId 5."
+            }
+        }
+    }
+}
+
+function Assert-ExpectedSprite {
+    param(
+        [string]$Context,
+        [object]$Entry,
+        [string]$ExpectedGuid
+    )
+
+    if (-not $Entry) {
+        Add-Failure "$Context missing Hakurei/Reimu CivId 4 ForceId 4 entry."
+        return
+    }
+
+    if ($Entry.SpriteGuid -ne $ExpectedGuid) {
+        Add-Failure "$Context expected Hakurei/Reimu sprite $ExpectedGuid, got '$($Entry.SpriteGuid)'."
+    }
+}
+
+function Assert-ExpectedLevels {
+    param(
+        [string]$Context,
+        [object]$Entry,
+        [string[]]$ExpectedLevelGuids
+    )
+
+    if (-not $Entry) {
+        return
+    }
+
+    $actual = @($Entry.LevelGuids)
+    if ($actual.Count -ne $ExpectedLevelGuids.Count) {
+        Add-Failure "$Context expected $($ExpectedLevelGuids.Count) level sprites, got $($actual.Count)."
+        return
+    }
+
+    for ($i = 0; $i -lt $ExpectedLevelGuids.Count; $i++) {
+        if ($actual[$i] -ne $ExpectedLevelGuids[$i]) {
+            Add-Failure "$Context level sprite $i expected $($ExpectedLevelGuids[$i]), got '$($actual[$i])'."
+        }
+    }
+}
+
+$obsoleteStatueGuids = @(
+    "b2f4a0f7de7b4d6cadd036f59061465f", # ReimuForces_Norway_Statue_Horse
+    "20071dc3a43a456e8a4c753340625c0b", # ReimuForces_Norway_Statue_Queen
+    "9dddeb2a6c4f4ff6ab1f4714caf8fbb1", # ReimuForces_Norway_Statue_Chariot
+    "9931e374408c4dbfa254eca565417b33", # ReimuForces_Norway_Statue_Minister
+    "0a7f4ac077094d2686205d65132d0ddf"  # ReimuForces_Norway_Statue_King
+)
+
+$obsoleteStatueAssetFiles = @(
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Horse.png",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Horse.png.meta",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Queen.png",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Queen.png.meta",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Chariot.png",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Chariot.png.meta",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Minister.png",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Minister.png.meta",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_King.png",
+    "Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_King.png.meta"
+)
+
+$expectedHakureiTempleIcons = [ordered]@{
+    "19" = @{
+        Label = "Horse/Aunn"
+        Icon = "4bf1f23582ff4612bef38837ee07f33d"
+        Levels = @(
+            "4bf1f23582ff4612bef38837ee07f33d",
+            "4bf1f23582ff4612bef38837ee07f33d",
+            "72377380e1c143f09cf29b802d6f4c99",
+            "ae7878f1d737474c8a05d9d19c88c7c9",
+            "559e5120271243e885975fa82dd8ff5e",
+            "5743d7003f464328bde939a3a313445a"
+        )
+    }
+    "20" = @{
+        Label = "Queen/Sumireko"
+        Icon = "f68789b350d04e33bb008283ac4eb212"
+        Levels = @(
+            "f68789b350d04e33bb008283ac4eb212",
+            "f68789b350d04e33bb008283ac4eb212",
+            "0196396f558840e2915771edfc78598b",
+            "07671f70a857421c85c6f3311683b97a",
+            "a6793dfea9ac4138ab60e1da1957b6a3",
+            "f09cb2896a2f4df78e05c10c36c24195"
+        )
+    }
+    "21" = @{
+        Label = "Chariot/Suika"
+        Icon = "070c43baedb847379a2e88e84c0971f1"
+        Levels = @(
+            "070c43baedb847379a2e88e84c0971f1",
+            "070c43baedb847379a2e88e84c0971f1",
+            "0f12cf0287514fb1a4279349b0359a7f",
+            "9943f3bd38eb4037881bcf2c95cbb24d",
+            "e4eb1f1eb43d47e58510e62630ca4c64",
+            "19ff5772bcf443fa8eaaf4692b4b4d5f"
+        )
+    }
+    "22" = @{
+        Label = "Minister/Kasen"
+        Icon = "780d2b186aba4b12a534d31f17b9e543"
+        Levels = @(
+            "780d2b186aba4b12a534d31f17b9e543",
+            "780d2b186aba4b12a534d31f17b9e543",
+            "f93f7d5a7d034699982125ca35ef0d6b",
+            "29bb86743edd4d9d8717889de455e784",
+            "2f930da228be406c8b2d60c25090f7dc",
+            "37cf51b34adf43e990bbd1f54aa09982"
+        )
+    }
+    "28" = @{
+        Label = "King/Reimu"
+        Icon = "1f203689c4d443f99703c68c109b18cb"
+        Levels = @(
+            "1f203689c4d443f99703c68c109b18cb",
+            "1f203689c4d443f99703c68c109b18cb",
+            "4388ce32a375479f9a6a2047592f79d9",
+            "99dd9c7c18ad4214997a91a1523a621f",
+            "de00272eea2b40d2a8cb939b188178d8",
+            "22bec2a8a52b4050aa60a20d6709f514"
+        )
+    }
+}
+
+$hakureiTempleGuidSet = @{}
+foreach ($resourceType in $expectedHakureiTempleIcons.Keys) {
+    $config = $expectedHakureiTempleIcons[$resourceType]
+    $hakureiTempleGuidSet[$config["Icon"]] = $true
+    foreach ($guid in $config["Levels"]) {
+        $hakureiTempleGuidSet[$guid] = $true
+    }
+}
+
+foreach ($relativePath in $obsoleteStatueAssetFiles) {
+    $path = Resolve-RepoPath $relativePath
+    if (Test-Path -LiteralPath $path) {
+        Add-Failure "Obsolete Hakurei statue asset must not exist: $relativePath"
+    }
+}
+
+$assetTextFiles = @($ActionDataAssetFiles + $GridAndResourceDataAssetFiles + $CultureCardDataAssetFiles)
+foreach ($assetFile in $assetTextFiles) {
+    $text = Read-RepoText $assetFile
+    foreach ($obsoleteGuid in $obsoleteStatueGuids) {
+        if ($text.Contains($obsoleteGuid)) {
+            Add-Failure "$assetFile still references obsolete Hakurei statue guid $obsoleteGuid."
+        }
+    }
+}

 foreach ($assetFile in $ActionDataAssetFiles) {
-    foreach ($resourceType in ($expectedHakureiActionIcons.Keys | Sort-Object)) {
+    foreach ($resourceType in ($expectedHakureiTempleIcons.Keys | Sort-Object)) {
+        $config = $expectedHakureiTempleIcons[$resourceType]
        $block = Get-BuildActionBlock -RelativePath $assetFile -ResourceType $resourceType
        if ([string]::IsNullOrEmpty($block)) {
            continue
@ -111,19 +381,48 @@ foreach ($assetFile in $ActionDataAssetFiles) {
            Add-Failure "$assetFile ResourceType $resourceType must keep VarientIcon enabled."
        }

-        $actualGuid = Get-EmpireIconGuid -ActionBlock $block
-        $expectedGuid = $expectedHakureiActionIcons[$resourceType]
-        if ($actualGuid -ne $expectedGuid) {
-            Add-Failure "$assetFile ResourceType $resourceType expected Hakurei/Reimu CivId 4 ForceId 4 icon $expectedGuid, got '$actualGuid'."
+        $entries = @(Get-VariantEntries $block)
+        $hakureiEntry = Get-VariantEntry -Entries $entries -CivId 4 -ForceId 4
+        $context = "$assetFile Build ResourceType $resourceType $($config["Label"])"
+        Assert-ExpectedSprite -Context $context -Entry $hakureiEntry -ExpectedGuid $config["Icon"]
+        Test-HakureiGuidLeakToWrongEmpire -Context $context -Entries $entries -HakureiGuidSet $hakureiTempleGuidSet
+    }
+}
+
+foreach ($assetFile in $GridAndResourceDataAssetFiles) {
+    foreach ($resourceType in ($expectedHakureiTempleIcons.Keys | Sort-Object)) {
+        $config = $expectedHakureiTempleIcons[$resourceType]
+        $block = Get-GridResourceBlock -RelativePath $assetFile -ResourceType $resourceType
+        if ([string]::IsNullOrEmpty($block)) {
+            continue
        }

-        $wrongEmpirePattern = '(?ms)^    - IgnoreCivId: 0\s*$' +
-            '(?:(?!^    - IgnoreCivId:).)*?^      CivId: 5\s*$' +
-            '(?:(?!^    - IgnoreCivId:).)*?^      ForceId: 5\s*$' +
-            '(?:(?!^    - IgnoreCivId:).)*?guid: (' + $hakureiGuidAlternation + ')'
-        if ($block -match $wrongEmpirePattern) {
-            Add-Failure "$assetFile ResourceType $resourceType still assigns a Hakurei statue icon to CivId 5 ForceId 5."
+        $entries = @(Get-VariantEntries $block)
+        $hakureiEntry = Get-VariantEntry -Entries $entries -CivId 4 -ForceId 4
+        $context = "$assetFile Grid Resource $resourceType $($config["Label"])"
+        Assert-ExpectedSprite -Context $context -Entry $hakureiEntry -ExpectedGuid $config["Icon"]
+        Assert-ExpectedLevels -Context $context -Entry $hakureiEntry -ExpectedLevelGuids $config["Levels"]
+        Test-HakureiGuidLeakToWrongEmpire -Context $context -Entries $entries -HakureiGuidSet $hakureiTempleGuidSet
+    }
+}
+
+foreach ($assetFile in $CultureCardDataAssetFiles) {
+    foreach ($resourceType in ($expectedHakureiTempleIcons.Keys | Sort-Object)) {
+        $config = $expectedHakureiTempleIcons[$resourceType]
+        $block = Get-CultureCardBlock -RelativePath $assetFile -ResourceType $resourceType
+        if ([string]::IsNullOrEmpty($block)) {
+            continue
        }
+
+        if ($block -notmatch "(?m)^\s+VarientIcon:\s+1\s*$") {
+            Add-Failure "$assetFile CultureCard ResourceType $resourceType must keep VarientIcon enabled."
+        }
+
+        $entries = @(Get-VariantEntries $block)
+        $hakureiEntry = Get-VariantEntry -Entries $entries -CivId 4 -ForceId 4
+        $context = "$assetFile CultureCard ResourceType $resourceType $($config["Label"])"
+        Assert-ExpectedSprite -Context $context -Entry $hakureiEntry -ExpectedGuid $config["Icon"]
+        Test-HakureiGuidLeakToWrongEmpire -Context $context -Entries $entries -HakureiGuidSet $hakureiTempleGuidSet
    }
 }

@ -143,11 +442,11 @@ foreach ($needle in @(
 }

 if ($failures.Count -gt 0) {
-    Write-Host "Hakurei statue action icon check failed:" -ForegroundColor Red
+    Write-Host "Hakurei statue icon check failed:" -ForegroundColor Red
    foreach ($failure in $failures) {
        Write-Host " - $failure" -ForegroundColor Red
    }
    exit 1
 }

-Write-Host "Hakurei statue action icon checks passed."
+Write-Host "Hakurei statue icon checks passed."
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Chariot.png
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Chariot.png
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Chariot.png.meta
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Chariot.png.meta
@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1
-TextureImporter:
-  internalIDToNameTable: []
-  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: 1
-  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: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 25
-    textureCompression: 1
-    compressionQuality: 80
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    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: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Horse.png
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Horse.png
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Horse.png.meta
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Horse.png.meta
@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: b2f4a0f7de7b4d6cadd036f59061465f
-TextureImporter:
-  internalIDToNameTable: []
-  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: 1
-  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: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 25
-    textureCompression: 1
-    compressionQuality: 80
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    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: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_King.png
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_King.png
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_King.png.meta
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_King.png.meta
@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 0a7f4ac077094d2686205d65132d0ddf
-TextureImporter:
-  internalIDToNameTable: []
-  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: 1
-  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: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 25
-    textureCompression: 1
-    compressionQuality: 80
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    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: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Minister.png
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Minister.png
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Minister.png.meta
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Minister.png.meta
@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 9931e374408c4dbfa254eca565417b33
-TextureImporter:
-  internalIDToNameTable: []
-  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: 1
-  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: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 25
-    textureCompression: 1
-    compressionQuality: 80
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    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: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Queen.png
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Queen.png
--- a/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Queen.png.meta
+++ b/Unity/Assets/BundleResources/ArtResources/TH1Buildings/TH1BuildingsReimuForces/Norway/ReimuForces_Norway_Statue_Queen.png.meta
@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 20071dc3a43a456e8a4c753340625c0b
-TextureImporter:
-  internalIDToNameTable: []
-  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: 1
-  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: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 2
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 1024
-    resizeAlgorithm: 0
-    textureFormat: 25
-    textureCompression: 1
-    compressionQuality: 80
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    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: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Unity/Assets/BundleResources/DataAssets/ActionDataAssets.asset
+++ b/Unity/Assets/BundleResources/DataAssets/ActionDataAssets.asset
@ -3651,7 +3651,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
+      Sprite: {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -3787,7 +3787,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
+      Sprite: {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -3923,7 +3923,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
+      Sprite: {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -4059,7 +4059,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
+      Sprite: {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -4195,7 +4195,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
+      Sprite: {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      Name:
      Desc:
      HasLevel: 0
--- a/Unity/Assets/BundleResources/DataAssets/CultureCardDataAssets.asset
+++ b/Unity/Assets/BundleResources/DataAssets/CultureCardDataAssets.asset
@ -253,7 +253,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
+      Sprite: {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -355,7 +355,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
+      Sprite: {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -457,7 +457,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
+      Sprite: {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -559,7 +559,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
+      Sprite: {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -661,7 +661,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
+      Sprite: {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      Name:
      Desc:
      HasLevel: 0
--- a/Unity/Assets/BundleResources/DataAssets/GridAndResourceDataAssets.asset
+++ b/Unity/Assets/BundleResources/DataAssets/GridAndResourceDataAssets.asset
@ -703,25 +703,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      Name: "\u9A6C\u4E4B\u795E\u50CF"
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      Name: "\u9A6C\u4E4B\u795E\u50CF"
      Desc: 
@ -729,10 +710,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
+      - {fileID: 21300000, guid: 72377380e1c143f09cf29b802d6f4c99, type: 3}
+      - {fileID: 21300000, guid: ae7878f1d737474c8a05d9d19c88c7c9, type: 3}
+      - {fileID: 21300000, guid: 559e5120271243e885975fa82dd8ff5e, type: 3}
+      - {fileID: 21300000, guid: 5743d7003f464328bde939a3a313445a, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -870,25 +851,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      Name: "\u540E\u4E4B\u795E\u50CF"
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      Name: "\u540E\u4E4B\u795E\u50CF"
      Desc: 
@ -896,10 +858,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
+      - {fileID: 21300000, guid: 0196396f558840e2915771edfc78598b, type: 3}
+      - {fileID: 21300000, guid: 07671f70a857421c85c6f3311683b97a, type: 3}
+      - {fileID: 21300000, guid: a6793dfea9ac4138ab60e1da1957b6a3, type: 3}
+      - {fileID: 21300000, guid: f09cb2896a2f4df78e05c10c36c24195, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -1037,25 +999,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      Name: "\u8F66\u4E4B\u795E\u50CF"
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      Name: "\u8F66\u4E4B\u795E\u50CF"
      Desc: 
@ -1063,10 +1006,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
+      - {fileID: 21300000, guid: 0f12cf0287514fb1a4279349b0359a7f, type: 3}
+      - {fileID: 21300000, guid: 9943f3bd38eb4037881bcf2c95cbb24d, type: 3}
+      - {fileID: 21300000, guid: e4eb1f1eb43d47e58510e62630ca4c64, type: 3}
+      - {fileID: 21300000, guid: 19ff5772bcf443fa8eaaf4692b4b4d5f, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -1204,25 +1147,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      Name: "\u76F8\u4E4B\u795E\u50CF"
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      Name: "\u76F8\u4E4B\u795E\u50CF"
      Desc: 
@ -1230,10 +1154,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
+      - {fileID: 21300000, guid: f93f7d5a7d034699982125ca35ef0d6b, type: 3}
+      - {fileID: 21300000, guid: 29bb86743edd4d9d8717889de455e784, type: 3}
+      - {fileID: 21300000, guid: 2f930da228be406c8b2d60c25090f7dc, type: 3}
+      - {fileID: 21300000, guid: 37cf51b34adf43e990bbd1f54aa09982, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -2091,25 +2015,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      Name: "\u738B\u4E4B\u795E\u50CF"
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      Name: "\u738B\u4E4B\u795E\u50CF"
      Desc: 
@ -2117,10 +2022,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
+      - {fileID: 21300000, guid: 4388ce32a375479f9a6a2047592f79d9, type: 3}
+      - {fileID: 21300000, guid: 99dd9c7c18ad4214997a91a1523a621f, type: 3}
+      - {fileID: 21300000, guid: de00272eea2b40d2a8cb939b188178d8, type: 3}
+      - {fileID: 21300000, guid: 22bec2a8a52b4050aa60a20d6709f514, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
--- a/Unity/Assets/BundleResources/Export/ActionDataAssets.asset
+++ b/Unity/Assets/BundleResources/Export/ActionDataAssets.asset
@ -3651,7 +3651,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
+      Sprite: {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -3787,7 +3787,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
+      Sprite: {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -3923,7 +3923,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
+      Sprite: {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -4059,7 +4059,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
+      Sprite: {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      Name:
      Desc:
      HasLevel: 0
@ -4195,7 +4195,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
+      Sprite: {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      Name:
      Desc:
      HasLevel: 0
--- a/Unity/Assets/BundleResources/Export/CultureCardDataAssets.asset
+++ b/Unity/Assets/BundleResources/Export/CultureCardDataAssets.asset
@ -253,7 +253,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
+      Sprite: {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      Name: 
      Desc: 
      HasLevel: 0
@ -355,7 +355,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
+      Sprite: {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      Name: 
      Desc: 
      HasLevel: 0
@ -457,7 +457,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
+      Sprite: {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      Name: 
      Desc: 
      HasLevel: 0
@ -559,7 +559,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
+      Sprite: {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      Name: 
      Desc: 
      HasLevel: 0
@ -661,7 +661,7 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
+      Sprite: {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      Name: 
      Desc: 
      HasLevel: 0
--- a/Unity/Assets/BundleResources/Export/GridAndResourceDataAssets.asset
+++ b/Unity/Assets/BundleResources/Export/GridAndResourceDataAssets.asset
@ -703,25 +703,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      Name: 809
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-      - {fileID: 21300000, guid: b2f4a0f7de7b4d6cadd036f59061465f, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      Name: 809
      Desc: 
@ -729,10 +710,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
-      - {fileID: 21300000, guid: 4bf1f23582ff4612bef38837ee07f33d, type: 3}
+      - {fileID: 21300000, guid: 72377380e1c143f09cf29b802d6f4c99, type: 3}
+      - {fileID: 21300000, guid: ae7878f1d737474c8a05d9d19c88c7c9, type: 3}
+      - {fileID: 21300000, guid: 559e5120271243e885975fa82dd8ff5e, type: 3}
+      - {fileID: 21300000, guid: 5743d7003f464328bde939a3a313445a, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -870,25 +851,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      Name: 811
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-      - {fileID: 21300000, guid: 20071dc3a43a456e8a4c753340625c0b, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      Name: 811
      Desc: 
@ -896,10 +858,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
-      - {fileID: 21300000, guid: f68789b350d04e33bb008283ac4eb212, type: 3}
+      - {fileID: 21300000, guid: 0196396f558840e2915771edfc78598b, type: 3}
+      - {fileID: 21300000, guid: 07671f70a857421c85c6f3311683b97a, type: 3}
+      - {fileID: 21300000, guid: a6793dfea9ac4138ab60e1da1957b6a3, type: 3}
+      - {fileID: 21300000, guid: f09cb2896a2f4df78e05c10c36c24195, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -1037,25 +999,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      Name: 810
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-      - {fileID: 21300000, guid: 9dddeb2a6c4f4ff6ab1f4714caf8fbb1, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      Name: 810
      Desc: 
@ -1063,10 +1006,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
-      - {fileID: 21300000, guid: 070c43baedb847379a2e88e84c0971f1, type: 3}
+      - {fileID: 21300000, guid: 0f12cf0287514fb1a4279349b0359a7f, type: 3}
+      - {fileID: 21300000, guid: 9943f3bd38eb4037881bcf2c95cbb24d, type: 3}
+      - {fileID: 21300000, guid: e4eb1f1eb43d47e58510e62630ca4c64, type: 3}
+      - {fileID: 21300000, guid: 19ff5772bcf443fa8eaaf4692b4b4d5f, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -1204,25 +1147,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      Name: 812
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-      - {fileID: 21300000, guid: 9931e374408c4dbfa254eca565417b33, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      Name: 812
      Desc: 
@ -1230,10 +1154,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
-      - {fileID: 21300000, guid: 780d2b186aba4b12a534d31f17b9e543, type: 3}
+      - {fileID: 21300000, guid: f93f7d5a7d034699982125ca35ef0d6b, type: 3}
+      - {fileID: 21300000, guid: 29bb86743edd4d9d8717889de455e784, type: 3}
+      - {fileID: 21300000, guid: 2f930da228be406c8b2d60c25090f7dc, type: 3}
+      - {fileID: 21300000, guid: 37cf51b34adf43e990bbd1f54aa09982, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0
@ -2091,25 +2015,6 @@ MonoBehaviour:
      ForceId: 4
      OnlyCarryGiant: 0
      CarryGiantType: 0
-      Sprite: {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      Name: 18717
-      Desc: 
-      HasLevel: 1
-      LevelSprite:
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-      - {fileID: 21300000, guid: 0a7f4ac077094d2686205d65132d0ddf, type: 3}
-    - IgnoreCivId: 0
-      IgnoreForceId: 0
-      IsGridSpType: 0
-      GridSpType: 0
-      CivId: 5
-      ForceId: 5
-      OnlyCarryGiant: 0
-      CarryGiantType: 0
      Sprite: {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      Name: 18717
      Desc: 
@ -2117,10 +2022,10 @@ MonoBehaviour:
      LevelSprite:
      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
-      - {fileID: 21300000, guid: 1f203689c4d443f99703c68c109b18cb, type: 3}
+      - {fileID: 21300000, guid: 4388ce32a375479f9a6a2047592f79d9, type: 3}
+      - {fileID: 21300000, guid: 99dd9c7c18ad4214997a91a1523a621f, type: 3}
+      - {fileID: 21300000, guid: de00272eea2b40d2a8cb939b188178d8, type: 3}
+      - {fileID: 21300000, guid: 22bec2a8a52b4050aa60a20d6709f514, type: 3}
    - IgnoreCivId: 0
      IgnoreForceId: 0
      IsGridSpType: 0