적 공격 애니메이션 타이밍 조정 및 무기 장착

기타 누락되었던 프리팹 수정 사항 모두 반영
전장의 안개가 비활성화 되어 있을 때 적이 보이지 않는 문제 수정
2026-02-27 19:07:27 +09:00 · 2026-02-27 14:34:29 +09:00 · 2026-02-27 14:19:07 +09:00 · 2026-02-26 03:18:35 +09:00 · 2026-02-26 03:18:28 +09:00 · 2026-02-26 01:37:25 +09:00
1236 changed files with 2031681 additions and 7722 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,7 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(tree:*)"
-    ]
-  }
-}
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ Assets/_Recovery.meta
 GameData/Backups
 .claude/settings.local.json
 AGENTS.md
+CLAUDE.md
+.claude
--- a/Assembly-CSharp-Editor.csproj
+++ b/Assembly-CSharp-Editor.csproj
@@ -70,6 +70,7 @@
    <Compile Include="Assets\Scripts\Editor\NetworkConnectionHelperEditor.cs" />
    <Compile Include="Assets\Scripts\Editor\FogOfWarVisibilitySetup.cs" />
    <Compile Include="Assets\FlatKit\Shaders\Editor\MaterialPropertyExtensions.cs" />
+    <Compile Include="Assets\Scripts\Editor\UpgradePrefabSetup.cs" />
    <Compile Include="Assets\FlatKit\Shaders\Editor\TerrainEditor.cs" />
  </ItemGroup>
  <ItemGroup>
@@ -1369,14 +1370,14 @@
      <HintPath>Library\ScriptAssemblies\Unity.2D.Tilemap.Editor.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Unity.InputSystem.ForUI">
-      <HintPath>Library\ScriptAssemblies\Unity.InputSystem.ForUI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="Unity.Profiling.Core">
      <HintPath>Library\ScriptAssemblies\Unity.Profiling.Core.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Unity.InputSystem.ForUI">
+      <HintPath>Library\ScriptAssemblies\Unity.InputSystem.ForUI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Unity.RenderPipelines.GPUDriven.Runtime">
      <HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.GPUDriven.Runtime.dll</HintPath>
      <Private>False</Private>
@@ -1688,9 +1689,15 @@
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="Assembly-CSharp.csproj" />
+    <ProjectReference Include="CFXR.WelcomeScreen.csproj" />
+    <ProjectReference Include="CFXRRuntime.csproj" />
    <ProjectReference Include="Unity.RenderPipelines.Universal.Runtime.csproj" />
    <ProjectReference Include="FlatKit.Utils.Editor.csproj" />
+    <ProjectReference Include="CFXREditor.csproj" />
+    <ProjectReference Include="KinoBloom.Runtime.csproj" />
    <ProjectReference Include="ExternAttributes.Editor.csproj" />
+    <ProjectReference Include="ToonyColorsPro.Demo.Editor.csproj" />
+    <ProjectReference Include="CFXRDemo.csproj" />
  </ItemGroup>
  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
  <ItemGroup>
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -53,9 +53,11 @@
    <Compile Include="Assets\FlatKit\Demos\[Demo] Desert\Scripts\FloatingMotion.cs" />
    <Compile Include="Assets\Scripts\PlayerResourceInventory.cs" />
    <Compile Include="Assets\Scripts\ITeamMember.cs" />
+    <Compile Include="Assets\Scripts\UI\UpgradeListItem.cs" />
    <Compile Include="Assets\Scripts\EnemyUnit.cs" />
    <Compile Include="Assets\Scripts\PlayerActionSystem.cs" />
    <Compile Include="Assets\Scripts\BuildingQuickslotUI.cs" />
+    <Compile Include="Assets\Scripts\UI\UpgradeListPopup.cs" />
    <Compile Include="Assets\Scripts\TeamType.cs" />
    <Compile Include="Assets\Scripts\CoreResourceManager.cs" />
    <Compile Include="Assets\Scripts\MapGenerator.cs" />
@@ -65,7 +67,6 @@
    <Compile Include="Assets\Scripts\FogOfWarRenderer.cs" />
    <Compile Include="Assets\Scripts\ResourcePickup.cs" />
    <Compile Include="Assets\Scripts\PlayerVisionProvider.cs" />
-    <Compile Include="Assets\Scripts\PlayerController.cs" />
    <Compile Include="Assets\FlatKit\Demos\Common\Scripts\Motion\OrbitMotion.cs" />
    <Compile Include="Assets\Scripts\CreepCamp.cs" />
    <Compile Include="Assets\Scripts\EnemyAIController.cs" />
@@ -76,13 +77,19 @@
    <Compile Include="Assets\Scripts\TeamManager.cs" />
    <Compile Include="Assets\Scripts\TeamGate.cs" />
    <Compile Include="Assets\Scripts\Worker.cs" />
+    <Compile Include="Assets\Scripts\IHealthProvider.cs" />
    <Compile Include="Assets\Scripts\WorkerSpawner.cs" />
    <Compile Include="Assets\Scripts\Resource.cs" />
+    <Compile Include="Assets\Data\Scripts\DataClasses\UpgradeData.cs" />
+    <Compile Include="Assets\Scripts\UpgradeDatabase.cs" />
+    <Compile Include="Assets\Scripts\UI\TeamHealthUI.cs" />
    <Compile Include="Assets\Scripts\AutoTargetSystem.cs" />
    <Compile Include="Assets\Scripts\CreepDataComponent.cs" />
    <Compile Include="Assets\Scripts\BuildingSlotButton.cs" />
+    <Compile Include="Assets\Scripts\PlayerStats.cs" />
    <Compile Include="Assets\FlatKit\[Render Pipeline] URP\Water\Scripts\Buoyancy.cs" />
    <Compile Include="Assets\Scripts\ObstacleSpawner.cs" />
+    <Compile Include="Assets\Scripts\UnitHealthBar.cs" />
    <Compile Include="Assets\Scripts\BuildingFoundation.cs" />
    <Compile Include="Assets\Scripts\AttackAction.cs" />
    <Compile Include="Assets\Scripts\IInteractable.cs" />
@@ -93,6 +100,7 @@
    <Compile Include="Assets\InputSystem_Actions.cs" />
    <Compile Include="Assets\FlatKit\Demos\[Demo] Desert\Scripts\BillboardLineRendererCircle.cs" />
    <Compile Include="Assets\Scripts\BuildingHealthBar.cs" />
+    <Compile Include="Assets\Scripts\RespawnCountdownUI.cs" />
    <Compile Include="Assets\Data\Scripts\DataClasses\CreepData.cs" />
    <Compile Include="Assets\Scripts\PlayerSpawnPoint.cs" />
    <Compile Include="Assets\FlatKit\Demos\Common\Scripts\AutoLoadPipelineAsset.cs" />
@@ -115,6 +123,7 @@
    <Compile Include="Assets\Scripts\NetworkConfigDebugger.cs" />
    <Compile Include="Assets\Data\Scripts\DataClasses\TowerData.cs" />
    <Compile Include="Assets\Scripts\IAction.cs" />
+    <Compile Include="Assets\Scripts\Buildings\Blacksmith.cs" />
    <Compile Include="Assets\Scripts\NetworkPlayerController.cs" />
    <Compile Include="Assets\Scripts\PlayerInteraction.cs" />
    <Compile Include="Assets\Scripts\FogOfWarVisibility.cs" />
@@ -124,6 +133,7 @@
    <Compile Include="Assets\Scripts\EnemyAIState.cs" />
    <Compile Include="Assets\Scripts\ShortcutNetworkStarter.cs" />
    <Compile Include="Assets\Scripts\EquipmentData.cs" />
+    <Compile Include="Assets\Scripts\PlayerUpgradeManager.cs" />
    <Compile Include="Assets\Scripts\NetworkConnectionHelper.cs" />
    <Compile Include="Assets\Scripts\NetworkConnectionHandler.cs" />
  </ItemGroup>
@@ -132,10 +142,12 @@
    <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile Overlay.shader" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile-2-Pass.shader" />
    <None Include="Assets\FlatKit\Shaders\StylizedSurface\LibraryUrp\LitForwardPass_DR.hlsl" />
+    <None Include="Assets\External\JMO Assets\Cartoon FX Remaster\CFXR Assets\Shaders\CFXR_SETTINGS.cginc" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap.shader" />
    <None Include="Assets\FlatKit\Shaders\StylizedSurface\LibraryUrp\TerrainLitPasses_DR.hlsl" />
    <None Include="Assets\FlatKit\Demos\[Demo] Desert\Shaders\CircleDecal.shader" />
    <None Include="Assets\FlatKit\Demos\[Demo] Desert\Shaders\Noise\ClassicNoise3D.hlsl" />
+    <None Include="Assets\External\JMO Assets\Cartoon FX Remaster\CFXR Assets\Shaders\CFXR.cginc" />
    <None Include="Assets\TextMesh Pro\Shaders\TMPro_Mobile.cginc" />
    <None Include="Assets\FlatKit\Shaders\StylizedSurface\LibraryUrp\StylizedInput.hlsl" />
    <None Include="Assets\FlatKit\Shaders\GradientSkybox\GradientSkybox.shader" />
@@ -157,6 +169,8 @@
    <None Include="Assets\FlatKit\Demos\[Demo] Desert\Shaders\DesertPillar.hlsl" />
    <None Include="Assets\TextMesh Pro\Shaders\TMPro_Properties.cginc" />
    <None Include="Assets\TextMesh Pro\Shaders\TMPro_Surface.cginc" />
+    <None Include="Assets\External\JMO Assets\Cartoon FX Remaster\CFXR Prefabs\Texts\_Make your own text effect.txt" />
+    <None Include="Assets\External\JMO Assets\Cartoon FX Remaster\CFXR Assets\Shaders\CFXR_PASSES.cginc" />
    <None Include="Assets\Shaders\FogOfWar.shader" />
    <None Include="Assets\TextMesh Pro\Resources\LineBreaking Following Characters.txt" />
    <None Include="Assets\External\Kaykit Adventurers Character\Characters\Animations\Animations\Rig_Large\Special\EXPERIMENTAL\Read_me.txt" />
@@ -166,6 +180,7 @@
    <None Include="Assets\FlatKit\Shaders\StylizedSurface\TerrainLitAdd_DR.shader" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF Overlay.shader" />
    <None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap-Mobile.shader" />
+    <None Include="Assets\External\JMO Assets\Cartoon FX Remaster\CFXR Assets\Shaders\CFXR_URP.cginc" />
    <None Include="Assets\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
    <None Include="Assets\FlatKit\Shaders\StylizedSurface\StylizedSurface.shader" />
    <None Include="Assets\FlatKit\Shaders\LightPlane.shader" />
@@ -1403,14 +1418,14 @@
      <HintPath>Library\ScriptAssemblies\Unity.2D.Tilemap.Editor.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Unity.InputSystem.ForUI">
-      <HintPath>Library\ScriptAssemblies\Unity.InputSystem.ForUI.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="Unity.Profiling.Core">
      <HintPath>Library\ScriptAssemblies\Unity.Profiling.Core.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="Unity.InputSystem.ForUI">
+      <HintPath>Library\ScriptAssemblies\Unity.InputSystem.ForUI.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
    <Reference Include="Unity.RenderPipelines.GPUDriven.Runtime">
      <HintPath>Library\ScriptAssemblies\Unity.RenderPipelines.GPUDriven.Runtime.dll</HintPath>
      <Private>False</Private>
@@ -1721,9 +1736,15 @@
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="CFXR.WelcomeScreen.csproj" />
+    <ProjectReference Include="CFXRRuntime.csproj" />
    <ProjectReference Include="Unity.RenderPipelines.Universal.Runtime.csproj" />
    <ProjectReference Include="FlatKit.Utils.Editor.csproj" />
+    <ProjectReference Include="CFXREditor.csproj" />
+    <ProjectReference Include="KinoBloom.Runtime.csproj" />
    <ProjectReference Include="ExternAttributes.Editor.csproj" />
+    <ProjectReference Include="ToonyColorsPro.Demo.Editor.csproj" />
+    <ProjectReference Include="CFXRDemo.csproj" />
  </ItemGroup>
  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
  <ItemGroup>
--- a/Assets/Animations/Monster
+++ b/Assets/Animations/Monster
--- a/Assets/Animations/Monster
+++ b/Assets/Animations/Monster
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5c4b0e294c51551499712a4aa2161713
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Animations/MonsterAnimationController.controller
+++ b/Assets/Animations/MonsterAnimationController.controller
@@ -120,7 +120,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 5005478036900451222, guid: bbfa9cc7ae2f16448b3adb4300f439e9, type: 3}
+  m_Motion: {fileID: 7400000, guid: 5c4b0e294c51551499712a4aa2161713, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
--- a/Assets/Animations/MonsterAnimationController_large.overrideController
+++ b/Assets/Animations/MonsterAnimationController_large.overrideController
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!221 &22100000
+AnimatorOverrideController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MonsterAnimationController_large
+  m_Controller: {fileID: 9100000, guid: 0a6254dd97e2e8a47ab5cd5c1a629717, type: 2}
+  m_Clips:
+  - m_OriginalClip: {fileID: -1923750366902163184, guid: 2632f2cc035d62d41bca411a318fbe36, type: 3}
+    m_OverrideClip: {fileID: 7400000, guid: df1a5739c2bbeb740bbbd5c3a4e28906, type: 2}
+  - m_OriginalClip: {fileID: 345275505875579249, guid: 2632f2cc035d62d41bca411a318fbe36, type: 3}
+    m_OverrideClip: {fileID: 7400000, guid: dd2f43caa654fa34683e02c96c7067f3, type: 2}
+  - m_OriginalClip: {fileID: 5005478036900451222, guid: bbfa9cc7ae2f16448b3adb4300f439e9, type: 3}
+    m_OverrideClip: {fileID: 7400000, guid: 69019833c251e144bbba158d4613e312, type: 2}
+  - m_OriginalClip: {fileID: -1640158340307531623, guid: e9bbf9eb253a2004aabc86fe90014c06, type: 3}
+    m_OverrideClip: {fileID: 7400000, guid: dce562c25d5792349a8702307d4ea9e3, type: 2}
--- a/Assets/Animations/MonsterAnimationController_large.overrideController.meta
+++ b/Assets/Animations/MonsterAnimationController_large.overrideController.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c43a01f9e8c8fc246b0c2d6b1515853a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 22100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Creep/Creep1.asset
+++ b/Assets/Data/ScriptableObjects/Creep/Creep1.asset
@@ -14,13 +14,13 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.CreepData
  id: 1
  memo: "\uAE30\uBCF81"
-  moveSpeed: 5
-  maxHp: 100
+  moveSpeed: 4
+  maxHp: 75
  sight: 6
-  atkRange: 3
-  atkDamage: 20
-  atkIntervalSec: 1.5
-  cost: 1
+  atkRange: 1
+  atkDamage: 10
+  atkIntervalSec: 2
+  cost: 2
  weight: 1
-  modelPath: Assets/Models/PlantWarrior.fbx
+  modelPath: Assets/Models/PlantWarrior_With_Spear.fbx
  animationControllerPath: Assets/Animations/MonsterAnimationController.controller
--- a/Assets/Data/ScriptableObjects/Creep/Creep2.asset
+++ b/Assets/Data/ScriptableObjects/Creep/Creep2.asset
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f7bb664a82feb0e43b3c5f459ca775f7, type: 3}
+  m_Name: Creep2
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.CreepData
+  id: 2
+  memo: "\uAE30\uBCF82"
+  moveSpeed: 3.5
+  maxHp: 50
+  sight: 6
+  atkRange: 4
+  atkDamage: 15
+  atkIntervalSec: 4
+  cost: 5
+  weight: 0.5
+  modelPath: Assets/Models/Rogue.fbx
+  animationControllerPath: Assets/Animations/MonsterAnimationController.controller
--- a/Assets/Data/ScriptableObjects/Creep/Creep2.asset.meta
+++ b/Assets/Data/ScriptableObjects/Creep/Creep2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3dc093d12ac8e94eac148cbdad689b4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Monster/Monster101.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster101.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 101
  memo: "Grunt(\uAE30\uBCF8)"
-  moveSpeed: 6.7
+  moveSpeed: 4.5
  maxHp: 75
  sight: 6
  atkRange: 1
@@ -22,7 +22,7 @@ MonoBehaviour:
  atkIntervalSec: 1.2
  cost: 3
  weight: 1
-  modelPath: Assets/Models/Skeleton_Minion.fbx
+  modelPath: Assets/Models/Skeleton_Minion_With_Sword.fbx
  animationControllerPath: Assets/Animations/MonsterAnimationController.controller
  waveMin: 1
  waveMax: 10
--- a/Assets/Data/ScriptableObjects/Monster/Monster102.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster102.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 102
  memo: "Tank(\uB290\uB9BC/\uB2E8\uB2E8)"
-  moveSpeed: 3.3
+  moveSpeed: 2.5
  maxHp: 125
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Monster/Monster103.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster103.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 103
  memo: "Ranged(\uC6D0\uAC70\uB9AC/\uC57D\uD568)"
-  moveSpeed: 5.3
+  moveSpeed: 3.5
  maxHp: 65
  sight: 6
  atkRange: 5
--- a/Assets/Data/ScriptableObjects/Monster/Monster104.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster104.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 104
  memo: "Fast(\uBE60\uB984/\uC57D\uD568)"
-  moveSpeed: 8.6
+  moveSpeed: 6
  maxHp: 45
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Monster/Monster105.asset
+++ b/Assets/Data/ScriptableObjects/Monster/Monster105.asset
@@ -14,7 +14,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.MonsterData
  id: 105
  memo: "Elite(\uC18C\uC218 \uC815\uC608)"
-  moveSpeed: 6.6
+  moveSpeed: 4.5
  maxHp: 100
  sight: 6
  atkRange: 1
--- a/Assets/Data/ScriptableObjects/Tower/Tower1.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower1.asset
@@ -18,15 +18,15 @@ MonoBehaviour:
  level: 1
  upgradeTo: 2
  towerType: attack
-  mana: 100
-  manpower: 10
+  mana: 150
+  manpower: 50
  sizeX: 4
  sizeY: 10
  sizeZ: 4
-  maxHp: 50
-  sight: 10
-  atkRange: 5
-  atkDamage: 3
+  maxHp: 100
+  sight: 15
+  atkRange: 10
+  atkDamage: 15
  atkIntervalSec: 2
  modelPath: Assets/Models/building_tower_B_blue.fbx
  prefab: {fileID: 8512676738329978770, guid: 3f7838db2c2fc424d9bd9a0d243b43be, type: 3}
--- a/Assets/Data/ScriptableObjects/Tower/Tower10.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower10.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 0
  towerType: defense
  mana: 150
-  manpower: 20
+  manpower: 50
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 110
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Tower/Tower2.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower2.asset
@@ -18,15 +18,15 @@ MonoBehaviour:
  level: 2
  upgradeTo: 3
  towerType: attack
-  mana: 200
-  manpower: 20
+  mana: 300
+  manpower: 60
  sizeX: 4
  sizeY: 10
  sizeZ: 4
-  maxHp: 75
-  sight: 10
-  atkRange: 10
-  atkDamage: 6
+  maxHp: 150
+  sight: 15
+  atkRange: 15
+  atkDamage: 20
  atkIntervalSec: 2
  modelPath: Assets/Models/building_tower_B_blue.fbx
  prefab: {fileID: 3671057791414486316, guid: ae9a9b515e1792a45887f0d967b943d6, type: 3}
--- a/Assets/Data/ScriptableObjects/Tower/Tower3.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower3.asset
@@ -18,15 +18,15 @@ MonoBehaviour:
  level: 3
  upgradeTo: 4
  towerType: attack
-  mana: 300
-  manpower: 30
+  mana: 450
+  manpower: 70
  sizeX: 4
  sizeY: 10
  sizeZ: 4
-  maxHp: 100
-  sight: 15
-  atkRange: 10
-  atkDamage: 9
+  maxHp: 200
+  sight: 20
+  atkRange: 15
+  atkDamage: 30
  atkIntervalSec: 2
  modelPath: Assets/Models/building_tower_B_blue.fbx
  prefab: {fileID: 5178364993341969979, guid: a8163f1921c918b4db0ca25636eef8f9, type: 3}
--- a/Assets/Data/ScriptableObjects/Tower/Tower4.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower4.asset
@@ -18,15 +18,15 @@ MonoBehaviour:
  level: 4
  upgradeTo: 5
  towerType: attack
-  mana: 400
-  manpower: 40
+  mana: 600
+  manpower: 80
  sizeX: 4
  sizeY: 10
  sizeZ: 4
-  maxHp: 150
-  sight: 15
-  atkRange: 15
-  atkDamage: 12
+  maxHp: 250
+  sight: 25
+  atkRange: 20
+  atkDamage: 40
  atkIntervalSec: 2
  modelPath: Assets/Models/building_tower_B_blue.fbx
  prefab: {fileID: 4171458273137159353, guid: 8430b50192177b8478a235db6987ae31, type: 3}
--- a/Assets/Data/ScriptableObjects/Tower/Tower5.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower5.asset
@@ -18,15 +18,15 @@ MonoBehaviour:
  level: 5
  upgradeTo: 0
  towerType: attack
-  mana: 500
-  manpower: 50
+  mana: 750
+  manpower: 100
  sizeX: 4
  sizeY: 10
  sizeZ: 4
-  maxHp: 200
-  sight: 20
-  atkRange: 15
-  atkDamage: 15
+  maxHp: 400
+  sight: 25
+  atkRange: 25
+  atkDamage: 50
  atkIntervalSec: 2
  modelPath: Assets/Models/building_tower_B_blue.fbx
  prefab: {fileID: 7839175078399552227, guid: 56b0a93f2c28474419ccd3d67c2af475, type: 3}
--- a/Assets/Data/ScriptableObjects/Tower/Tower7.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower7.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 8
  towerType: defense
  mana: 30
-  manpower: 10
+  manpower: 20
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 50
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Tower/Tower8.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower8.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 9
  towerType: defense
  mana: 50
-  manpower: 20
+  manpower: 30
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 60
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Tower/Tower9.asset
+++ b/Assets/Data/ScriptableObjects/Tower/Tower9.asset
@@ -19,11 +19,11 @@ MonoBehaviour:
  upgradeTo: 10
  towerType: defense
  mana: 100
-  manpower: 20
+  manpower: 40
  sizeX: 8
  sizeY: 4
  sizeZ: 3
-  maxHp: 30
+  maxHp: 80
  sight: 1
  atkRange: 0
  atkDamage: 0
--- a/Assets/Data/ScriptableObjects/Upgrade.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc09279707549e041ae0219468b0a4a2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade1.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade1.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade1
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 1
+  memo: "\uCCB4\uB825 \uC99D\uAC00 Lv.1"
+  upgradeCategory: combat
+  upgradeTarget: person
+  mana: 200
+  requireUpgradeId: 
+  effectStatList:
+  - player_max_hp
+  effectOpList:
+  - add
+  effectValueList:
+  - 50
+  sortOrder: 1
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade1.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade1.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b9e46f00da341b24ab07b314c89b7fd9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade10.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade10.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade10
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 10
+  memo: "\uB178\uB3D9\uB825 \uC99D\uAC00 Lv.1"
+  upgradeCategory: harvest
+  upgradeTarget: person
+  mana: 200
+  requireUpgradeId: 
+  effectStatList:
+  - player_manpower
+  effectOpList:
+  - add
+  effectValueList:
+  - 5
+  sortOrder: 10
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade10.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade10.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c665e2cbdd230c04fb6d3e9fac091a65
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade11.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade11.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade11
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 11
+  memo: "\uB178\uB3D9\uB825 \uC99D\uAC00 Lv.2"
+  upgradeCategory: harvest
+  upgradeTarget: person
+  mana: 300
+  requireUpgradeId: 0a000000
+  effectStatList:
+  - player_manpower
+  effectOpList:
+  - add
+  effectValueList:
+  - 10
+  sortOrder: 11
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade11.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade11.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f5ad1c8a4ecf84a43b7c609c58592295
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade12.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade12.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade12
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 12
+  memo: "\uB178\uB3D9\uB825 \uC99D\uAC00 Lv.3"
+  upgradeCategory: harvest
+  upgradeTarget: person
+  mana: 400
+  requireUpgradeId: 070000000a000000
+  effectStatList:
+  - player_manpower
+  effectOpList:
+  - add
+  effectValueList:
+  - 20
+  sortOrder: 12
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade12.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade12.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 555ef1e6ff58ee442953d075e417c091
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade13.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade13.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade13
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 13
+  memo: "\uC774\uB3D9\uC18D\uB3C4 \uC99D\uAC00 Lv.1"
+  upgradeCategory: scout
+  upgradeTarget: person
+  mana: 200
+  requireUpgradeId: 
+  effectStatList:
+  - player_move_speed
+  effectOpList:
+  - mul
+  effectValueList:
+  - 1.1
+  sortOrder: 13
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade13.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade13.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa2a6eecb804c3948a4fa7e75bacfca6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade14.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade14.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade14
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 14
+  memo: "\uC774\uB3D9\uC18D\uB3C4 \uC99D\uAC00 Lv.2"
+  upgradeCategory: scout
+  upgradeTarget: person
+  mana: 300
+  requireUpgradeId: 0d000000
+  effectStatList:
+  - player_move_speed
+  effectOpList:
+  - mul
+  effectValueList:
+  - 1.2
+  sortOrder: 14
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade14.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade14.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3216444533dfdc14891741f0b1c5a30a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade15.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade15.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade15
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 15
+  memo: "\uC774\uB3D9\uC18D\uB3C4 \uC99D\uAC00 Lv.3"
+  upgradeCategory: scout
+  upgradeTarget: person
+  mana: 400
+  requireUpgradeId: 0e000000
+  effectStatList:
+  - player_move_speed
+  effectOpList:
+  - mul
+  effectValueList:
+  - 1.3
+  sortOrder: 15
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade15.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade15.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 227e825691ca7c9498e4af4cbb592faa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade2.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade2.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade2
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 2
+  memo: "\uCCB4\uB825 \uC99D\uAC00 Lv.2"
+  upgradeCategory: combat
+  upgradeTarget: person
+  mana: 300
+  requireUpgradeId: 01000000
+  effectStatList:
+  - player_max_hp
+  effectOpList:
+  - add
+  effectValueList:
+  - 100
+  sortOrder: 2
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade2.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d989011e0aeec9a4b9ed3d9e49488c8a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade3.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade3.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade3
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 3
+  memo: "\uCCB4\uB825 \uC99D\uAC00 Lv.3"
+  upgradeCategory: combat
+  upgradeTarget: person
+  mana: 400
+  requireUpgradeId: 0200000005000000
+  effectStatList:
+  - player_max_hp
+  effectOpList:
+  - add
+  effectValueList:
+  - 150
+  sortOrder: 3
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade3.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 29b2206b90bc89c4183c6fb0a1bb699e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade4.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade4.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade4
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 4
+  memo: "\uACF5\uACA9\uB825 \uC99D\uAC00 Lv.1"
+  upgradeCategory: combat
+  upgradeTarget: person
+  mana: 200
+  requireUpgradeId: 
+  effectStatList:
+  - player_atk_damage
+  effectOpList:
+  - add
+  effectValueList:
+  - 5
+  sortOrder: 4
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade4.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade4.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4c370fa5d360b034b977fa923d14f60b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade5.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade5.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade5
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 5
+  memo: "\uACF5\uACA9\uB825 \uC99D\uAC00 Lv.2"
+  upgradeCategory: combat
+  upgradeTarget: person
+  mana: 300
+  requireUpgradeId: 04000000
+  effectStatList:
+  - player_atk_damage
+  effectOpList:
+  - add
+  effectValueList:
+  - 10
+  sortOrder: 5
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade5.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade5.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 49e9bbb379a103741bca937c322db0cb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade6.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade6.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade6
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 6
+  memo: "\uACF5\uACA9\uB825 \uC99D\uAC00 Lv.3"
+  upgradeCategory: combat
+  upgradeTarget: person
+  mana: 400
+  requireUpgradeId: 0200000005000000
+  effectStatList:
+  - player_atk_damage
+  effectOpList:
+  - add
+  effectValueList:
+  - 15
+  sortOrder: 6
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade6.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade6.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c6178f649bd6ad141888fb39c653bda9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade7.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade7.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade7
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 7
+  memo: "\uC790\uC6D0 \uCD5C\uB300 \uC6A9\uB7C9 \uC99D\uAC00 Lv.1"
+  upgradeCategory: harvest
+  upgradeTarget: person
+  mana: 200
+  requireUpgradeId: 
+  effectStatList:
+  - player_capacity
+  effectOpList:
+  - add
+  effectValueList:
+  - 20
+  sortOrder: 7
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade7.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade7.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 36cdb899e627bd54092fa9e4458ff6d2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade8.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade8.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade8
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 8
+  memo: "\uC790\uC6D0 \uCD5C\uB300 \uC6A9\uB7C9 \uC99D\uAC00 Lv.2"
+  upgradeCategory: harvest
+  upgradeTarget: person
+  mana: 300
+  requireUpgradeId: 07000000
+  effectStatList:
+  - player_capacity
+  effectOpList:
+  - add
+  effectValueList:
+  - 50
+  sortOrder: 8
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade8.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade8.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9e8418449515bb142b06d88d7a0ac4e1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade9.asset
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade9.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f134815569ad014e9ccc81ddc443c4c, type: 3}
+  m_Name: Upgrade9
+  m_EditorClassIdentifier: Assembly-CSharp::Northbound.Data.UpgradeData
+  id: 9
+  memo: "\uC790\uC6D0 \uCD5C\uB300 \uC6A9\uB7C9 \uC99D\uAC00 Lv.3"
+  upgradeCategory: harvest
+  upgradeTarget: person
+  mana: 400
+  requireUpgradeId: 070000000a000000
+  effectStatList:
+  - player_capacity
+  effectOpList:
+  - add
+  effectValueList:
+  - 100
+  sortOrder: 9
--- a/Assets/Data/ScriptableObjects/Upgrade/Upgrade9.asset.meta
+++ b/Assets/Data/ScriptableObjects/Upgrade/Upgrade9.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: eca8a6e3f11a84f44aa061493293e791
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Data/Scripts/DataClasses/TowerDataExtensions.cs
+++ b/Assets/Data/Scripts/DataClasses/TowerDataExtensions.cs
@@ -34,19 +34,19 @@ namespace Northbound.Data
        public EquipmentData constructionEquipment;

        [Header("Properties for convenience")]
-        public int width => sizeX;
-        public int length => sizeY;
-        public float height => sizeZ;  // height는 sizeZ로 수정
+        public int width => sizeX;      // X축
+        public int length => sizeZ;     // Z축 (깊이)
+        public float height => sizeY;   // Y축 (높이)
        public int maxHealth => maxHp;
-        public float visionRange => atkRange;
+        public float visionRange => sight;
        public float requiredWorkAmount => manpower;

        public Vector3 GetSize(int rotation)
        {
            bool isRotated = (rotation == 1 || rotation == 3);
            float w = isRotated ? length : width;
-            float l = isRotated ? width : length;
-            return new Vector3(w, sizeZ, l);  // 세 번째 차원도 sizeZ 사용
+            float d = isRotated ? width : length;
+            return new Vector3(w, height, d);  // (width, height, depth)
        }
    }
 }
--- a/Assets/Data/Scripts/DataClasses/UpgradeData.cs
+++ b/Assets/Data/Scripts/DataClasses/UpgradeData.cs
@@ -18,8 +18,6 @@ namespace Northbound.Data
        public string upgradeCategory;
        /// <summary>업그레이드 대상   • person   • share</summary>
        public string upgradeTarget;
-        /// <summary>건물 구분   • core   • barrack</summary>
-        public string upgradeShop;
        /// <summary>건설 비용 (mana=20)(mana=50; iron=10)</summary>
        public int mana;
        /// <summary>선행 조건 ID (목록)</summary>
--- a/Assets/Data/Templates/CreepTemplate.prefab
+++ b/Assets/Data/Templates/CreepTemplate.prefab
@@ -104,8 +104,10 @@ MonoBehaviour:
  ShowTopMostFoldoutHeaderGroup: 1
  enemyTeam: 2
  maxHealth: 100
-  damageEffectPrefab: {fileID: 0}
-  destroyEffectPrefab: {fileID: 0}
+  damageEffectPrefab: {fileID: 4021103657954561961, guid: 5c755f9bc5253ea418e919994537dcc7, type: 3}
+  destroyEffectPrefab: {fileID: 141433446842962269, guid: 9fe8f8b3288e45a44af36ff8aa04486e, type: 3}
+  showHealthBar: 1
+  healthBarPrefab: {fileID: 100000, guid: 8e7a5b12c9f8a4a5ba3c8d1f2e5a7b9c, type: 3}
 --- !u!195 &4485945348237935463
 NavMeshAgent:
  m_ObjectHideFlags: 0
--- a/Assets/Data/Templates/MonsterTemplate.prefab
+++ b/Assets/Data/Templates/MonsterTemplate.prefab
@@ -104,8 +104,10 @@ MonoBehaviour:
  ShowTopMostFoldoutHeaderGroup: 1
  enemyTeam: 3
  maxHealth: 100
-  damageEffectPrefab: {fileID: 0}
-  destroyEffectPrefab: {fileID: 0}
+  damageEffectPrefab: {fileID: 4021103657954561961, guid: 5c755f9bc5253ea418e919994537dcc7, type: 3}
+  destroyEffectPrefab: {fileID: 141433446842962269, guid: 9fe8f8b3288e45a44af36ff8aa04486e, type: 3}
+  showHealthBar: 1
+  healthBarPrefab: {fileID: 100000, guid: 8e7a5b12c9f8a4a5ba3c8d1f2e5a7b9c, type: 3}
 --- !u!195 &4485945348237935463
 NavMeshAgent:
  m_ObjectHideFlags: 0
--- a/Assets/Data/Templates/TowerTemplate.prefab
+++ b/Assets/Data/Templates/TowerTemplate.prefab
@@ -15,7 +15,7 @@ GameObject:
  - component: {fileID: -4086363217010332088}
  - component: {fileID: 4822792797652874450}
  - component: {fileID: -6756709031183627887}
-  m_Layer: 0
+  m_Layer: 7
  m_Name: TowerTemplate
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@@ -119,9 +119,9 @@ MonoBehaviour:
  initialOwnerId: 0
  useInitialOwner: 0
  showHealthBar: 1
-  healthBarPrefab: {fileID: 0}
-  destroyEffectPrefab: {fileID: 0}
-  damageEffectPrefab: {fileID: 0}
+  healthBarPrefab: {fileID: 100000, guid: 8e7a5b12c9f8a4a5ba3c8d1f2e5a7b9c, type: 3}
+  destroyEffectPrefab: {fileID: 8656522925564163052, guid: e509867be4f82f246a95eca1ee5a2d61, type: 3}
+  damageEffectPrefab: {fileID: 1429954232896169633, guid: 83036083a4ebcd34f98131bd3cf6f4d2, type: 3}
  effectSpawnPoint: {fileID: 0}
  showGridBounds: 1
  gridBoundsColor: {r: 0, g: 1, b: 1, a: 1}
--- a/Assets/DefaultNetworkPrefabs.asset
+++ b/Assets/DefaultNetworkPrefabs.asset
@@ -209,3 +209,8 @@ MonoBehaviour:
    SourcePrefabToOverride: {fileID: 0}
    SourceHashToOverride: 0
    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 8411033062678718070, guid: 1b51c70b826d97d47bb851e2d8ff758f, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
--- a/Assets/External/JMO
+++ b/Assets/External/JMO
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 976974e4d3018034e87caeb9f51f20f6
--- a/effects).unitypackage
+++ b/effects).unitypackage
--- a/effects).unitypackage.meta
+++ b/effects).unitypackage.meta
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: b18b93d4b5d00384ba417df18aeac5a3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX FREE (old legacy effects).unitypackage
+  uploadId: 836238
--- a/Assets/External/JMO
+++ b/Assets/External/JMO
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b56551e9e3ab84e4180b7b30c06ff232
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/External/JMO
+++ b/Assets/External/JMO
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd9d1d014bf0b14428db03b2527d2d93
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/External/JMO
+++ b/Assets/External/JMO
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1a426d2ed10d55c47b7aee95ace55b60
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/External/JMO
+++ b/Assets/External/JMO
@@ -0,0 +1,14 @@
+{
+    "name": "CFXREditor",
+    "references": [],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
+}
--- a/Assets/External/JMO
+++ b/Assets/External/JMO
@@ -0,0 +1,14 @@
+fileFormatVersion: 2
+guid: eb5cb7c323a395242a81960087292f3c
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor/CFXR Editor.asmdef
+  uploadId: 836238
--- a/Assets/Editor/CFXR_ExpressionParser.cs
+++ b/Assets/Editor/CFXR_ExpressionParser.cs
@@ -0,0 +1,275 @@
+//--------------------------------------------------------------------------------------------------------------------------------
+// Cartoon FX
+// (c) 2012-2025 Jean Moreno
+//--------------------------------------------------------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.IO;
+
+// Parse conditional expressions from CFXR_MaterialInspector to show/hide some parts of the UI easily
+
+namespace CartoonFX
+{
+	public static class ExpressionParser
+	{
+		public delegate bool EvaluateFunction(string content);
+
+		//--------------------------------------------------------------------------------------------------------------------------------
+		// Main Function to use
+
+		static public bool EvaluateExpression(string expression, EvaluateFunction evalFunction)
+		{
+			//Remove white spaces and double && ||
+			string cleanExpr = "";
+			for(int i = 0; i < expression.Length; i++)
+			{
+				switch(expression[i])
+				{
+					case ' ': break;
+					case '&': cleanExpr += expression[i]; i++; break;
+					case '|': cleanExpr += expression[i]; i++; break;
+					default: cleanExpr += expression[i]; break;
+				}
+			}
+
+			List<Token> tokens = new List<Token>();
+			StringReader reader = new StringReader(cleanExpr);
+			Token t = null;
+			do
+			{
+				t = new Token(reader);
+				tokens.Add(t);
+			} while(t.type != Token.TokenType.EXPR_END);
+
+			List<Token> polishNotation = Token.TransformToPolishNotation(tokens);
+
+			var enumerator = polishNotation.GetEnumerator();
+			enumerator.MoveNext();
+			Expression root = MakeExpression(ref enumerator, evalFunction);
+
+			return root.Evaluate();
+		}
+
+		//--------------------------------------------------------------------------------------------------------------------------------
+		// Expression Token
+
+		public class Token
+		{
+			static Dictionary<char, KeyValuePair<TokenType, string>> typesDict = new Dictionary<char, KeyValuePair<TokenType, string>>()
+			{
+				{'(', new KeyValuePair<TokenType, string>(TokenType.OPEN_PAREN, "(")},
+				{')', new KeyValuePair<TokenType, string>(TokenType.CLOSE_PAREN, ")")},
+				{'!', new KeyValuePair<TokenType, string>(TokenType.UNARY_OP, "NOT")},
+				{'&', new KeyValuePair<TokenType, string>(TokenType.BINARY_OP, "AND")},
+				{'|', new KeyValuePair<TokenType, string>(TokenType.BINARY_OP, "OR")}
+			};
+
+			public enum TokenType
+			{
+				OPEN_PAREN,
+				CLOSE_PAREN,
+				UNARY_OP,
+				BINARY_OP,
+				LITERAL,
+				EXPR_END
+			}
+
+			public TokenType type;
+			public string value;
+
+			public Token(StringReader s)
+			{
+				int c = s.Read();
+				if(c == -1)
+				{
+					type = TokenType.EXPR_END;
+					value = "";
+					return;
+				}
+
+				char ch = (char)c;
+
+				//Special case: solve bug where !COND_FALSE_1 && COND_FALSE_2 would return True
+				bool embeddedNot = (ch == '!' && s.Peek() != '(');
+
+				if(typesDict.ContainsKey(ch) && !embeddedNot)
+				{
+					type = typesDict[ch].Key;
+					value = typesDict[ch].Value;
+				}
+				else
+				{
+					string str = "";
+					str += ch;
+					while(s.Peek() != -1 && !typesDict.ContainsKey((char)s.Peek()))
+					{
+						str += (char)s.Read();
+					}
+					type = TokenType.LITERAL;
+					value = str;
+				}
+			}
+
+			static public List<Token> TransformToPolishNotation(List<Token> infixTokenList)
+			{
+				Queue<Token> outputQueue = new Queue<Token>();
+				Stack<Token> stack = new Stack<Token>();
+
+				int index = 0;
+				while(infixTokenList.Count > index)
+				{
+					Token t = infixTokenList[index];
+
+					switch(t.type)
+					{
+						case Token.TokenType.LITERAL:
+							outputQueue.Enqueue(t);
+							break;
+						case Token.TokenType.BINARY_OP:
+						case Token.TokenType.UNARY_OP:
+						case Token.TokenType.OPEN_PAREN:
+							stack.Push(t);
+							break;
+						case Token.TokenType.CLOSE_PAREN:
+							while(stack.Peek().type != Token.TokenType.OPEN_PAREN)
+							{
+								outputQueue.Enqueue(stack.Pop());
+							}
+							stack.Pop();
+							if(stack.Count > 0 && stack.Peek().type == Token.TokenType.UNARY_OP)
+							{
+								outputQueue.Enqueue(stack.Pop());
+							}
+							break;
+						default:
+							break;
+					}
+
+					index++;
+				}
+				while(stack.Count > 0)
+				{
+					outputQueue.Enqueue(stack.Pop());
+				}
+
+				var list = new List<Token>(outputQueue);
+				list.Reverse();
+				return list;
+			}
+		}
+
+		//--------------------------------------------------------------------------------------------------------------------------------
+		// Boolean Expression Classes
+
+		public abstract class Expression
+		{
+			public abstract bool Evaluate();
+		}
+
+		public class ExpressionLeaf : Expression
+		{
+			private string content;
+			private EvaluateFunction evalFunction;
+
+			public ExpressionLeaf(EvaluateFunction _evalFunction, string _content)
+			{
+				this.evalFunction = _evalFunction;
+				this.content = _content;
+			}
+
+			override public bool Evaluate()
+			{
+				//embedded not, see special case in Token declaration
+				if(content.StartsWith("!"))
+				{
+					return !this.evalFunction(content.Substring(1));
+				}
+
+				return this.evalFunction(content);
+			}
+		}
+
+		public class ExpressionAnd : Expression
+		{
+			private Expression left;
+			private Expression right;
+
+			public ExpressionAnd(Expression _left, Expression _right)
+			{
+				this.left = _left;
+				this.right = _right;
+			}
+
+			override public bool Evaluate()
+			{
+				return left.Evaluate() && right.Evaluate();
+			}
+		}
+
+		public class ExpressionOr : Expression
+		{
+			private Expression left;
+			private Expression right;
+
+			public ExpressionOr(Expression _left, Expression _right)
+			{
+				this.left = _left;
+				this.right = _right;
+			}
+
+			override public bool Evaluate()
+			{
+				return left.Evaluate() || right.Evaluate();
+			}
+		}
+
+		public class ExpressionNot : Expression
+		{
+			private Expression expr;
+
+			public ExpressionNot(Expression _expr)
+			{
+				this.expr = _expr;
+			}
+
+			override public bool Evaluate()
+			{
+				return !expr.Evaluate();
+			}
+		}
+
+		static public Expression MakeExpression(ref List<Token>.Enumerator polishNotationTokensEnumerator, EvaluateFunction _evalFunction)
+		{
+			if(polishNotationTokensEnumerator.Current.type == Token.TokenType.LITERAL)
+			{
+				Expression lit = new ExpressionLeaf(_evalFunction, polishNotationTokensEnumerator.Current.value);
+				polishNotationTokensEnumerator.MoveNext();
+				return lit;
+			}
+			else
+			{
+				if(polishNotationTokensEnumerator.Current.value == "NOT")
+				{
+					polishNotationTokensEnumerator.MoveNext();
+					Expression operand = MakeExpression(ref polishNotationTokensEnumerator, _evalFunction);
+					return new ExpressionNot(operand);
+				}
+				else if(polishNotationTokensEnumerator.Current.value == "AND")
+				{
+					polishNotationTokensEnumerator.MoveNext();
+					Expression left = MakeExpression(ref polishNotationTokensEnumerator, _evalFunction);
+					Expression right = MakeExpression(ref polishNotationTokensEnumerator, _evalFunction);
+					return new ExpressionAnd(left, right);
+				}
+				else if(polishNotationTokensEnumerator.Current.value == "OR")
+				{
+					polishNotationTokensEnumerator.MoveNext();
+					Expression left = MakeExpression(ref polishNotationTokensEnumerator, _evalFunction);
+					Expression right = MakeExpression(ref polishNotationTokensEnumerator, _evalFunction);
+					return new ExpressionOr(left, right);
+				}
+			}
+			return null;
+		}
+	}
+}
--- a/Assets/Editor/CFXR_ExpressionParser.cs.meta
+++ b/Assets/Editor/CFXR_ExpressionParser.cs.meta
@@ -0,0 +1,17 @@
+fileFormatVersion: 2
+guid: ce7d96d3a4d4f3b4681ab437a9710d60
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor/CFXR_ExpressionParser.cs
+  uploadId: 836238
--- a/Assets/Editor/CFXR_MaterialInspector.cs
+++ b/Assets/Editor/CFXR_MaterialInspector.cs
@@ -0,0 +1,604 @@
+//--------------------------------------------------------------------------------------------------------------------------------
+// Cartoon FX
+// (c) 2012-2025 Jean Moreno
+//--------------------------------------------------------------------------------------------------------------------------------
+
+using UnityEngine;
+using UnityEditor;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.RegularExpressions;
+
+// Custom material inspector for Stylized FX shaders
+// - organize UI using comments in the shader code
+// - more flexibility than the material property drawers
+// version 2 (dec 2017)
+
+namespace CartoonFX
+{
+	public class MaterialInspector : ShaderGUI
+	{
+		//Set by PropertyDrawers to defined if the next properties should be visible
+		static private Stack<bool> ShowStack = new Stack<bool>();
+
+		static public bool ShowNextProperty { get; private set; }
+		static public void PushShowProperty(bool value)
+		{
+			ShowStack.Push(ShowNextProperty);
+			ShowNextProperty &= value;
+		}
+		static public void PopShowProperty()
+		{
+			ShowNextProperty = ShowStack.Pop();
+		}
+
+		//--------------------------------------------------------------------------------------------------
+
+		const string kGuiCommandPrefix = "//#";
+		const string kGC_IfKeyword = "IF_KEYWORD";
+		const string kGC_IfProperty = "IF_PROPERTY";
+		const string kGC_EndIf = "END_IF";
+		const string kGC_HelpBox = "HELP_BOX";
+		const string kGC_Label = "LABEL";
+
+		Dictionary<int, List<GUICommand>> guiCommands = new Dictionary<int, List<GUICommand>>();
+
+		bool initialized = false;
+		AssetImporter shaderImporter;
+		ulong lastTimestamp;
+		void Initialize(MaterialEditor editor, bool force)
+		{
+			if((!initialized || force) && editor != null)
+			{
+				initialized = true;
+
+				guiCommands.Clear();
+
+				//Find the shader and parse the source to find special comments that will organize the GUI
+				//It's hackish, but at least it allows any character to be used (unlike material property drawers/decorators) and can be used along with property drawers
+
+				var materials = new List<Material>();
+				foreach(var o in editor.targets)
+				{
+					var m = o as Material;
+					if(m != null)
+						materials.Add(m);
+				}
+				if(materials.Count > 0 && materials[0].shader != null)
+				{
+					var path = AssetDatabase.GetAssetPath(materials[0].shader);
+					//get asset importer
+					shaderImporter = AssetImporter.GetAtPath(path);
+					if(shaderImporter != null)
+					{
+						lastTimestamp = shaderImporter.assetTimeStamp;
+					}
+					//remove 'Assets' and replace with OS path
+					path = Application.dataPath + path.Substring(6);
+					//convert to cross-platform path
+					path = path.Replace('/', Path.DirectorySeparatorChar);
+					//open file for reading
+					var lines = File.ReadAllLines(path);
+
+					bool insideProperties = false;
+					//regex pattern to find properties, as they need to be counted so that
+					//special commands can be inserted at the right position when enumerating them
+					var regex = new Regex(@"[a-zA-Z0-9_]+\s*\([^\)]*\)");
+					int propertyCount = 0;
+					bool insideCommentBlock = false;
+					foreach(var l in lines)
+					{
+						var line = l.TrimStart();
+
+						if(insideProperties)
+						{
+							bool isComment = line.StartsWith("//");
+
+							if(line.Contains("/*"))
+								insideCommentBlock = true;
+							if(line.Contains("*/"))
+								insideCommentBlock = false;
+
+							//finished properties block?
+							if(line.StartsWith("}"))
+								break;
+
+							//comment
+							if(line.StartsWith(kGuiCommandPrefix))
+							{
+								string command = line.Substring(kGuiCommandPrefix.Length).TrimStart();
+								//space
+								if(string.IsNullOrEmpty(command))
+									AddGUICommand(propertyCount, new GC_Space());
+								//separator
+								else if(command.StartsWith("---"))
+									AddGUICommand(propertyCount, new GC_Separator());
+								//separator
+								else if(command.StartsWith("==="))
+									AddGUICommand(propertyCount, new GC_SeparatorDouble());
+								//if keyword
+								else if(command.StartsWith(kGC_IfKeyword))
+								{
+									var expr = command.Substring(command.LastIndexOf(kGC_IfKeyword) + kGC_IfKeyword.Length + 1);
+									AddGUICommand(propertyCount, new GC_IfKeyword() { expression = expr, materials = materials.ToArray() });
+								}
+								//if property
+								else if(command.StartsWith(kGC_IfProperty))
+								{
+									var expr = command.Substring(command.LastIndexOf(kGC_IfProperty) + kGC_IfProperty.Length + 1);
+									AddGUICommand(propertyCount, new GC_IfProperty() { expression = expr, materials = materials.ToArray() });
+								}
+								//end if
+								else if(command.StartsWith(kGC_EndIf))
+								{
+									AddGUICommand(propertyCount, new GC_EndIf());
+								}
+								//help box
+								else if(command.StartsWith(kGC_HelpBox))
+								{
+									var messageType = MessageType.Error;
+									var message = "Invalid format for HELP_BOX:\n" + command;
+									var cmd = command.Substring(command.LastIndexOf(kGC_HelpBox) + kGC_HelpBox.Length + 1).Split(new string[] { "::" }, System.StringSplitOptions.RemoveEmptyEntries);
+									if(cmd.Length == 1)
+									{
+										message = cmd[0];
+										messageType = MessageType.None;
+									}
+									else if(cmd.Length == 2)
+									{
+										try
+										{
+											var msgType = (MessageType)System.Enum.Parse(typeof(MessageType), cmd[0], true);
+											message = cmd[1].Replace("  ", "\n");
+											messageType = msgType;
+										}
+										catch { }
+									}
+									
+									AddGUICommand(propertyCount, new GC_HelpBox()
+									{
+										message = message,
+										messageType = messageType
+									});
+								}
+								//label
+								else if(command.StartsWith(kGC_Label))
+								{
+									var label = command.Substring(command.LastIndexOf(kGC_Label) + kGC_Label.Length + 1);
+									AddGUICommand(propertyCount, new GC_Label() { label = label });
+								}
+								//header: plain text after command
+								else
+								{
+									AddGUICommand(propertyCount, new GC_Header() { label = command });
+								}
+							}
+							else
+							//property
+							{
+								if(regex.IsMatch(line) && !insideCommentBlock && !isComment)
+									propertyCount++;
+							}
+						}
+
+						//start properties block?
+						if(line.StartsWith("Properties"))
+						{
+							insideProperties = true;
+						}
+					}
+				}
+			}
+		}
+
+		void AddGUICommand(int propertyIndex, GUICommand command)
+		{
+			if(!guiCommands.ContainsKey(propertyIndex))
+				guiCommands.Add(propertyIndex, new List<GUICommand>());
+
+			guiCommands[propertyIndex].Add(command);
+		}
+
+		public override void AssignNewShaderToMaterial(Material material, Shader oldShader, Shader newShader)
+		{
+			initialized = false;
+			base.AssignNewShaderToMaterial(material, oldShader, newShader);
+		}
+
+		public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
+		{
+			//init:
+			//- read metadata in properties comment to generate ui layout
+			//- force update if timestamp doesn't match last (= file externally updated)
+			bool force = (shaderImporter != null && shaderImporter.assetTimeStamp != lastTimestamp);
+			Initialize(materialEditor, force);
+
+			var shader = (materialEditor.target as Material).shader;
+			materialEditor.SetDefaultGUIWidths();
+
+			//show all properties by default
+			ShowNextProperty = true;
+			ShowStack.Clear();
+
+			for(int i = 0; i < properties.Length; i++)
+			{
+				if(guiCommands.ContainsKey(i))
+				{
+					for(int j = 0; j < guiCommands[i].Count; j++)
+					{
+						guiCommands[i][j].OnGUI();
+					}
+				}
+
+				//Use custom properties to enable/disable groups based on keywords
+				if(ShowNextProperty)
+				{
+#if UNITY_6000_1_OR_NEWER
+					if((properties[i].propertyFlags & (UnityEngine.Rendering.ShaderPropertyFlags.HideInInspector | UnityEngine.Rendering.ShaderPropertyFlags.PerRendererData)) == UnityEngine.Rendering.ShaderPropertyFlags.None)
+#else
+					if((properties[i].flags & (MaterialProperty.PropFlags.HideInInspector | MaterialProperty.PropFlags.PerRendererData)) == MaterialProperty.PropFlags.None)
+#endif
+					{
+						DisplayProperty(properties[i], materialEditor);
+					}
+				}
+			}
+
+			//make sure to show gui commands that are after properties
+			int index = properties.Length;
+			if(guiCommands.ContainsKey(index))
+			{
+				for(int j = 0; j < guiCommands[index].Count; j++)
+				{
+					guiCommands[index][j].OnGUI();
+				}
+			}
+
+			//Special fields
+			Styles.MaterialDrawSeparatorDouble();
+			materialEditor.RenderQueueField();
+			materialEditor.EnableInstancingField();
+		}
+
+		virtual protected void DisplayProperty(MaterialProperty property, MaterialEditor materialEditor)
+		{
+			float propertyHeight = materialEditor.GetPropertyHeight(property, property.displayName);
+			Rect controlRect = EditorGUILayout.GetControlRect(true, propertyHeight, EditorStyles.layerMaskField, new GUILayoutOption[0]);
+			materialEditor.ShaderProperty(controlRect, property, property.displayName);
+		}
+	}
+
+	// Same as Toggle drawer, but doesn't set any keyword
+	// This will avoid adding unnecessary shader keyword to the project
+	internal class MaterialToggleNoKeywordDrawer : MaterialPropertyDrawer
+	{
+		private static bool IsPropertyTypeSuitable(MaterialProperty prop)
+		{
+#if UNITY_6000_1_OR_NEWER
+			return prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Float || prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Range;
+#else
+			return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range;
+#endif
+		}
+
+		public override float GetPropertyHeight(MaterialProperty prop, string label, MaterialEditor editor)
+		{
+			float height;
+			if (!MaterialToggleNoKeywordDrawer.IsPropertyTypeSuitable(prop))
+			{
+				height = 40f;
+			}
+			else
+			{
+				height = base.GetPropertyHeight(prop, label, editor);
+			}
+			return height;
+		}
+
+		public override void OnGUI(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
+		{
+			if (!MaterialToggleNoKeywordDrawer.IsPropertyTypeSuitable(prop))
+			{
+				EditorGUI.HelpBox(position, "Toggle used on a non-float property: " + prop.name, MessageType.Warning);
+			}
+			else
+			{
+				EditorGUI.BeginChangeCheck();
+				bool flag = Mathf.Abs(prop.floatValue) > 0.001f;
+				EditorGUI.showMixedValue = prop.hasMixedValue;
+				flag = EditorGUI.Toggle(position, label, flag);
+				EditorGUI.showMixedValue = false;
+				if (EditorGUI.EndChangeCheck())
+				{
+					prop.floatValue = ((!flag) ? 0f : 1f);
+				}
+			}
+		}
+	}
+
+	// Same as KeywordEnum drawer, but uses the keyword supplied as is rather than adding a prefix to them
+	internal class MaterialKeywordEnumNoPrefixDrawer : MaterialPropertyDrawer
+	{
+		private readonly GUIContent[] labels;
+		private readonly string[] keywords;
+
+		public MaterialKeywordEnumNoPrefixDrawer(string lbl1, string kw1) : this(new[] { lbl1 }, new[] { kw1 }) { }
+		public MaterialKeywordEnumNoPrefixDrawer(string lbl1, string kw1, string lbl2, string kw2) : this(new[] { lbl1, lbl2 }, new[] { kw1, kw2 }) { }
+		public MaterialKeywordEnumNoPrefixDrawer(string lbl1, string kw1, string lbl2, string kw2, string lbl3, string kw3) : this(new[] { lbl1, lbl2, lbl3 }, new[] { kw1, kw2, kw3 }) { }
+		public MaterialKeywordEnumNoPrefixDrawer(string lbl1, string kw1, string lbl2, string kw2, string lbl3, string kw3, string lbl4, string kw4) : this(new[] { lbl1, lbl2, lbl3, lbl4 }, new[] { kw1, kw2, kw3, kw4 }) { }
+		public MaterialKeywordEnumNoPrefixDrawer(string lbl1, string kw1, string lbl2, string kw2, string lbl3, string kw3, string lbl4, string kw4, string lbl5, string kw5) : this(new[] { lbl1, lbl2, lbl3, lbl4, lbl5 }, new[] { kw1, kw2, kw3, kw4, kw5 }) { }
+		public MaterialKeywordEnumNoPrefixDrawer(string lbl1, string kw1, string lbl2, string kw2, string lbl3, string kw3, string lbl4, string kw4, string lbl5, string kw5, string lbl6, string kw6) : this(new[] { lbl1, lbl2, lbl3, lbl4, lbl5, lbl6 }, new[] { kw1, kw2, kw3, kw4, kw5, kw6 }) { }
+
+		public MaterialKeywordEnumNoPrefixDrawer(string[] labels, string[] keywords)
+		{
+			this.labels= new GUIContent[keywords.Length];
+			this.keywords = new string[keywords.Length];
+			for (int i = 0; i < keywords.Length; ++i)
+			{
+				this.labels[i] = new GUIContent(labels[i]);
+				this.keywords[i] = keywords[i];
+			}
+		}
+
+		static bool IsPropertyTypeSuitable(MaterialProperty prop)
+		{
+#if UNITY_6000_1_OR_NEWER
+			return prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Float || prop.propertyType == UnityEngine.Rendering.ShaderPropertyType.Range;
+#else
+			return prop.type == MaterialProperty.PropType.Float || prop.type == MaterialProperty.PropType.Range;
+#endif
+		}
+
+		void SetKeyword(MaterialProperty prop, int index)
+		{
+			for (int i = 0; i < keywords.Length; ++i)
+			{
+				string keyword = GetKeywordName(prop.name, keywords[i]);
+				foreach (Material material in prop.targets)
+				{
+					if (index == i)
+						material.EnableKeyword(keyword);
+					else
+						material.DisableKeyword(keyword);
+				}
+			}
+		}
+
+		public override float GetPropertyHeight(MaterialProperty prop, string label, MaterialEditor editor)
+		{
+			if (!IsPropertyTypeSuitable(prop))
+			{
+				return EditorGUIUtility.singleLineHeight * 2.5f;
+			}
+			return base.GetPropertyHeight(prop, label, editor);
+		}
+
+		public override void OnGUI(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
+		{
+			if (!IsPropertyTypeSuitable(prop))
+			{
+				EditorGUI.HelpBox(position, "Toggle used on a non-float property: " + prop.name, MessageType.Warning);
+				return;
+			}
+
+			EditorGUI.BeginChangeCheck();
+
+			EditorGUI.showMixedValue = prop.hasMixedValue;
+			var value = (int)prop.floatValue;
+			value = EditorGUI.Popup(position, label, value, labels);
+			EditorGUI.showMixedValue = false;
+			if (EditorGUI.EndChangeCheck())
+			{
+				prop.floatValue = value;
+				SetKeyword(prop, value);
+			}
+		}
+
+		public override void Apply(MaterialProperty prop)
+		{
+			base.Apply(prop);
+			if (!IsPropertyTypeSuitable(prop))
+				return;
+
+			if (prop.hasMixedValue)
+				return;
+
+			SetKeyword(prop, (int)prop.floatValue);
+		}
+
+		// Final keyword name: property name + "_" + display name. Uppercased,
+		// and spaces replaced with underscores.
+		private static string GetKeywordName(string propName, string name)
+		{
+			// Just return the supplied name
+			return name;
+
+			// Original code:
+			/*
+			string n = propName + "_" + name;
+			return n.Replace(' ', '_').ToUpperInvariant();
+			*/
+		}
+	}
+
+
+	//================================================================================================================================================================================================
+	// GUI Commands System
+	//
+	// Workaround to Material Property Drawers limitations:
+	// - uses shader comments to organize the GUI, and show/hide properties based on conditions
+	// - can use any character (unlike property drawers)
+	// - parsed once at material editor initialization
+
+	internal class GUICommand
+	{
+		public virtual bool Visible() { return true; }
+		public virtual void OnGUI() { }
+	}
+
+	internal class GC_Separator : GUICommand { public override void OnGUI() { if(MaterialInspector.ShowNextProperty) Styles.MaterialDrawSeparator(); } }
+	internal class GC_SeparatorDouble : GUICommand { public override void OnGUI() { if(MaterialInspector.ShowNextProperty) Styles.MaterialDrawSeparatorDouble(); } }
+	internal class GC_Space : GUICommand { public override void OnGUI() { if(MaterialInspector.ShowNextProperty) GUILayout.Space(8); } }
+	internal class GC_HelpBox : GUICommand
+	{
+		public string message { get; set; }
+		public MessageType messageType { get; set; }
+
+		public override void OnGUI()
+		{
+			if(MaterialInspector.ShowNextProperty)
+				Styles.HelpBoxRichText(message, messageType);
+		}
+	}
+	internal class GC_Header : GUICommand
+	{
+		public string label { get; set; }
+		GUIContent guiContent;
+
+		public override void OnGUI()
+		{
+			if(guiContent == null)
+				guiContent = new GUIContent(label);
+
+			if(MaterialInspector.ShowNextProperty)
+				Styles.MaterialDrawHeader(guiContent);
+		}
+	}
+	internal class GC_Label : GUICommand
+	{
+		public string label { get; set; }
+		GUIContent guiContent;
+
+		public override void OnGUI()
+		{
+			if(guiContent == null)
+				guiContent = new GUIContent(label);
+
+			if(MaterialInspector.ShowNextProperty)
+				GUILayout.Label(guiContent);
+		}
+	}
+	internal class GC_IfKeyword : GUICommand
+	{
+		public string expression { get; set; }
+		public Material[] materials { get; set; }
+		public override void OnGUI()
+		{
+			bool show = ExpressionParser.EvaluateExpression(expression, (string s) =>
+			{
+				foreach(var m in materials)
+				{
+					if(m.IsKeywordEnabled(s))
+						return true;
+				}
+				return false;
+			});
+			MaterialInspector.PushShowProperty(show);
+		}
+	}
+	internal class GC_EndIf : GUICommand { public override void OnGUI() { MaterialInspector.PopShowProperty(); } }
+
+	internal class GC_IfProperty : GUICommand
+	{
+		string _expression;
+		public string expression
+		{
+			get { return _expression; }
+			set { _expression = value.Replace("!=", "<>"); }
+		}
+		public Material[] materials { get; set; }
+
+		public override void OnGUI()
+		{
+			bool show = ExpressionParser.EvaluateExpression(expression, EvaluatePropertyExpression);
+			MaterialInspector.PushShowProperty(show);
+		}
+
+		bool EvaluatePropertyExpression(string expr)
+		{
+			//expression is expected to be in the form of: property operator value
+			var reader = new StringReader(expr);
+			string property = "";
+			string op = "";
+			float value = 0f;
+
+			int overflow = 0;
+			while(true)
+			{
+				char c = (char)reader.Read();
+
+				//operator
+				if(c == '=' || c == '>' || c == '<' || c == '!')
+				{
+					op += c;
+					//second operator character, if any
+					char c2 = (char)reader.Peek();
+					if(c2 == '=' || c2 == '>')
+					{
+						reader.Read();
+						op += c2;
+					}
+
+					//end of string is the value
+					var end = reader.ReadToEnd();
+					if(!float.TryParse(end, out value))
+					{
+						Debug.LogError("Couldn't parse float from property expression:\n" + end);
+						return false;
+					}
+
+					break;
+				}
+
+				//property name
+				property += c;
+
+				overflow++;
+				if(overflow >= 9999)
+				{
+					Debug.LogError("Expression parsing overflow!\n");
+					return false;
+				}
+			}
+
+			//evaluate property
+			bool conditionMet = false;
+			foreach(var m in materials)
+			{
+				float propValue = 0f;
+				if(property.Contains(".x") || property.Contains(".y") || property.Contains(".z") || property.Contains(".w"))
+				{
+					string[] split = property.Split('.');
+					string component = split[1];
+					switch(component)
+					{
+						case "x": propValue = m.GetVector(split[0]).x; break;
+						case "y": propValue = m.GetVector(split[0]).y; break;
+						case "z": propValue = m.GetVector(split[0]).z; break;
+						case "w": propValue = m.GetVector(split[0]).w; break;
+						default: Debug.LogError("Invalid component for vector property: '" + property + "'"); break;
+					}
+				}
+				else
+					propValue = m.GetFloat(property);
+
+				switch(op)
+				{
+					case ">=": conditionMet = propValue >= value; break;
+					case "<=": conditionMet = propValue <= value; break;
+					case ">": conditionMet = propValue > value; break;
+					case "<": conditionMet = propValue < value; break;
+					case "<>": conditionMet = propValue != value; break;	//not equal, "!=" is replaced by "<>" to prevent bug with leading ! ("not" operator)
+					case "==": conditionMet = propValue == value; break;
+					default:
+						Debug.LogError("Invalid property expression:\n" + expr);
+						break;
+				}
+				if(conditionMet)
+					return true;
+			}
+
+			return false;
+		}
+	}
+}
--- a/Assets/Editor/CFXR_MaterialInspector.cs.meta
+++ b/Assets/Editor/CFXR_MaterialInspector.cs.meta
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: 4fb4c15e772a1cc4baecc7a958bf9cc7
+timeCreated: 1486392341
+licenseType: Store
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor/CFXR_MaterialInspector.cs
+  uploadId: 836238
--- a/Assets/Editor/CFXR_ShaderImporter.cs
+++ b/Assets/Editor/CFXR_ShaderImporter.cs
@@ -0,0 +1,423 @@
+// #define SHOW_EXPORT_BUTTON
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Reflection;
+using UnityEditor;
+using UnityEditor.Rendering;
+using UnityEngine;
+#if UNITY_2020_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#else
+using UnityEditor.Experimental.AssetImporters;
+#endif
+using UnityEngine.Rendering;
+
+namespace CartoonFX
+{
+    namespace CustomShaderImporter
+    {
+        static class Utils
+        {
+            public static bool IsUsingURP()
+            {
+#if UNITY_2019_3_OR_NEWER
+                var renderPipeline = GraphicsSettings.currentRenderPipeline;
+#else
+                var renderPipeline = GraphicsSettings.renderPipelineAsset;
+#endif
+                return renderPipeline != null && renderPipeline.GetType().Name.Contains("Universal");
+            }
+        }
+
+        [ScriptedImporter(0, FILE_EXTENSION)]
+        public class CFXR_ShaderImporter : ScriptedImporter
+        {
+            public enum RenderPipeline
+            {
+                Auto,
+                ForceBuiltInRenderPipeline,
+                ForceUniversalRenderPipeline
+            }
+
+            public const string FILE_EXTENSION = "cfxrshader";
+
+            [Tooltip("In case of errors when building the project or with addressables, you can try forcing a specific render pipeline")]
+            public RenderPipeline renderPipelineDetection = RenderPipeline.Auto;
+            public string detectedRenderPipeline = "Built-In Render Pipeline";
+            public int strippedLinesCount = 0;
+            public string shaderSourceCode;
+            public string shaderName;
+            public string[] shaderErrors;
+            public ulong variantCount;
+            public ulong variantCountUsed;
+
+            enum ComparisonOperator
+            {
+                Equal,
+                Greater,
+                GreaterOrEqual,
+                Less,
+                LessOrEqual
+            }
+
+#if UNITY_2022_2_OR_NEWER
+            const int URP_VERSION = 14;
+#elif UNITY_2021_2_OR_NEWER
+            const int URP_VERSION = 12;
+#elif UNITY_2021_1_OR_NEWER
+            const int URP_VERSION = 11;
+#elif UNITY_2020_3_OR_NEWER
+            const int URP_VERSION = 10;
+#else
+            const int URP_VERSION = 7;
+#endif
+
+            static ComparisonOperator ParseComparisonOperator(string symbols)
+            {
+                switch (symbols)
+                {
+                    case "==": return ComparisonOperator.Equal;
+                    case "<=": return ComparisonOperator.LessOrEqual;
+                    case "<": return ComparisonOperator.Less;
+                    case ">": return ComparisonOperator.Greater;
+                    case ">=": return ComparisonOperator.GreaterOrEqual;
+                    default: throw new Exception("Invalid comparison operator: " + symbols);
+                }
+            }
+
+            static bool CompareWithOperator(int value1, int value2, ComparisonOperator comparisonOperator)
+            {
+                switch (comparisonOperator)
+                {
+                    case ComparisonOperator.Equal: return value1 == value2;
+                    case ComparisonOperator.Greater: return value1 > value2;
+                    case ComparisonOperator.GreaterOrEqual: return value1 >= value2;
+                    case ComparisonOperator.Less: return value1 < value2;
+                    case ComparisonOperator.LessOrEqual: return value1 <= value2;
+                    default: throw new Exception("Invalid comparison operator value: " + comparisonOperator);
+                }
+            }
+
+            bool StartsOrEndWithSpecialTag(string line)
+            {
+                bool startsWithTag = (line.Length > 4 && line[0] == '/' && line[1] == '*' && line[2] == '*' && line[3] == '*');
+                if (startsWithTag) return true;
+
+                int l = line.Length-1;
+                bool endsWithTag = (line.Length > 4 && line[l] == '/' && line[l-1] == '*' && line[l-2] == '*' && line[l-3] == '*');
+                return endsWithTag;
+            }
+
+            public override void OnImportAsset(AssetImportContext context)
+            {
+                bool isUsingURP;
+                switch (renderPipelineDetection)
+                {
+                    default:
+                    case RenderPipeline.Auto:
+                    {
+                        isUsingURP = Utils.IsUsingURP();
+                        detectedRenderPipeline = isUsingURP ? "Universal Render Pipeline" : "Built-In Render Pipeline";
+                        break;
+                    }
+                    case RenderPipeline.ForceBuiltInRenderPipeline:
+                    {
+                        detectedRenderPipeline = "Built-In Render Pipeline";
+                        isUsingURP = false;
+                        break;
+                    }
+                    case RenderPipeline.ForceUniversalRenderPipeline:
+                    {
+                        detectedRenderPipeline = "Universal Render Pipeline";
+                        isUsingURP = true;
+                        break;
+                    }
+                }
+
+                StringWriter shaderSource = new StringWriter();
+                string[] sourceLines = File.ReadAllLines(context.assetPath);
+                Stack<bool> excludeCurrentLines = new Stack<bool>();
+                strippedLinesCount = 0;
+
+                for (int i = 0; i < sourceLines.Length; i++)
+                {
+                    bool excludeThisLine = excludeCurrentLines.Count > 0 && excludeCurrentLines.Peek();
+
+                    string line = sourceLines[i];
+                    if (StartsOrEndWithSpecialTag(line))
+                    {
+                        if (line.StartsWith("/*** BIRP ***/"))
+                        {
+                            excludeCurrentLines.Push(excludeThisLine || isUsingURP);
+                        }
+                        else if (line.StartsWith("/*** URP ***/"))
+                        {
+                            excludeCurrentLines.Push(excludeThisLine || !isUsingURP);
+                        }
+                        else if (line.StartsWith("/*** URP_VERSION "))
+                        {
+                            string subline = line.Substring("/*** URP_VERSION ".Length);
+                            int spaceIndex = subline.IndexOf(' ');
+                            string version = subline.Substring(spaceIndex, subline.LastIndexOf(' ') - spaceIndex);
+                            string op = subline.Substring(0, spaceIndex);
+
+                            var compOp = ParseComparisonOperator(op);
+                            int compVersion = int.Parse(version);
+
+                            bool isCorrectURP = CompareWithOperator(URP_VERSION, compVersion, compOp);
+                            excludeCurrentLines.Push(excludeThisLine || !isCorrectURP);
+                        }
+                        else if (excludeThisLine && line.StartsWith("/*** END"))
+                        {
+                            excludeCurrentLines.Pop();
+                        }
+                        else if (!excludeThisLine && line.StartsWith("/*** #define URP_VERSION ***/"))
+                        {
+                            shaderSource.WriteLine("\t\t\t#define URP_VERSION " + URP_VERSION);
+                        }
+                    }
+                    else
+                    {
+                        if (excludeThisLine)
+                        {
+                            strippedLinesCount++;
+                            continue;
+                        }
+
+                        shaderSource.WriteLine(line);
+                    }
+                }
+
+                // Get source code and extract name
+                shaderSourceCode = shaderSource.ToString();
+                int idx = shaderSourceCode.IndexOf("Shader \"", StringComparison.InvariantCulture) + 8;
+                int idx2 = shaderSourceCode.IndexOf('"', idx);
+                shaderName = shaderSourceCode.Substring(idx, idx2 - idx);
+                shaderErrors = null;
+
+                Shader shader = ShaderUtil.CreateShaderAsset(context, shaderSourceCode, true);
+
+                if (ShaderUtil.ShaderHasError(shader))
+                {
+                    string[] shaderSourceLines = shaderSourceCode.Split(new [] {'\n'}, StringSplitOptions.None);
+                    var errors = ShaderUtil.GetShaderMessages(shader);
+                    shaderErrors = Array.ConvertAll(errors, err => $"{err.message} (line {err.line})");
+                    foreach (ShaderMessage error in errors)
+                    {
+                        string message = error.line <= 0 ?
+                            string.Format("Shader Error in '{0}' (in file '{2}')\nError: {1}\n", shaderName, error.message, error.file) :
+                            string.Format("Shader Error in '{0}' (line {2} in file '{3}')\nError: {1}\nLine: {4}\n", shaderName, error.message, error.line, error.file, shaderSourceLines[error.line-1]);
+                        if (error.severity == ShaderCompilerMessageSeverity.Warning)
+                        {
+                            Debug.LogWarning(message);
+                        }
+                        else
+                        {
+                            Debug.LogError(message);
+                        }
+                    }
+                }
+                else
+                {
+                    ShaderUtil.ClearShaderMessages(shader);
+                }
+
+                context.AddObjectToAsset("MainAsset", shader);
+                context.SetMainObject(shader);
+
+                // Try to count variant using reflection:
+                // internal static extern ulong GetVariantCount(Shader s, bool usedBySceneOnly);
+                variantCount = 0;
+                variantCountUsed = 0;
+                MethodInfo getVariantCountReflection = typeof(ShaderUtil).GetMethod("GetVariantCount", BindingFlags.Static | BindingFlags.NonPublic);
+                if (getVariantCountReflection != null)
+                {
+                    try
+                    {
+                        object result = getVariantCountReflection.Invoke(null, new object[] {shader, false});
+                        variantCount = (ulong)result;
+                        result = getVariantCountReflection.Invoke(null, new object[] {shader, true});
+                        variantCountUsed = (ulong)result;
+                    }
+                    catch
+                    {
+                        // ignored
+                    }
+                }
+            }
+        }
+
+        namespace Inspector
+        {
+            [CustomEditor(typeof(CFXR_ShaderImporter)), CanEditMultipleObjects]
+            public class TCP2ShaderImporter_Editor : Editor
+            {
+                CFXR_ShaderImporter Importer => (CFXR_ShaderImporter) this.target;
+
+                // From: UnityEditor.ShaderInspectorPlatformsPopup
+                static string FormatCount(ulong count)
+                {
+                    bool flag = count > 1000000000uL;
+                    string result;
+                    if (flag)
+                    {
+                        result = (count / 1000000000.0).ToString("f2", CultureInfo.InvariantCulture.NumberFormat) + "B";
+                    }
+                    else
+                    {
+                        bool flag2 = count > 1000000uL;
+                        if (flag2)
+                        {
+                            result = (count / 1000000.0).ToString("f2", CultureInfo.InvariantCulture.NumberFormat) + "M";
+                        }
+                        else
+                        {
+                            bool flag3 = count > 1000uL;
+                            if (flag3)
+                            {
+                                result = (count / 1000.0).ToString("f2", CultureInfo.InvariantCulture.NumberFormat) + "k";
+                            }
+                            else
+                            {
+                                result = count.ToString();
+                            }
+                        }
+                    }
+                    return result;
+                }
+
+                static GUIStyle _HelpBoxRichTextStyle;
+                static GUIStyle HelpBoxRichTextStyle
+                {
+                    get
+                    {
+                        if (_HelpBoxRichTextStyle == null)
+                        {
+                            _HelpBoxRichTextStyle = new GUIStyle("HelpBox");
+                            _HelpBoxRichTextStyle.richText = true;
+                            _HelpBoxRichTextStyle.margin = new RectOffset(4, 4, 0, 0);
+                            _HelpBoxRichTextStyle.padding = new RectOffset(4, 4, 4, 4);
+                        }
+                        return _HelpBoxRichTextStyle;
+                    }
+                }
+
+                public override void OnInspectorGUI()
+                {
+                    bool multipleValues = serializedObject.isEditingMultipleObjects;
+
+                    CFXR_ShaderImporter.RenderPipeline detection = ((CFXR_ShaderImporter)target).renderPipelineDetection;
+                    bool isUsingURP = Utils.IsUsingURP();
+                    serializedObject.Update();
+
+                    GUILayout.Label(Importer.shaderName);
+                    string variantsText = "";
+                    if (Importer.variantCount > 0 && Importer.variantCountUsed > 0)
+                    {
+                        string variantsCount = multipleValues ? "-" : FormatCount(Importer.variantCount);
+                        string variantsCountUsed = multipleValues ? "-" : FormatCount(Importer.variantCountUsed);
+                        variantsText = $"\nVariants (currently used): <b>{variantsCountUsed}</b>\nVariants (including unused): <b>{variantsCount}</b>";
+                    }
+                    string strippedLinesCount = multipleValues ? "-" : Importer.strippedLinesCount.ToString();
+                    string renderPipeline = Importer.detectedRenderPipeline;
+                    if (targets is { Length: > 1 })
+                    {
+                        foreach (CFXR_ShaderImporter importer in targets)
+                        {
+                            if (importer.detectedRenderPipeline != renderPipeline)
+                            {
+                                renderPipeline = "-";
+                                break;
+                            }
+                        }
+                    }
+                    GUILayout.Label($"{(detection == CFXR_ShaderImporter.RenderPipeline.Auto ? "Detected" : "Forced")} render pipeline: <b>{renderPipeline}</b>\nStripped lines: <b>{strippedLinesCount}</b>{variantsText}", HelpBoxRichTextStyle);
+
+                    if (Importer.shaderErrors != null && Importer.shaderErrors.Length > 0)
+                    {
+                        GUILayout.Space(4);
+                        var color = GUI.color;
+                        GUI.color = new Color32(0xFF, 0x80, 0x80, 0xFF);
+                        GUILayout.Label($"<b>Errors:</b>\n{string.Join("\n", Importer.shaderErrors)}", HelpBoxRichTextStyle);
+                        GUI.color = color;
+                    }
+
+                    bool shouldReimportShader = false;
+                    bool compiledForURP = Importer.detectedRenderPipeline.Contains("Universal");
+                    if (detection == CFXR_ShaderImporter.RenderPipeline.Auto
+                        && ((isUsingURP && !compiledForURP) || (!isUsingURP && compiledForURP)))
+                    {
+                        GUILayout.Space(4);
+                        Color guiColor = GUI.color;
+                        GUI.color *= Color.yellow;
+                        EditorGUILayout.HelpBox("The detected render pipeline doesn't match the pipeline this shader was compiled for!\nPlease reimport the shaders for them to work in the current render pipeline.", MessageType.Warning);
+                        if (GUILayout.Button("Reimport Shader"))
+                        {
+                            shouldReimportShader = true;
+                        }
+                        GUI.color = guiColor;
+                    }
+
+                    GUILayout.Space(4);
+
+
+                    EditorGUI.BeginChangeCheck();
+                    EditorGUILayout.PropertyField(serializedObject.FindProperty(nameof(CFXR_ShaderImporter.renderPipelineDetection)));
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        shouldReimportShader = true;
+                    }
+
+                    if (GUILayout.Button("View Source", GUILayout.ExpandWidth(false)))
+                    {
+                        string path = Application.temporaryCachePath + "/" + Importer.shaderName.Replace("/", "-") + "_Source.shader";
+                        if (File.Exists(path))
+                        {
+                            File.SetAttributes(path, FileAttributes.Normal);
+                        }
+
+                        File.WriteAllText(path, Importer.shaderSourceCode);
+                        File.SetAttributes(path, FileAttributes.ReadOnly);
+                        UnityEditorInternal.InternalEditorUtility.OpenFileAtLineExternal(path, 0);
+                    }
+
+#if SHOW_EXPORT_BUTTON
+                    GUILayout.Space(8);
+
+                    EditorGUI.BeginDisabledGroup(string.IsNullOrEmpty(importer.shaderSourceCode));
+                    {
+                        if (GUILayout.Button("Export .shader file", GUILayout.ExpandWidth(false)))
+                        {
+                            string savePath = EditorUtility.SaveFilePanel("Export CFXR shader", Application.dataPath, "CFXR Shader","shader");
+                            if (!string.IsNullOrEmpty(savePath))
+                            {
+                                File.WriteAllText(savePath, importer.shaderSourceCode);
+                            }
+                        }
+                    }
+                    EditorGUI.EndDisabledGroup();
+#endif
+
+                    serializedObject.ApplyModifiedProperties();
+
+                    if (shouldReimportShader)
+                    {
+                        ReimportShader();
+                    }
+                }
+
+                void ReimportShader()
+                {
+                    foreach (UnityEngine.Object t in targets)
+                    {
+                        string path = AssetDatabase.GetAssetPath(t);
+                        AssetDatabase.ImportAsset(path, ImportAssetOptions.ForceSynchronousImport);
+                    }
+                }
+            }
+        }
+    }
+}
--- a/Assets/Editor/CFXR_ShaderImporter.cs.meta
+++ b/Assets/Editor/CFXR_ShaderImporter.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: fe56ec25963759b49955809beeb4324b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor/CFXR_ShaderImporter.cs
+  uploadId: 836238
--- a/Assets/Editor/CFXR_ShaderPostProcessor.cs
+++ b/Assets/Editor/CFXR_ShaderPostProcessor.cs
@@ -0,0 +1,38 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace CartoonFX
+{
+    namespace CustomShaderImporter
+    {
+        public class CFXR_ShaderPostProcessor : AssetPostprocessor
+        {
+            static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+            {
+                CleanCFXRShaders(importedAssets);
+            }
+
+            static void CleanCFXRShaders(string[] paths)
+            {
+                foreach (var assetPath in paths)
+                {
+                    if (!assetPath.EndsWith(CFXR_ShaderImporter.FILE_EXTENSION, StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        continue;
+                    }
+
+                    var shader = AssetDatabase.LoadMainAssetAtPath(assetPath) as Shader;
+                    if (shader != null)
+                    {
+                        ShaderUtil.ClearShaderMessages(shader);
+                        if (!ShaderUtil.ShaderHasError(shader))
+                        {
+                            ShaderUtil.RegisterShader(shader);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/Assets/Editor/CFXR_ShaderPostProcessor.cs.meta
+++ b/Assets/Editor/CFXR_ShaderPostProcessor.cs.meta
@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 29d46695388f9a84d9ae71b5140727a3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor/CFXR_ShaderPostProcessor.cs
+  uploadId: 836238
--- a/Assets/Editor/CFXR_Styles.cs
+++ b/Assets/Editor/CFXR_Styles.cs
@@ -0,0 +1,362 @@
+//--------------------------------------------------------------------------------------------------------------------------------
+// Cartoon FX
+// (c) 2012-2025 Jean Moreno
+//--------------------------------------------------------------------------------------------------------------------------------
+
+using UnityEngine;
+using UnityEditor;
+
+// GUI Styles and UI methods
+
+namespace CartoonFX
+{
+	public static class Styles
+	{
+		//================================================================================================================================
+		// GUI Styles
+		//================================================================================================================================
+
+		//================================================================================================================================
+		// (x) close button
+		static GUIStyle _closeCrossButton;
+		public static GUIStyle CloseCrossButton
+		{
+			get
+			{
+				if(_closeCrossButton == null)
+				{
+					//Try to load GUISkin according to its GUID
+					//Assumes that its .meta file should always stick with it!
+					string guiSkinPath = AssetDatabase.GUIDToAssetPath("02d396fa782e5d7438e231ea9f8be23c");
+					var gs = AssetDatabase.LoadAssetAtPath<GUISkin>(guiSkinPath);
+					if(gs != null)
+					{
+						_closeCrossButton = System.Array.Find<GUIStyle>(gs.customStyles, x => x.name == "CloseCrossButton");
+					}
+
+					//Else fall back to minibutton
+					if(_closeCrossButton == null)
+						_closeCrossButton = EditorStyles.miniButton;
+				}
+				return _closeCrossButton;
+			}
+		}
+
+		//================================================================================================================================
+		// Shuriken Toggle with label alignment fix
+		static GUIStyle _shurikenToggle;
+		public static GUIStyle ShurikenToggle
+		{
+			get
+			{
+				if(_shurikenToggle == null)
+				{
+					_shurikenToggle = new GUIStyle("ShurikenToggle");
+					_shurikenToggle.fontSize = 9;
+					_shurikenToggle.contentOffset = new Vector2(16, -1);
+					if(EditorGUIUtility.isProSkin)
+					{
+						var textColor = new Color(.8f, .8f, .8f);
+						_shurikenToggle.normal.textColor = textColor;
+						_shurikenToggle.active.textColor = textColor;
+						_shurikenToggle.focused.textColor = textColor;
+						_shurikenToggle.hover.textColor = textColor;
+						_shurikenToggle.onNormal.textColor = textColor;
+						_shurikenToggle.onActive.textColor = textColor;
+						_shurikenToggle.onFocused.textColor = textColor;
+						_shurikenToggle.onHover.textColor = textColor;
+					}
+				}
+				return _shurikenToggle;
+			}
+		}
+
+		//================================================================================================================================
+		// Bold mini-label (the one from EditorStyles isn't actually "mini")
+		static GUIStyle _miniBoldLabel;
+		public static GUIStyle MiniBoldLabel
+		{
+			get
+			{
+				if(_miniBoldLabel == null)
+				{
+					_miniBoldLabel = new GUIStyle(EditorStyles.boldLabel);
+					_miniBoldLabel.fontSize = 10;
+					_miniBoldLabel.margin = new RectOffset(0, 0, 0, 0);
+				}
+				return _miniBoldLabel;
+			}
+		}
+
+		//================================================================================================================================
+		// Bold mini-foldout
+		static GUIStyle _miniBoldFoldout;
+		public static GUIStyle MiniBoldFoldout
+		{
+			get
+			{
+				if(_miniBoldFoldout == null)
+				{
+					_miniBoldFoldout = new GUIStyle(EditorStyles.foldout);
+					_miniBoldFoldout.fontSize = 10;
+					_miniBoldFoldout.fontStyle = FontStyle.Bold;
+					_miniBoldFoldout.margin = new RectOffset(0, 0, 0, 0);
+				}
+				return _miniBoldFoldout;
+			}
+		}
+
+		//================================================================================================================================
+		// Gray right-aligned label for Orderable List (Material Animator)
+		static GUIStyle _PropertyTypeLabel;
+		public static GUIStyle PropertyTypeLabel
+		{
+			get
+			{
+				if(_PropertyTypeLabel == null)
+				{
+					_PropertyTypeLabel = new GUIStyle(EditorStyles.label);
+					_PropertyTypeLabel.alignment = TextAnchor.MiddleRight;
+					_PropertyTypeLabel.normal.textColor = Color.gray;
+					_PropertyTypeLabel.fontSize = 9;
+				}
+				return _PropertyTypeLabel;
+			}
+		}
+
+		// Dark Gray right-aligned label for Orderable List (Material Animator)
+		static GUIStyle _PropertyTypeLabelFocused;
+		public static GUIStyle PropertyTypeLabelFocused
+		{
+			get
+			{
+				if(_PropertyTypeLabelFocused == null)
+				{
+					_PropertyTypeLabelFocused = new GUIStyle(EditorStyles.label);
+					_PropertyTypeLabelFocused.alignment = TextAnchor.MiddleRight;
+					_PropertyTypeLabelFocused.normal.textColor = new Color(.2f, .2f, .2f);
+					_PropertyTypeLabelFocused.fontSize = 9;
+				}
+				return _PropertyTypeLabelFocused;
+			}
+		}
+
+		//================================================================================================================================
+		// Rounded Box
+		static GUIStyle _roundedBox;
+		public static GUIStyle RoundedBox
+		{
+			get
+			{
+				if(_roundedBox == null)
+				{
+					_roundedBox = new GUIStyle(EditorStyles.helpBox);
+				}
+				return _roundedBox;
+			}
+		}
+
+		//================================================================================================================================
+		// Center White Label ("Editing Spline" label in Scene View)
+		static GUIStyle _CenteredWhiteLabel;
+		public static GUIStyle CenteredWhiteLabel
+		{
+			get
+			{
+				if(_CenteredWhiteLabel == null)
+				{
+					_CenteredWhiteLabel = new GUIStyle(EditorStyles.centeredGreyMiniLabel);
+					_CenteredWhiteLabel.fontSize = 20;
+					_CenteredWhiteLabel.normal.textColor = Color.white;
+				}
+				return _CenteredWhiteLabel;
+			}
+		}
+
+		//================================================================================================================================
+		// Used to draw lines for separators
+		static public GUIStyle _LineStyle;
+		static public GUIStyle LineStyle
+		{
+			get
+			{
+				if(_LineStyle == null)
+				{
+					_LineStyle = new GUIStyle();
+					_LineStyle.normal.background = EditorGUIUtility.whiteTexture;
+					_LineStyle.stretchWidth = true;
+				}
+
+				return _LineStyle;
+			}
+		}
+
+		//================================================================================================================================
+		// HelpBox with rich text formatting support
+		static GUIStyle _HelpBoxRichTextStyle;
+		static public GUIStyle HelpBoxRichTextStyle
+		{
+			get
+			{
+				if(_HelpBoxRichTextStyle == null)
+				{
+					_HelpBoxRichTextStyle = new GUIStyle("HelpBox");
+					_HelpBoxRichTextStyle.richText = true;
+				}
+				return _HelpBoxRichTextStyle;
+			}
+		}
+
+		//================================================================================================================================
+		// Material Blue Header
+		static public GUIStyle _MaterialHeaderStyle;
+		static public GUIStyle MaterialHeaderStyle
+		{
+			get
+			{
+				if(_MaterialHeaderStyle == null)
+				{
+					_MaterialHeaderStyle = new GUIStyle(EditorStyles.label);
+					_MaterialHeaderStyle.fontStyle = FontStyle.Bold;
+					_MaterialHeaderStyle.fontSize = 11;
+					_MaterialHeaderStyle.padding.top = 0;
+					_MaterialHeaderStyle.padding.bottom = 0;
+					_MaterialHeaderStyle.normal.textColor = EditorGUIUtility.isProSkin ? new Color32(75, 128, 255, 255) : new Color32(0, 50, 230, 255);
+					_MaterialHeaderStyle.stretchWidth = true;
+				}
+
+				return _MaterialHeaderStyle;
+			}
+		}
+
+		//================================================================================================================================
+		// Material Header emboss effect
+		static public GUIStyle _MaterialHeaderStyleHighlight;
+		static public GUIStyle MaterialHeaderStyleHighlight
+		{
+			get
+			{
+				if(_MaterialHeaderStyleHighlight == null)
+				{
+					_MaterialHeaderStyleHighlight = new GUIStyle(MaterialHeaderStyle);
+					_MaterialHeaderStyleHighlight.contentOffset = new Vector2(1, 1);
+					_MaterialHeaderStyleHighlight.normal.textColor = EditorGUIUtility.isProSkin ? new Color32(255, 255, 255, 16) : new Color32(255, 255, 255, 32);
+				}
+
+				return _MaterialHeaderStyleHighlight;
+			}
+		}
+
+		//================================================================================================================================
+		// Filled rectangle
+
+		static private GUIStyle _WhiteRectangleStyle;
+
+		static public void DrawRectangle(Rect position, Color color)
+		{
+			var col = GUI.color;
+			GUI.color *= color;
+			DrawRectangle(position);
+			GUI.color = col;
+		}
+		static public void DrawRectangle(Rect position)
+		{
+			if(_WhiteRectangleStyle == null)
+			{
+				_WhiteRectangleStyle = new GUIStyle();
+				_WhiteRectangleStyle.normal.background = EditorGUIUtility.whiteTexture;
+			}
+
+			if(Event.current != null && Event.current.type == EventType.Repaint)
+			{
+				_WhiteRectangleStyle.Draw(position, false, false, false, false);
+			}
+		}
+
+		//================================================================================================================================
+		// Methods
+		//================================================================================================================================
+
+		static public void DrawLine(float height = 2f)
+		{
+			DrawLine(Color.black, height);
+		}
+		static public void DrawLine(Color color, float height = 1f)
+		{
+			Rect position = GUILayoutUtility.GetRect(0f, float.MaxValue, height, height, LineStyle);
+			DrawLine(position, color);
+		}
+		static public void DrawLine(Rect position, Color color)
+		{
+			if(Event.current.type == EventType.Repaint)
+			{
+				Color orgColor = GUI.color;
+				GUI.color = orgColor * color;
+				LineStyle.Draw(position, false, false, false, false);
+				GUI.color = orgColor;
+			}
+		}
+
+		static public void MaterialDrawHeader(GUIContent guiContent)
+		{
+			var rect = GUILayoutUtility.GetRect(guiContent, MaterialHeaderStyle);
+			GUI.Label(rect, guiContent, MaterialHeaderStyleHighlight);
+			GUI.Label(rect, guiContent, MaterialHeaderStyle);
+		}
+
+		static public void MaterialDrawSeparator()
+		{
+			GUILayout.Space(4);
+			if(EditorGUIUtility.isProSkin)
+				DrawLine(new Color(.3f, .3f, .3f, 1f), 1);
+			else
+				DrawLine(new Color(.6f, .6f, .6f, 1f), 1);
+			GUILayout.Space(4);
+		}
+
+		static public void MaterialDrawSeparatorDouble()
+		{
+			GUILayout.Space(6);
+			if(EditorGUIUtility.isProSkin)
+			{
+				DrawLine(new Color(.1f, .1f, .1f, 1f), 1);
+				DrawLine(new Color(.4f, .4f, .4f, 1f), 1);
+			}
+			else
+			{
+				DrawLine(new Color(.3f, .3f, .3f, 1f), 1);
+				DrawLine(new Color(.9f, .9f, .9f, 1f), 1);
+			}
+			GUILayout.Space(6);
+		}
+
+		//built-in console icons, also used in help box
+		static Texture2D warnIcon;
+		static Texture2D infoIcon;
+		static Texture2D errorIcon;
+
+		static public void HelpBoxRichText(Rect position, string message, MessageType msgType)
+		{
+			Texture2D icon = null;
+			switch(msgType)
+			{
+				case MessageType.Warning: icon = warnIcon ?? (warnIcon = EditorGUIUtility.Load("console.warnicon") as Texture2D); break;
+				case MessageType.Info: icon = infoIcon ?? (infoIcon = EditorGUIUtility.Load("console.infoicon") as Texture2D); break;
+				case MessageType.Error: icon = errorIcon ?? (errorIcon = EditorGUIUtility.Load("console.erroricon") as Texture2D); break;
+			}
+			EditorGUI.LabelField(position, GUIContent.none, new GUIContent(message, icon), HelpBoxRichTextStyle);
+		}
+
+		static public void HelpBoxRichText(string message, MessageType msgType)
+		{
+			Texture2D icon = null;
+			switch(msgType)
+			{
+				case MessageType.Warning: icon = warnIcon ?? (warnIcon = EditorGUIUtility.Load("console.warnicon") as Texture2D); break;
+				case MessageType.Info: icon = infoIcon ?? (infoIcon = EditorGUIUtility.Load("console.infoicon") as Texture2D); break;
+				case MessageType.Error: icon = errorIcon ?? (errorIcon = EditorGUIUtility.Load("console.erroricon") as Texture2D); break;
+			}
+			EditorGUILayout.LabelField(GUIContent.none, new GUIContent(message, icon), HelpBoxRichTextStyle);
+		}
+	}
+}
--- a/Assets/Editor/CFXR_Styles.cs.meta
+++ b/Assets/Editor/CFXR_Styles.cs.meta
@@ -0,0 +1,19 @@
+fileFormatVersion: 2
+guid: 26306333afc273640814fd7a7b3968e0
+timeCreated: 1501149213
+licenseType: Store
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Editor/CFXR_Styles.cs
+  uploadId: 836238
--- a/Assets/Graphics.meta
+++ b/Assets/Graphics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae70c5d833aa6d74e9429910c18b70c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,113 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: cfxr aura rays hdr ab nosp
+  m_Shader: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d,
+    type: 3}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _CFXR_HDR_BOOST
+  - _CFXR_SINGLE_CHANNEL
+  m_InvalidKeywords:
+  - _
+  - _CFXR_DITHERED_SHADOWS_OFF
+  - _CFXR_OVERLAYBLEND_RGBA
+  - _CFXR_OVERLAYTEX_OFF
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DitherCustom:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 4ece64fbaa1a3d14091abf505199104e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OverlayTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondColorTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BacklightTransmittance: 1
+    - _BlendingType: 0
+    - _BumpScale: 1
+    - _CFXR_DITHERED_SHADOWS: 0
+    - _CFXR_OVERLAYBLEND: 0
+    - _CFXR_OVERLAYTEX: 0
+    - _Cutoff: 0.1
+    - _DirLightScreenAtten: 1
+    - _DirectLightingRamp: 1
+    - _DissolveSmooth: 0.1
+    - _Distort: 0.1
+    - _DoubleDissolve: 0
+    - _DstBlend: 10
+    - _EdgeFadePow: 1
+    - _FadeAlongU: 0
+    - _HdrBoost: 1
+    - _HdrMultiply: 2
+    - _IndirectLightingMix: 0.5
+    - _InvertDissolveTex: 0
+    - _LightingWorldPosStrength: 0.2
+    - _OVERLAYBLEND: 0
+    - _OVERLAYTEX: 0
+    - _SecondColorSmooth: 0.2
+    - _ShadowStrength: 1
+    - _SingleChannel: 1
+    - _SoftParticlesFadeDistanceFar: 1
+    - _SoftParticlesFadeDistanceNear: 0
+    - _SrcBlend: 5
+    - _UVDistortionAdd: 0
+    - _UseAlphaClip: 0
+    - _UseBackLighting: 0
+    - _UseDissolve: 0
+    - _UseDissolveOffsetUV: 0
+    - _UseEF: 0
+    - _UseEmission: 0
+    - _UseFB: 0
+    - _UseFontColor: 0
+    - _UseLighting: 0
+    - _UseLightingWorldPosOffset: 0
+    - _UseNormalMap: 0
+    - _UseSP: 0
+    - _UseSecondColor: 0
+    - _UseUV2Distortion: 0
+    - _UseUVDistortion: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 4.237095, g: 4.237095, b: 4.237095, a: 1}
+    - _DissolveScroll: {r: 0, g: 0, b: 0, a: 0}
+    - _DistortScrolling: {r: 0, g: 0, b: 1, a: 1}
+    - _OverlayTex_Scroll: {r: 0.1, g: 0.1, b: 1, a: 1}
+    - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticlesFadeDistance: {r: 0, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 59b66e1956031654985c136e6927a7d8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr aura
+    rays hdr ab nosp.mat
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,129 @@
+fileFormatVersion: 2
+guid: 4ece64fbaa1a3d14091abf505199104e
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 10
+  textureShape: 1
+  singleChannelComponent: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 64
+    resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr aura
+    rays.png
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,113 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: cfxr aura runic hdr ab nosp
+  m_Shader: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d,
+    type: 3}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _CFXR_HDR_BOOST
+  - _CFXR_SINGLE_CHANNEL
+  m_InvalidKeywords:
+  - _
+  - _CFXR_DITHERED_SHADOWS_OFF
+  - _CFXR_OVERLAYBLEND_RGBA
+  - _CFXR_OVERLAYTEX_OFF
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DitherCustom:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: ccb58def4933d4e46b7a1fc023bf6259, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OverlayTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondColorTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BacklightTransmittance: 1
+    - _BlendingType: 0
+    - _BumpScale: 1
+    - _CFXR_DITHERED_SHADOWS: 0
+    - _CFXR_OVERLAYBLEND: 0
+    - _CFXR_OVERLAYTEX: 0
+    - _Cutoff: 0.1
+    - _DirLightScreenAtten: 1
+    - _DirectLightingRamp: 1
+    - _DissolveSmooth: 0.1
+    - _Distort: 0.1
+    - _DoubleDissolve: 0
+    - _DstBlend: 10
+    - _EdgeFadePow: 1
+    - _FadeAlongU: 0
+    - _HdrBoost: 1
+    - _HdrMultiply: 2
+    - _IndirectLightingMix: 0.5
+    - _InvertDissolveTex: 0
+    - _LightingWorldPosStrength: 0.2
+    - _OVERLAYBLEND: 0
+    - _OVERLAYTEX: 0
+    - _SecondColorSmooth: 0.2
+    - _ShadowStrength: 1
+    - _SingleChannel: 1
+    - _SoftParticlesFadeDistanceFar: 1
+    - _SoftParticlesFadeDistanceNear: 0
+    - _SrcBlend: 5
+    - _UVDistortionAdd: 0
+    - _UseAlphaClip: 0
+    - _UseBackLighting: 0
+    - _UseDissolve: 0
+    - _UseDissolveOffsetUV: 0
+    - _UseEF: 0
+    - _UseEmission: 0
+    - _UseFB: 0
+    - _UseFontColor: 0
+    - _UseLighting: 0
+    - _UseLightingWorldPosOffset: 0
+    - _UseNormalMap: 0
+    - _UseSP: 0
+    - _UseSecondColor: 0
+    - _UseUV2Distortion: 0
+    - _UseUVDistortion: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 4.237095, g: 4.237095, b: 4.237095, a: 1}
+    - _DissolveScroll: {r: 0, g: 0, b: 0, a: 0}
+    - _DistortScrolling: {r: 0, g: 0, b: 1, a: 1}
+    - _OverlayTex_Scroll: {r: 0.1, g: 0.1, b: 1, a: 1}
+    - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticlesFadeDistance: {r: 0, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: cbb6f419bbe7c6e4d9ce7e0322aa267d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr aura
+    runic hdr ab nosp.mat
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,129 @@
+fileFormatVersion: 2
+guid: ccb58def4933d4e46b7a1fc023bf6259
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 2
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 10
+  textureShape: 1
+  singleChannelComponent: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 64
+    resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr aura
+    runic.png
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,125 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: cfxr blood dissolve ab
+  m_Shader: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d,
+    type: 3}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _CFXR_DISSOLVE
+  - _CFXR_DITHERED_SHADOWS_ON
+  - _FADING_ON
+  m_InvalidKeywords:
+  - _
+  - _CFXR_OVERLAYBLEND_RGBA
+  - _CFXR_OVERLAYTEX_OFF
+  - _CFXR_SINGLE_CHANNEL
+  - _SINGLECHANNEL_ON
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 2800000, guid: 0611efd272757c345a8ded5f38dd3f88, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DitherCustom:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _GradientMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a29f55dbea218ca4fbd94deb36027aee, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OverlayTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondColorTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AmbientColor: 0.25
+    - _AmbientIntensity: 0.5
+    - _AmbientLighting: 0
+    - _BacklightTransmittance: 1
+    - _BlendingType: 0
+    - _BumpScale: 1
+    - _CFXR_DITHERED_SHADOWS: 1
+    - _CFXR_OVERLAYBLEND: 0
+    - _CFXR_OVERLAYTEX: 0
+    - _Cutoff: 0.1
+    - _DebugDissolveTime: 0
+    - _DirLightScreenAtten: 1
+    - _DirectLightingRamp: 1
+    - _DissolveSmooth: 0.1
+    - _Distort: 0.1
+    - _DoubleDissolve: 0
+    - _DstBlend: 10
+    - _EdgeFadePow: 1
+    - _FadeAlongU: 0
+    - _HdrBoost: 0
+    - _HdrMultiply: 0
+    - _IndirectLightingMix: 0.5
+    - _InvertDissolveTex: 0
+    - _LightingWorldPosStrength: 0.2
+    - _OVERLAYBLEND: 0
+    - _OVERLAYTEX: 0
+    - _ReceivedShadowsStrength: 0.5
+    - _SecondColorSmooth: 0.2
+    - _ShadowStrength: 0.5
+    - _SingleChannel: 1
+    - _SoftParticlesFadeDistanceFar: 1
+    - _SoftParticlesFadeDistanceNear: 0
+    - _SrcBlend: 5
+    - _UVDistortionAdd: 0
+    - _UseAlphaClip: 0
+    - _UseBackLighting: 0
+    - _UseDissolve: 1
+    - _UseDissolveOffsetUV: 0
+    - _UseEF: 0
+    - _UseEmission: 0
+    - _UseFB: 0
+    - _UseFontColor: 0
+    - _UseGradientMap: 0
+    - _UseLighting: 0
+    - _UseLightingWorldPosOffset: 0
+    - _UseNormalMap: 0
+    - _UseSP: 1
+    - _UseSecondColor: 0
+    - _UseUV2Distortion: 0
+    - _UseUVDistortion: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 2, g: 2, b: 2, a: 1}
+    - _DissolveScroll: {r: 0, g: 0, b: 0, a: 0}
+    - _DistortScrolling: {r: 0, g: 0, b: 1, a: 1}
+    - _OverlayTex_Scroll: {r: 0.1, g: 0.1, b: 1, a: 1}
+    - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticlesFadeDistance: {r: 0, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 28dde998c7abf234498a42d0aab38421
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr blood
+    dissolve ab.mat
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,129 @@
+fileFormatVersion: 2
+guid: 0611efd272757c345a8ded5f38dd3f88
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 10
+  textureShape: 1
+  singleChannelComponent: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr blood
+    dissolve.png
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,127 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: cfxr blood splash dissolve ab
+  m_Shader: {fileID: -6465566751694194690, guid: 1a29b4d27eb8b04479ef89c00dea533d,
+    type: 3}
+  m_ValidKeywords:
+  - _ALPHABLEND_ON
+  - _CFXR_DISSOLVE
+  - _CFXR_DITHERED_SHADOWS_ON
+  - _FADING_ON
+  m_InvalidKeywords:
+  - _
+  - _CFXR_OVERLAYBLEND_RGBA
+  - _CFXR_OVERLAYTEX_OFF
+  - _CFXR_SINGLE_CHANNEL
+  - _SINGLECHANNEL_ON
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DissolveTex:
+        m_Texture: {fileID: 2800000, guid: 66389432937edf24a943c3944a78bd01, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DitherCustom:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _GradientMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: b00dc0b0f4174b14aa9e3caa8d9b0859, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OverlayTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SecondColorTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AmbientColor: 0.25
+    - _AmbientIntensity: 0.5
+    - _AmbientLighting: 0
+    - _BacklightTransmittance: 1
+    - _BlendingType: 0
+    - _BumpScale: 1
+    - _CFXR_DITHERED_SHADOWS: 1
+    - _CFXR_OVERLAYBLEND: 0
+    - _CFXR_OVERLAYTEX: 0
+    - _Cutoff: 0.1
+    - _DebugDissolveTime: 0
+    - _DirLightScreenAtten: 1
+    - _DirectLightingMix: 0.5
+    - _DirectLightingRamp: 1
+    - _DissolveSmooth: 0.1
+    - _Distort: 0.1
+    - _DoubleDissolve: 0
+    - _DstBlend: 10
+    - _EdgeFadePow: 1
+    - _FadeAlongU: 0
+    - _HdrBoost: 0
+    - _HdrMultiply: 0
+    - _IndirectLightingMix: 0.5
+    - _InvertDissolveTex: 0
+    - _LightingWorldPosStrength: 0.2
+    - _OVERLAYBLEND: 0
+    - _OVERLAYTEX: 0
+    - _ReceivedShadowsStrength: 0.5
+    - _SecondColorSmooth: 0.2
+    - _ShadowStrength: 0.5
+    - _SingleChannel: 1
+    - _SoftParticlesFadeDistanceFar: 1
+    - _SoftParticlesFadeDistanceNear: 0
+    - _SrcBlend: 5
+    - _UVDistortionAdd: 0
+    - _UseAlphaClip: 0
+    - _UseBackLighting: 0
+    - _UseDissolve: 1
+    - _UseDissolveOffsetUV: 0
+    - _UseEF: 0
+    - _UseEmission: 0
+    - _UseFB: 0
+    - _UseFontColor: 0
+    - _UseGradientMap: 0
+    - _UseLighting: 0
+    - _UseLightingWorldPosOffset: 0
+    - _UseNormalMap: 0
+    - _UseSP: 1
+    - _UseSecondColor: 0
+    - _UseUV2Distortion: 0
+    - _UseUVDistortion: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 2, g: 2, b: 2, a: 1}
+    - _DissolveScroll: {r: 0, g: 0, b: 0, a: 0}
+    - _DistortScrolling: {r: 0, g: 0, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
+    - _OverlayTex_Scroll: {r: 0.1, g: 0.1, b: 1, a: 1}
+    - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticlesFadeDistance: {r: 0, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: ccfff22ed954c6f41ade040a8a7c8f22
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr blood
+    splash dissolve ab.mat
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,129 @@
+fileFormatVersion: 2
+guid: 66389432937edf24a943c3944a78bd01
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    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
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 10
+  textureShape: 1
+  singleChannelComponent: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: 63
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr blood
+    splash dissolve.png
+  uploadId: 836238
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,162 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!43 &4300000
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: cfxr blood splash mesh
+  serializedVersion: 9
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 201
+    topology: 0
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 69
+    localAABB:
+      m_Center: {x: -0.001953125, y: 0.005859375, z: 0}
+      m_Extent: {x: 0.45117188, y: 0.48632812, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 1
+  m_KeepIndices: 1
+  m_IndexFormat: 0
+  m_IndexBuffer: 2c001d000f000f003b002c002c002b001d001d0010000f000f0003003b003b003a002c002b001e001d001d001c0010000f0004000300030002003b003a002d002c002b002a001e001c001b0010000f000e00040002003c003b003a002e002d002a001f001e001b00110010000e000d000400020041003c003a0033002e002a0024001f001b00150011000d000500040002000100410041003d003c003a003700330033002f002e002a0028002400240020001f001b00190015001500120011000d000900050001004300410041003f003d003a0039003700370035003300330031002f002800260024002400220020001900170015001500140012000d000b000900090007000500010044004300430042004100410040003f003f003e003d00390038003700370036003500350034003300330032003100310030002f002a00290028002800270026002600250024002400230022002200210020001b001a0019001900180017001700160015001400130012000d000c000b000b000a000900090008000700070006000500010000004400
+  m_VertexData:
+    serializedVersion: 2
+    m_VertexCount: 69
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 12
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 24
+      format: 0
+      dimension: 2
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 2208
+    _typelessdata: 0000bc3e0000aebe000000000000000000000000000080bf00005e3f0000243e00008a3e000078be000000000000000000000000000080bf0000453f0000843e0000183e0000f0bd000000000000000000000000000080bf0000263f0000c43e0000043e000098bd000000000000000000000000000080bf0000213f0000da3e0000083e000080bb000000000000000000000000000080bf0000223f0000fe3e0000383e0000103d000000000000000000000000ffff7fbf00002e3f0000093f0000a23e0000a83d000000000000000000000000000080bf0000513f0000153f0000da3e0000043e000000000000000000000000000080bf00006d3f0000213f0000e63e00001c3e000000000000000000000000000080bf0000733f0000273f0000e63e0000503e000000000000000000000000000080bf0000733f0000343f0000e43e00006c3e000000000000000000000000000080bf0000723f00003b3f0000d43e00007c3e000000000000000000000000000080bf00006a3f00003f3f0000c03e00007c3e000000000000000000000000000080bf0000603f00003f3f0000a03e0000603e000000000000000000000000000080bf0000503f0000383f00004c3e0000103e000000000000000000000000000080bf0000333f0000243f0000f03d0000d03d000000000000000000000000ffff7fbf00001e3f00001a3f0000883d0000e03d000000000000000000000000000080bf0000113f00001c3f0000203d0000243e000000000000000000000000000080bf00000a3f0000293f0000e03c0000743e000000000000000000000000000080bf0000073f00003d3f0000a03c0000dc3e000000000000000000000000000080bf0000053f00006e3f0000003c0000ee3e000000000000000000000000000080bf0000023f0000773f0000a0bc0000fa3e000000000000000000000000000080bf0000f63e00007d3f0000c0bc0000fc3e000000000000000000000000000080bf0000f43e00007e3f0000a0bd0000fc3e000000000000000000000000000080bf0000d83e00007e3f0000d8bd0000e83e000000000000000000000000ffff7fbf0000ca3e0000743f0000d0bd0000c83e000000000000000000000000000080bf0000cc3e0000643f0000b8bd0000a43e000000000000000000000000000080bf0000d23e0000523f000090bd0000883e000000000000000000000000000080bf0000dc3e0000443f000070bd0000203e000000000000000000000000000080bf0000e23e0000283f000088bd0000003e000000000000000000000000000080bf0000de3e0000203f0000c8bd0000d03d000000000000000000000000000080bf0000ce3e00001a3f000014be0000d83d000000000000000000000000000080bf0000b63e00001b3f000038be0000043e000000000000000000000000000080bf0000a43e0000213f0000a6be0000703e000000000000000000000000000080bf0000343e00003c3f0000b6be0000803e000000000000000000000000000080bf0000143e0000403f0000c4be0000803e000000000000000000000000000080bf0000f03d0000403f0000d2be0000683e000000000000000000000000000080bf0000b83d00003a3f0000d6be0000543e000000000000000000000000000080bf0000a83d0000353f0000d6be0000343e000000000000000000000000000080bf0000a83d00002d3f0000cabe0000183e000000000000000000000000000080bf0000d83d0000263f0000c0be0000083e000000000000000000000000000080bf0000003e0000223f0000a2be0000d83d000000000000000000000000000080bf00003c3e00001b3f00006cbe0000a03d000000000000000000000000000080bf00008a3e0000143f000024be0000303d000000000000000000000000000080bf0000ae3e00000b3f000004be0000003c000000000000000000000000000080bf0000be3e0000023f000010be000070bd000000000000000000000000000080bf0000b83e0000e23e000030be0000c0bd000000000000000000000000000080bf0000a83e0000d03e000086be00001cbe000000000000000000000000000080bf0000743e0000b23e0000babe000058be000000000000000000000000000080bf00000c3e0000943e0000d4be00007cbe000000000000000000000000000080bf0000b03d0000823e0000e2be00008cbe000000000000000000000000000080bf0000703d0000683e0000e8be000098be000000000000000000000000000080bf0000403d0000503e0000e8be0000a6be000000000000000000000000000080bf0000403d0000343e0000e4be0000b4be000000000000000000000000ffff7fbf0000603d0000183e0000ccbe0000c6be000000000000000000000000000080bf0000d03d0000e83d0000b4be0000c4be000000000000000000000000000080bf0000183e0000f03d0000a4be0000b8be000000000000000000000000000080bf0000383e0000103e000080be000096be000000000000000000000000000080bf0000803e0000543e000008be000028be000000000000000000000000ffff7fbf0000bc3e0000ac3e000020bd0000d8bd000000000000000000000000000080bf0000ec3e0000ca3e0000a03d000020be000000000000000000000000000080bf0000143f0000b03e0000243e000094be000000000000000000000000000080bf0000293f0000583e0000643e0000cebe000000000000000000000000000080bf0000393f0000c83d00007c3e0000e2be000000000000000000000000ffff7fbf00003f3f0000703d0000963e0000f6be000000000000000000000000000080bf00004b3f0000a03c0000ae3e0000f6be000000000000000000000000000080bf0000573f0000a03c0000b83e0000f2be000000000000000000000000000080bf00005c3f0000e03c0000cc3e0000dcbe000000000000000000000000000080bf0000663f0000903d0000ca3e0000c0be000000000000000000000000000080bf0000653f0000003e
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: -0.001953125, y: 0.005859375, z: 0}
+    m_Extent: {x: 0.45117188, y: 0.48632812, z: 0}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimized: 0
+  m_StreamData:
+    offset: 0
+    size: 0
+    path: 
--- a/Assets/Graphics/cfxr
+++ b/Assets/Graphics/cfxr
@@ -0,0 +1,16 @@
+fileFormatVersion: 2
+guid: 03b90fa8ed1d4104abc8b7431ab290e6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4300000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+AssetOrigin:
+  serializedVersion: 1
+  productId: 109565
+  packageName: Cartoon FX Remaster Free
+  packageVersion: R 1.5.0
+  assetPath: Assets/JMO Assets/Cartoon FX Remaster/CFXR Assets/Graphics/cfxr blood
+    splash mesh.asset
+  uploadId: 836238
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dal4segno	7fc457a384	적 공격 애니메이션 타이밍 조정 및 무기 장착 기타 누락되었던 프리팹 수정 사항 모두 반영	2026-02-27 19:07:27 +09:00
dal4segno	8093cca251	전장의 안개가 비활성화 되어 있을 때 적이 보이지 않는 문제 수정	2026-02-27 14:34:29 +09:00
dal4segno	c34b9df4f7	팀 체력 UI	2026-02-27 14:19:07 +09:00
BoyongHwang	3aa43bfd20	Merge branch 'main' of http://59.18.227.134:30008/dal4segno/Northbound	2026-02-26 03:18:35 +09:00
BoyongHwang	5284ffc153	팀 정보 HUD 추가 - GameMain > UI > Canvas > TeamCardsRoot > Slot_1 ~ 4 - TeamCard_Large, Small prefab 추가 - https://www.notion.so/HUD-31294d45b1a38099bdcbc63cf9e5279e?source=copy_link	2026-02-26 03:18:28 +09:00
dal4segno	20167a8a52	입력 못받는 버그 추가 수정 및 입력 로직 강제 복구 로직 추가	2026-02-26 01:37:25 +09:00
dal4segno	9951aa98b2	입력 시스템 개선 각자의 입력 처리 로직을 갖지 않고 NetworkPlayerController로부터 받아서 쓰도록 함	2026-02-26 01:20:23 +09:00
dal4segno	600f35ae8f	기본 배치 건물이 시야를 제공하도록 변경	2026-02-26 00:37:38 +09:00
dal4segno	a4eae438de	클라이언트에서 캠프 처치 없이도 ResourcePickup이 보이는 문제 수정	2026-02-25 23:52:13 +09:00
dal4segno	72fe5e5b04	Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound	2026-02-25 23:35:25 +09:00
dal4segno	93d326e692	클라이언트에서 밝혀지지 않은 곳의 적이 보이는 문제 수정	2026-02-25 23:35:18 +09:00
BoyongHwang	863e98a53f	Merge branch 'main' of http://59.18.227.134:30008/dal4segno/Northbound	2026-02-25 23:28:14 +09:00
BoyongHwang	a979013b73	260225 플레이 테스트 이후 밸런스 수정 - 타워 비용 증가 - 유닛 속도 감소 - 플레이어 캐퍼시티 감소	2026-02-25 23:28:03 +09:00
dal4segno	9c6a9910cb	클라이언트에서 건설모드를 진입할 수 없는 문제 수정	2026-02-25 22:23:59 +09:00
dal4segno	b3a9823f49	어그로 시스템 관련 오류 수정 순회 중 순회 대상을 수정해서 발생한 문제 순회와 수정을 분리함	2026-02-25 22:14:33 +09:00
dal4segno	0a2119a548	팀원들 모두가 시야를 공유하도록 함	2026-02-25 21:45:06 +09:00
dal4segno	23429ec096	클라이언트의 이동속도가 2배인 문제 수정 로컬 컨트롤러를 제거하고 네트워크 컨트롤러만 남겨둠	2026-02-25 21:40:50 +09:00
dal4segno	2f7eac05ce	클라이언트에게 시야 정보가 공유되지 않는 문제 수정	2026-02-25 21:26:11 +09:00
dal4segno	9a010524f2	Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound	2026-02-25 21:13:14 +09:00
dal4segno	34ab12a093	추격 포기로 인한 복귀 시, 복귀하는 동안 무적 상태 + 체력 전체 회복	2026-02-25 21:13:06 +09:00
BoyongHwang	1c77c5d9cd	크립 사거리 스펙 수정 - 일반 사거리 1 - 원거리 사거리 4	2026-02-25 21:11:04 +09:00
dal4segno	d066290607	플레이어 체력 자연 회복 기능 추가 전투 상태 감지 기능 player stat으로 관리 가능	2026-02-25 21:09:19 +09:00
dal4segno	a27a59d176	적 AI에 어그로 시스템 추가	2026-02-25 21:00:51 +09:00
dal4segno	6ecf799d18	크립 캠프 내 모든 크립이 한번에 플레이어를 인식하도록 변경	2026-02-25 20:50:34 +09:00
dal4segno	e93ef2111c	Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound	2026-02-25 18:56:30 +09:00
dal4segno	3d2a9071bc	건물 업그레이드 기능	2026-02-25 18:56:26 +09:00
BoyongHwang	a99a7c192d	Merge branch 'main' of http://59.18.227.134:30008/dal4segno/Northbound	2026-02-25 17:43:38 +09:00
BoyongHwang	d79f6c6218	크립 스펙 수정 및 크립 2 추가	2026-02-25 17:43:25 +09:00
dal4segno	0828bb214f	enemy의 이동 가속을 높이고, 공격 대상의 표면으로부터 거리 검사를 하도록 함 미끄러지는 현상 감소 코어 앞에서 코어를 못 찾는 문제 수정	2026-02-25 17:26:03 +09:00
dal4segno	84f4020d47	enemy AI의 공격도 애니메이션 이벤트로 타이밍을 제어하도록 함	2026-02-25 17:00:31 +09:00
dal4segno	979f2402c7	타워 이외의 건물을 건설할 수 없는 문제 수정 Lv1만 보이게 하면서, 보이는 index와 실제 index가 달라져서 발생	2026-02-25 16:38:31 +09:00
dal4segno	9fd45ec5e9	사망 시 사망 UI 출력	2026-02-25 16:18:57 +09:00
BoyongHwang	8fd6ab652b	large용 애니메이션컨트롤러 override 추가 - 테스트중	2026-02-25 16:05:34 +09:00
BoyongHwang	8ff1ba1a22	크립 체력 20=>100 수정	2026-02-25 16:05:13 +09:00
dal4segno	0d06c6a2d3	클로드 관련 데이터가 git에 포함되지 않도록 함	2026-02-25 15:34:56 +09:00
dal4segno	9b40721b84	멀티플레이에서 플레이어가 공격 시, 데미지가 플레이어 수만큼 곱해지는 문제 수정	2026-02-25 15:34:02 +09:00
dal4segno	75d2ef8dd0	사망 시 체력바가 사라지지 않는 문제 수정	2026-02-25 15:30:57 +09:00
dal4segno	4804e78951	사망 시 이동, 액션, 인터랙션 금지	2026-02-25 15:29:21 +09:00
dal4segno	17b3cf6746	체력바 추가 플레이어는 상시 표시, 나머지는 체력 변경 시 표시	2026-02-25 15:15:29 +09:00
dal4segno	f3923079a4	건설 모드에서 클릭이 잘 작동하지 않는 문제 수정 건설 모드 UI가 클릭되어 건설되지 않는 문제 수정 JMO Asset 위치 조정 Tower, Monster, Creep의 Hit/Destroy FX Prefab 설정 (Template Level) Tower에 체력바 추가 (최초 건설 시, 체력 변경 시 등장) Tower 관련 디버깅 로그 정리 건설 토대의 사이즈가 비정상적인 문제 수정	2026-02-25 01:41:58 +09:00
BoyongHwang	3dabf9f9a4	이펙트 라이트 링 제거 - Point Light OFF 처리	2026-02-24 16:59:54 +09:00
BoyongHwang	e4865c725a	Hit/Death JMO Asset 적용	2026-02-24 16:48:36 +09:00
BoyongHwang	c75e2c7f3c	JMO Asset 추가	2026-02-24 16:36:39 +09:00
dal4segno	98d071480c	적과 타워가 서로 공격하지 않는 문제 수정	2026-02-24 16:08:35 +09:00
BoyongHwang	907e2e24c8	웨이브 난이도 곡선 수정 - InitialCost: 4=>5 - costIncreaseRate: 10=>12%	2026-02-24 15:05:01 +09:00
BoyongHwang	0db8bbf9a7	타워/크립 밸런스 수정 - 체력, 데미지, 시야, 사정거리 수정 - 크립 체력, 데미지 하향 조정	2026-02-24 15:04:22 +09:00
BoyongHwang	194bde37ec	업그레이드 팝업 폴리싱 - 레이아웃 수정 및 아이콘 추가	2026-02-23 20:35:16 +09:00
BoyongHwang	363bdcf992	한글 ㅁㅁ 현상 수정 - SDF 아틀라스 다시 생성 (Custom Range : 32-126,44032-55203,12593-12643,9200-9900)	2026-02-23 18:06:05 +09:00
BoyongHwang	96d901a869	UpgradeListItem Pretendard SDF 적용 - 누락	2026-02-23 17:34:02 +09:00
BoyongHwang	8f55cb212a	Merge branch 'main' of http://59.18.227.134:30008/dal4segno/Northbound	2026-02-23 17:31:21 +09:00
BoyongHwang	51b0be2ee3	업그레이드 UI 1열종대 수정 - 박스 범위 수정 - 스크롤바 추가	2026-02-23 17:31:15 +09:00
dal4segno	9e2a950281	업그레이드를 위한 클릭 시, 공격이 나가지 않도록 함	2026-02-23 17:04:20 +09:00
dal4segno	e841438997	대장간을 이용한 업그레이드 기능 추가	2026-02-23 16:55:32 +09:00
BoyongHwang	840ddc1c2c	사망 시 리스폰 안내 팝업 UI 추가 - 리소스, 프리팹, UI 전용 스크립트(RespawnCountdownUI.cs) 추가	2026-02-23 16:19:50 +09:00
BoyongHwang	84d4eee6a1	업그레이드 팝업 폰트 수정 - Pretendard로 수정	2026-02-23 16:01:27 +09:00
BoyongHwang	78f063988b	Merge branch 'main' of http://59.18.227.134:30008/dal4segno/Northbound	2026-02-23 11:58:51 +09:00
BoyongHwang	ea6098b723	업그레이드 팝업 수정 - 게임씬에서 제거 - 레이아웃 수정	2026-02-23 11:58:31 +09:00
dal4segno	38a6fe104c	Merge branch 'main' of http://192.168.10.102:30008/dal4segno/Northbound	2026-02-23 00:22:03 +09:00
dal4segno	cc475bce3e	업그레이드 데이터 입력 로직 및 기능 추가 캐릭터 스탯을 PlayerStats 컴포넌트에서 모아서 관리하도록 변경 코드에서도 마찬가지	2026-02-23 00:21:44 +09:00
BoyongHwang	ac1d265291	업그레이드 팝업 2차 수정 - 팝업 전체적인 정렬 수정	2026-02-22 22:26:35 +09:00
BoyongHwang	3ea5925d78	업그레이드 팝업 1차 수정 - /UI/Upgrade 폴더 생성 - 업그레이드 리스트 팝업 프리팹 추가(팝업/리스트아이템/효과)	2026-02-22 17:59:10 +09:00
BoyongHwang	b34254137f	업그레이드 팝업 UI 더미 프리팹 추가 - 임시로 구조만 잡은 프리팹 - UpgradeListPopup : 리스트 팝업 ㄴ UpgradeListItem : 리스트 Content 한 줄 ㄴㄴ EffectRow : 효과 내용 ㄴㄴ ReqChip : 요구 조건 내용	2026-02-22 16:33:35 +09:00
BoyongHwang	ec1ff83814	Upgrade 테이블 upgradeShop 컬럼 제거 - Blacksmith로 통일	2026-02-22 15:56:23 +09:00
dal4segno	48fff594f0	upgradeData.cs 누락 추가	2026-02-22 15:43:44 +09:00
dal4segno	b2e3fb1ecf	시야 속성명 변경 대응 vision radius -> sight	2026-02-22 15:43:06 +09:00