Merge remote-tracking branch 'origin/main'

BlueWater/Assets/01.Scenes/03.Stage_Test.unity

@@ -280,6 +280,16 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects:
@@ -448,8 +458,8 @@ Transform:
   m_GameObject: {fileID: 74216712}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 50, y: 2.220446e-16, z: 0}
+  m_LocalPosition: {x: 30, y: 4.440893e-17, z: -0.0000009536743}
-  m_LocalScale: {x: 5, y: 1, z: 5}
+  m_LocalScale: {x: 3, y: 1, z: 3}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 886612058}
@@ -1479,7 +1489,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _persistent: 0
-  inIslandCam: {fileID: 879331194}
+  <InIslandCam>k__BackingField: {fileID: 879331194}
 --- !u!1 &348702643
 GameObject:
   m_ObjectHideFlags: 0
@@ -1576,6 +1586,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1236881601}
+  - {fileID: 396519533}
   m_Father: {fileID: 1063731841}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1626,6 +1637,141 @@ MonoBehaviour:
   m_DefaultActionMap: Player
   m_SplitScreenIndex: -1
   m_Camera: {fileID: 0}
+--- !u!1 &396519532
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 396519533}
+  - component: {fileID: 396519535}
+  - component: {fileID: 396519534}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &396519533
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 396519532}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 393497261}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &396519534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 396519532}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Press 'E' Key
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 3a63ea49b1e704b5f88ff13d52dca9a2, type: 2}
+  m_sharedMaterial: {fileID: 2356238409700980164, guid: 3a63ea49b1e704b5f88ff13d52dca9a2,
+    type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 50
+  m_fontSizeBase: 50
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &396519535
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 396519532}
+  m_CullTransparentMesh: 1
 --- !u!1 &417739631
 GameObject:
   m_ObjectHideFlags: 0
@@ -1951,6 +2097,7 @@ MonoBehaviour:
   <UseRigidbody>k__BackingField: 0
   useMouseAttack: 0
   isRolling: 0
+  enableRoll: 1
   isStiffened: 0
   beAttacked: 0
   isAttacking: 0
@@ -1958,6 +2105,7 @@ MonoBehaviour:
   angleSpeed: 0.2
   rollDuration: 0.5
   rollForce: 2
+  rollCooldown: 0.5
   myActiveSkill: {fileID: 0}
 --- !u!114 &418278343
 MonoBehaviour:
@@ -2243,8 +2391,8 @@ Transform:
   m_GameObject: {fileID: 439502001}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -50, y: 0, z: 0}
+  m_LocalPosition: {x: -30, y: 0, z: 0}
-  m_LocalScale: {x: 5, y: 1, z: 5}
+  m_LocalScale: {x: 3, y: 1, z: 3}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 886612058}
@@ -2590,6 +2738,16 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6935276925499279574, guid: 27422d4ba1ec18843b41367444c27888,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -2801,6 +2959,8 @@ GameObject:
   m_Component:
   - component: {fileID: 879331195}
   - component: {fileID: 879331194}
+  - component: {fileID: 879331197}
+  - component: {fileID: 879331196}
   m_Layer: 0
   m_Name: Virtual Camera
   m_TagString: Untagged
@@ -2863,6 +3023,238 @@ Transform:
   - {fileID: 1467753325}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 30.101, y: 0, z: 0}
+--- !u!114 &879331196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 879331193}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6da43522623d4704e979466dc7650b65, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Feedbacks: []
+  InitializationMode: 2
+  AutoInitialization: 1
+  SafeMode: 3
+  Direction: 0
+  AutoChangeDirectionOnEnd: 0
+  AutoPlayOnStart: 0
+  AutoPlayOnEnable: 0
+  ForceTimescaleMode: 0
+  ForcedTimescaleMode: 1
+  DurationMultiplier: 1
+  RandomizeDuration: 0
+  RandomDurationMultiplier: {x: 0.5, y: 1.5}
+  DisplayFullDurationDetails: 0
+  PlayerTimescaleMode: 1
+  OnlyPlayIfWithinRange: 0
+  RangeCenter: {fileID: 0}
+  RangeDistance: 5
+  UseRangeFalloff: 0
+  RangeFalloff:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  RemapRangeFalloff: {x: 0, y: 1}
+  IgnoreRangeEvents: 0
+  CooldownDuration: 0
+  InitialDelay: 0
+  CanPlay: 1
+  CanPlayWhileAlreadyPlaying: 1
+  ChanceToPlay: 100
+  FeedbacksIntensity: 1
+  Events:
+    TriggerMMFeedbacksEvents: 0
+    TriggerUnityEvents: 1
+    OnPlay:
+      m_PersistentCalls:
+        m_Calls: []
+    OnPause:
+      m_PersistentCalls:
+        m_Calls: []
+    OnResume:
+      m_PersistentCalls:
+        m_Calls: []
+    OnRevert:
+      m_PersistentCalls:
+        m_Calls: []
+    OnComplete:
+      m_PersistentCalls:
+        m_Calls: []
+    OnRestoreInitialValues:
+      m_PersistentCalls:
+        m_Calls: []
+    OnSkipToTheEnd:
+      m_PersistentCalls:
+        m_Calls: []
+  DebugActive: 0
+  FeedbacksList:
+  - rid: 2642786829805027329
+  KeepPlayModeChanges: 0
+  PerformanceMode: 0
+  StopFeedbacksOnDisable: 0
+  PlayCount: 0
+  references:
+    version: 2
+    RefIds:
+    - rid: 2642786829805027329
+      type: {class: MMF_CinemachineImpulse, ns: MoreMountains.FeedbacksForThirdParty,
+        asm: MoreMountains.Feedbacks.Cinemachine}
+      data:
+        Active: 1
+        UniqueID: -663680138
+        Label: Cinemachine Impulse
+        ChannelMode: 0
+        Channel: 0
+        MMChannelDefinition: {fileID: 0}
+        Chance: 100
+        DisplayColor: {r: 0, g: 0, b: 0, a: 1}
+        Timing:
+          TimescaleMode: 0
+          ExcludeFromHoldingPauses: 0
+          ContributeToTotalDuration: 1
+          InitialDelay: 0
+          CooldownDuration: 0
+          InterruptsOnStop: 1
+          NumberOfRepeats: 0
+          RepeatForever: 0
+          DelayBetweenRepeats: 1
+          MMFeedbacksDirectionCondition: 0
+          PlayDirection: 0
+          ConstantIntensity: 0
+          UseIntensityInterval: 0
+          IntensityIntervalMin: 0
+          IntensityIntervalMax: 0
+          Sequence: {fileID: 0}
+          TrackID: 0
+          Quantized: 0
+          TargetBPM: 120
+        AutomatedTargetAcquisition:
+          Mode: 0
+          ChildIndex: 0
+        RandomizeOutput: 0
+        RandomMultiplier: {x: 0.8, y: 1}
+        RandomizeDuration: 0
+        RandomDurationMultiplier: {x: 0.5, y: 2}
+        UseRange: 0
+        RangeDistance: 5
+        UseRangeFalloff: 0
+        RangeFalloff:
+          serializedVersion: 2
+          m_Curve:
+          - serializedVersion: 3
+            time: 0
+            value: 1
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          - serializedVersion: 3
+            time: 1
+            value: 0
+            inSlope: 0
+            outSlope: 0
+            tangentMode: 0
+            weightedMode: 0
+            inWeight: 0
+            outWeight: 0
+          m_PreInfinity: 2
+          m_PostInfinity: 2
+          m_RotationOrder: 4
+        RemapRangeFalloff: {x: 0, y: 1}
+        Owner: {fileID: 879331196}
+        DebugActive: 0
+        m_ImpulseDefinition:
+          m_ImpulseChannel: 1
+          m_ImpulseShape: 0
+          m_CustomImpulseShape:
+            serializedVersion: 2
+            m_Curve: []
+            m_PreInfinity: 2
+            m_PostInfinity: 2
+            m_RotationOrder: 4
+          m_ImpulseDuration: 0.2
+          m_ImpulseType: 3
+          m_DissipationRate: 0
+          m_RawSignal: {fileID: 11400000, guid: 69ce8388f6785dd4c8c39915efece2f4,
+            type: 2}
+          m_AmplitudeGain: 1
+          m_FrequencyGain: 1
+          m_RepeatMode: 0
+          m_Randomize: 1
+          m_TimeEnvelope:
+            m_AttackShape:
+              serializedVersion: 2
+              m_Curve: []
+              m_PreInfinity: 2
+              m_PostInfinity: 2
+              m_RotationOrder: 4
+            m_DecayShape:
+              serializedVersion: 2
+              m_Curve: []
+              m_PreInfinity: 2
+              m_PostInfinity: 2
+              m_RotationOrder: 4
+            m_AttackTime: 0
+            m_SustainTime: 0.2
+            m_DecayTime: 0.7
+            m_ScaleWithImpact: 1
+            m_HoldForever: 0
+          m_ImpactRadius: 100
+          m_DirectionMode: 0
+          m_DissipationMode: 2
+          m_DissipationDistance: 100
+          m_PropagationSpeed: 343
+        Velocity: {x: 0, y: 0, z: 0}
+        ClearImpulseOnStop: 0
+--- !u!114 &879331197
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 879331193}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 00b2d199b96b516448144ab30fb26aed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ApplyAfter: 2
+  m_ChannelMask: 1
+  m_Gain: 1
+  m_Use2DDistance: 0
+  m_UseCameraSpace: 1
+  m_ReactionSettings:
+    m_SecondaryNoise: {fileID: 0}
+    m_AmplitudeGain: 1
+    m_FrequencyGain: 1
+    m_Duration: 1
+    m_NoiseOffsets: {x: 0, y: 0, z: 0}
 --- !u!1 &886612057
 GameObject:
   m_ObjectHideFlags: 0
@@ -2930,7 +3322,6 @@ Transform:
   m_Children:
   - {fileID: 886612058}
   - {fileID: 1780668149}
-  - {fileID: 1058417086}
   - {fileID: 2140149911}
   - {fileID: 348702644}
   - {fileID: 1037586754}
@@ -3000,11 +3391,11 @@ Transform:
   m_GameObject: {fileID: 949778305}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 29.32}
+  m_LocalPosition: {x: 0, y: 0, z: 5.864}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.2, y: 1, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1780668149}
+  m_Father: {fileID: 1052315033}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &949778307
 BoxCollider:
@@ -3293,7 +3684,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1fbb68ccbcfcf4c4c9f4304a726038e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  activeSkillDataSo: {fileID: 11400000, guid: 97ebd289c10598a458425fbefd7db39f, type: 2}
+  activeSkillSo: {fileID: 11400000, guid: 97ebd289c10598a458425fbefd7db39f, type: 2}
 --- !u!1 &1037586753
 GameObject:
   m_ObjectHideFlags: 0
@@ -3319,7 +3710,7 @@ Transform:
   m_GameObject: {fileID: 1037586753}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -37.91, y: 0.15, z: 0}
+  m_LocalPosition: {x: -23.52, y: 0.15, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -3354,9 +3745,12 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 5, y: 1, z: 5}
+  m_LocalScale: {x: 3, y: 1, z: 3}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1363690285}
+  - {fileID: 949778306}
+  - {fileID: 1058417086}
   m_Father: {fileID: 886612058}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1052315034
@@ -3455,13 +3849,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1058417085}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.2, y: 1, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2604109505573894898}
-  m_Father: {fileID: 888439616}
+  m_Father: {fileID: 1052315033}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1063731837
 GameObject:
@@ -3540,7 +3934,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: -1197429611
   m_SortingOrder: 0
@@ -4471,10 +4865,10 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.2, y: 1, z: 0.2}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1780668149}
+  m_Father: {fileID: 1052315033}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1363690286
 MonoBehaviour:
@@ -5033,7 +5427,7 @@ Transform:
   m_GameObject: {fileID: 1694885623}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
-  m_LocalPosition: {x: -14.759999, y: 0.34, z: 11.960001}
+  m_LocalPosition: {x: -8.499999, y: 0.34, z: 8.140001}
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5157,9 +5551,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 1363690285}
-  - {fileID: 949778306}
   m_Father: {fileID: 888439616}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1805195287
@@ -5244,8 +5636,8 @@ Transform:
   m_GameObject: {fileID: 1901749020}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0.0000038146973, y: -1.7763569e-16, z: 50}
+  m_LocalPosition: {x: 0.0000021457672, y: -1.3322677e-16, z: 30}
-  m_LocalScale: {x: 5, y: 1, z: 5}
+  m_LocalScale: {x: 3, y: 1, z: 3}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 886612058}
@@ -5395,7 +5787,7 @@ Transform:
   m_GameObject: {fileID: 1986762130}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
-  m_LocalPosition: {x: -17.019999, y: 0.34, z: 11.960001}
+  m_LocalPosition: {x: -10.759998, y: 0.34, z: 8.140001}
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5604,7 +5996,7 @@ Transform:
   m_GameObject: {fileID: 2057154836}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
-  m_LocalPosition: {x: -15.75, y: 0.34, z: 10.64}
+  m_LocalPosition: {x: -9.49, y: 0.34, z: 6.82}
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5855,7 +6247,7 @@ PrefabInstance:
     - target: {fileID: 9062185183980613901, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 8.27
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 9062185183980613901, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}

BlueWater/Assets/01.Scenes/03.Stage_Test_SJ2.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
+guid: 4893aec690a04814f995df64b9b235d7
 DefaultImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/02.Scripts/Ai/NewBehaviorTree/Task/Enemy/Action/ExecuteSkill.cs

@@ -27,7 +27,7 @@ namespace BlueWaterProject
 
         public override TaskStatus OnUpdate()
         {
-            return fieldBoss.GetSkillCoroutine() ? TaskStatus.Running : TaskStatus.Success;
+            return fieldBoss.GetUsedSkillCoroutine() ? TaskStatus.Running : TaskStatus.Success;
         }
     }
 }

BlueWater/Assets/02.Scripts/BossPortal.cs

@@ -1,4 +1,5 @@
 using System;
+using Doozy.Editor.EditorUI.Components;
 using UnityEngine;
 
 // ReSharper disable once CheckNamespace
@@ -9,12 +10,15 @@ namespace BlueWaterProject
         [SerializeField] private GameObject playerSpawnPosObj;
         [SerializeField] private FieldBoss fieldBoss;
 
+        private Collider myCollider;
+        private float[] bossMapVertices;
         private Collider[] bossEntrances;
 
         private bool isIn;
 
         private void Awake()
         {
+            myCollider = GetComponent<Collider>();
             var bossEntrance = transform.Find("BossEntrance");
             if (!bossEntrance)
             {
@@ -25,6 +29,7 @@ namespace BlueWaterProject
                 bossEntrances = bossEntrance.GetComponentsInChildren<Collider>();
             }
 
+            GetColliderVertices(myCollider);
             BossEntranceSetActive(false);
         }
 
@@ -36,9 +41,8 @@ namespace BlueWaterProject
             isIn = true;
             other.transform.position = playerSpawnPosObj.transform.position;
             BossEntranceSetActive(true);
-
+            
-            fieldBoss.BossSpawn(other);
+            fieldBoss.BossSpawn(other, bossMapVertices);
-            fieldBoss.Target = other;
         }
 
         private void BossEntranceSetActive(bool value)
@@ -56,5 +60,18 @@ namespace BlueWaterProject
 
             isIn = false;
         }
+
+        private void GetColliderVertices(Collider col)
+        {
+            var bounds = col.bounds;
+            var center = bounds.center;
+            var size = bounds.size;
+            
+            bossMapVertices = new float[4];
+            bossMapVertices[0] = center.x + -size.x * 0.5f;
+            bossMapVertices[1] = center.x + size.x * 0.5f;
+            bossMapVertices[2] = center.z + size.z * 0.5f;
+            bossMapVertices[3] = center.z + -size.z * 0.5f;
+        }
     }
 }

BlueWater/Assets/02.Scripts/CameraManager.cs

@@ -98,7 +98,7 @@ namespace BlueWaterProject
             shipDeckCam.Priority = 0;
         }
 
-        private void TakeCamMovement()
+        public void TakeCamMovement()
         {
             var mouseDelta = Mouse.current.delta.ReadValue();
 

BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldBoss/FieldBoss.cs

@@ -42,9 +42,10 @@ namespace BlueWaterProject
         protected SkillController skillController;
         
         // 일반 변수
-        protected bool skillCoroutine;
+        protected bool usedSkillCoroutine;
         protected bool isCollisionAttack;
         protected float collisionDamage;
+        protected float[] bossMapVertices;
 
         #endregion
         
@@ -116,7 +117,7 @@ namespace BlueWaterProject
         
         #region Custom methods
 
-        public void BossSpawn(Collider target)
+        public void BossSpawn(Collider target, float[] mapVertices)
         {
             SetMaxHp();
             
@@ -124,6 +125,8 @@ namespace BlueWaterProject
             hpSlider.gameObject.SetActive(true);
 
             Target = target;
+            bossMapVertices = new float[mapVertices.Length];
+            bossMapVertices = mapVertices;
             Invoke(nameof(EnableBehaviorTree), 2f);
         }
 
@@ -151,32 +154,41 @@ namespace BlueWaterProject
         private void SetMaxHp()
         {
             CurrentHp = MaxHp;
-            hpSlider.maxValue = MaxHp;
+
-            hpSlider.value = MaxHp;
+            if (hpSlider != null)
-            damageEffectSlider.maxValue = MaxHp;
+            {
-            damageEffectSlider.value = MaxHp;
+                hpSlider.maxValue = MaxHp;
+                hpSlider.value = MaxHp;
+            }
+
+            if (damageEffectSlider != null)
+            {
+                damageEffectSlider.maxValue = MaxHp;
+                damageEffectSlider.value = MaxHp;
+            }
         }
         
         private void SetCurrentHp(float value)
         {
-            var previousHp = CurrentHp;
-            
             CurrentHp = value;
-            hpSlider.value = value;
+            if (hpSlider != null)
-
+            {
-            StartCoroutine(DamageEffect(previousHp, CurrentHp));
+                hpSlider.value = value;
+            }
+            
+            StartCoroutine(DamageEffect(CurrentHp));
         }
 
-        private IEnumerator DamageEffect(float previousHp, float currentHp)
+        private IEnumerator DamageEffect(float currentHp)
         {
             while (damageEffectSlider.value > currentHp)
             {
-                damageEffectSlider.value -= damageEffectSpeed; // 속도 조절 가능
+                damageEffectSlider.value -= damageEffectSpeed;
                 yield return null;
             }
         }
 
-        public bool GetSkillCoroutine() => skillCoroutine;
+        public bool GetUsedSkillCoroutine() => usedSkillCoroutine;
         public List<ActiveSkill> GetActiveSkillList() => activeSkillList;
 
         #endregion

BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldBoss/Type/FieldBoss01.cs

@@ -10,6 +10,10 @@ namespace BlueWaterProject
     {
         #region Properties and variables
 
+        [Title("Extensions Data")]
+        [SerializeField] private int lavaNumber = 7;
+        [SerializeField] private int volcanicNumber = 20;
+        
         private ParticleSystem ghost;
 
         #endregion
@@ -53,15 +57,15 @@ namespace BlueWaterProject
 
         public override void ExecuteActiveSkill(ActiveSkill activeSkill)
         {
-            skillCoroutine = true;
+            usedSkillCoroutine = true;
 
             var endSkillTime = 0f;
             if (activeSkill.ActiveSkillData.Name.Equals("LavaEruption"))
             {
-                for (var i = 0; i < 7; i++)
+                for (var i = 0; i < lavaNumber; i++)
                 {
                     var lava = Instantiate(activeSkill);
-                    lava.Execute(TargetLayer, Target.bounds.center);
+                    lava.Execute(TargetLayer, Target.transform.position, bossMapVertices);
                     endSkillTime = lava.GetEndSkillTime();
                 }
             }
@@ -69,26 +73,26 @@ namespace BlueWaterProject
             {
                 var rush = Instantiate(activeSkill);
                 rush.SetUser(transform);
-                rush.Execute(TargetLayer, Target.bounds.center, GhostPlay, GhostStop);
+                rush.Execute(TargetLayer, Target.transform.position, GhostPlay, GhostStop);
                 endSkillTime = rush.GetEndSkillTime();
             }
             else if (activeSkill.ActiveSkillData.Name.Equals("BigLavaEruption"))
             {
                 var bigLava = Instantiate(activeSkill);
-                bigLava.Execute(TargetLayer, Target.bounds.center);
+                bigLava.Execute(TargetLayer, Target.transform.position);
                 endSkillTime = bigLava.GetEndSkillTime();
             }
             else if (activeSkill.ActiveSkillData.Name.Equals("VolcanicEruption"))
             {
-                for (var i = 0; i < 20; i++)
+                for (var i = 0; i < volcanicNumber; i++)
                 {
                     var lava = Instantiate(activeSkill);
                     lava.SetUser(transform);
-                    lava.Execute(TargetLayer, Target.bounds.center);
+                    lava.Execute(TargetLayer, Target.transform.position, bossMapVertices);
                     endSkillTime = lava.GetEndSkillTime();
                 }
             }
-            StartCoroutine(CoolDown(endSkillTime, () => skillCoroutine = false));
+            StartCoroutine(CoolDown(endSkillTime, () => usedSkillCoroutine = false));
         }
 
         private void GhostPlay()

BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs

@@ -89,6 +89,8 @@ namespace BlueWaterProject
         [DisableIf("@true")]
         [SerializeField] private bool isRolling;
         [DisableIf("@true")]
+        [SerializeField] private bool enableRoll = true;
+        [DisableIf("@true")]
         [SerializeField] private bool isStiffened;
         [DisableIf("@true")]
         [SerializeField] private bool beAttacked;
@@ -101,6 +103,7 @@ namespace BlueWaterProject
         public float angleSpeed = 0.2f;
         public float rollDuration = 0.3f;
         public float rollForce = 2f;
+        public float rollCooldown = 0.5f;
         
         // 일반 변수
         private bool usedNormalAttackCoroutine;
@@ -327,6 +330,11 @@ namespace BlueWaterProject
             
             var changeHp = Mathf.Max(CurrentHp - attackerPower, 0);
             SetCurrentHp(changeHp);
+
+            if (InIslandCamera.Inst.InIslandCam)
+            {
+                VisualFeedbackManager.Inst.CameraShake(InIslandCamera.Inst.InIslandCam);
+            }
             
             // 죽었는지 체크
             if (changeHp == 0f)
@@ -401,8 +409,8 @@ namespace BlueWaterProject
                 if (!Physics.Raycast(ray, out var hit)) return;
                 
                 var hitPos = hit.point;
-                hitPos.y = MyCollider.bounds.center.y;
+                hitPos.y = transform.position.y;
-                attackDirection = (hitPos - MyCollider.bounds.center).normalized;
+                attackDirection = (hitPos - transform.position).normalized;
             }
             else
             {
@@ -411,19 +419,22 @@ namespace BlueWaterProject
             
             Array.Clear(hitColliders, 0, MAX_COLLIDERS);
 
-            var size = Physics.OverlapSphereNonAlloc(MyCollider.bounds.center, AtkRange, hitColliders, TargetLayer);
+            var size = Physics.OverlapSphereNonAlloc(transform.position, AtkRange, hitColliders, TargetLayer);
 
             for (var i = 0; i < size; i++)
             {
                 var targetDirection = (hitColliders[i].transform.position - transform.position).normalized;
                 var angleBetween = Vector3.Angle(attackDirection, targetDirection);
 
-                if (angleBetween < attackAngle / 2f) // Checking if the target is within the desired angle range
+                if (angleBetween < attackAngle / 2f)
                 {
-                    var iDamageable = hitColliders[i].transform.GetComponent<IDamageable>() ?? hitColliders[i].GetComponentInParent<IDamageable>();
+                    var iDamageable = hitColliders[i].transform.GetComponent<IDamageable>();
                     iDamageable.TakeDamage(Atk);
+                    VisualFeedbackManager.Inst.TriggerHitStop(0.1f);
                 }
             }
+            
+            useMouseAttack = false;
         }
         
         private IEnumerator DrawAttackTrail()
@@ -437,8 +448,8 @@ namespace BlueWaterProject
                 if (!Physics.Raycast(ray, out var hit)) yield break;
                 
                 var hitPos = hit.point;
-                hitPos.y = MyCollider.bounds.center.y;
+                hitPos.y = transform.position.y;
-                attackDirection = (hitPos - MyCollider.bounds.center).normalized;
+                attackDirection = (hitPos - transform.position).normalized;
             }
             else
             {
@@ -491,8 +502,6 @@ namespace BlueWaterProject
             {
                 trail.Stop();
             }
-
-            useMouseAttack = false;
         }
         
         public void SetIsAttacking(int boolValue) => isAttacking = boolValue == 1;
@@ -587,14 +596,14 @@ namespace BlueWaterProject
             
             usedActiveSkill = true;
             myActiveSkill.Execute(TargetLayer, transform.position);
-            StartCoroutine(CoolDown(myActiveSkill.ActiveSkillData.Cooldown, () => usedActiveSkill = false));
+            StartCoroutine(Utils.CoolDown(myActiveSkill.ActiveSkillData.Cooldown, () => usedActiveSkill = false));
             
             slowMotionCoroutine = StartCoroutine(GameManager.Inst.ApplySlowMotion(1f, 0.2f));
         }
 
         public void OnRoll()
         {
-            if (isRolling) return;
+            if (!enableRoll || isRolling) return;
             
             StartCoroutine(nameof(Roll));
         }
@@ -726,6 +735,7 @@ namespace BlueWaterProject
         private IEnumerator Roll()
         {
             isRolling = true;
+            enableRoll = false;
 
             var time = 0f;
 
@@ -745,6 +755,7 @@ namespace BlueWaterProject
 
             afterImageTrail.Stop();
             isRolling = false;
+            StartCoroutine(Utils.CoolDown(rollCooldown, () => enableRoll = true));
 
             if (movementInput == Vector2.zero)
             {
@@ -760,19 +771,7 @@ namespace BlueWaterProject
             afterImageTrail.Clear();
 
             isRolling = false;
-        }
+            StartCoroutine(Utils.CoolDown(rollCooldown, () => enableRoll = true));
-
-        private IEnumerator CoolDown(float waitTime, Action onCooldownComplete)
-        {
-            var time = 0f;
-
-            while (time <= waitTime)
-            {
-                time += Time.deltaTime;
-                yield return null;
-            }
-            
-            onCooldownComplete?.Invoke();
         }
 
         private void GameOver()

BlueWater/Assets/02.Scripts/InIslandCamera.cs

@@ -7,8 +7,8 @@ namespace BlueWaterProject
 {
     public class InIslandCamera : Singleton<InIslandCamera>
     {
-        [Required("InIslandCamera를 넣어주세요.")]
+        [field: Required("InIslandCamera를 넣어주세요.")]
-        [SerializeField] private CinemachineVirtualCamera inIslandCam;
+        [field: SerializeField] public CinemachineVirtualCamera InIslandCam { get; private set; }
         
         /// <summary>
         /// LookAt target and follow target
@@ -16,8 +16,8 @@ namespace BlueWaterProject
         /// <param name="obj"></param>
         public void SetTarget(Transform obj)
         {
-            inIslandCam.LookAt = obj;
+            InIslandCam.LookAt = obj;
-            inIslandCam.Follow = obj;
+            InIslandCam.Follow = obj;
         }
     }
 }

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/ActiveSkill.cs

@@ -29,7 +29,6 @@ namespace BlueWaterProject
         protected Transform user;
         
         protected Collider[] hitColliders;
-        protected LayerMask groundLayer;
         protected float endSkillTime;
 
         // Hash
@@ -76,7 +75,6 @@ namespace BlueWaterProject
             indicator.material = new Material(indicator.material);
             indicator.material.SetFloat(FillHash, 0f);
             hitColliders = new Collider[ActiveSkillData.MaxAttackTargets];
-            groundLayer = LayerMask.GetMask("Ground");
         }
 
         protected void HideIndicator()
@@ -107,6 +105,11 @@ namespace BlueWaterProject
 
         public abstract void Execute(LayerMask targetLayer, Vector3 targetPos, Action action1 = null, Action action2 = null, Action action3 = null);
 
+        public virtual void Execute(LayerMask targetLayer, Vector3 targetPos, float[] bossMapVertices)
+        {
+            
+        }
+
         protected void CastingMove()
         {
             switch (ActiveSkillData.CastingType)

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/IceAge.cs

@@ -20,12 +20,11 @@ namespace BlueWaterProject
             if (ActiveSkillData.CastingTime > 0)
             {
                 IsCasting = true;
-                var castingTime = 1 / ActiveSkillData.CastingTime;
                 
                 while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
                 {
                     CastingMove();
-                    var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * castingTime;
+                    var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
                     indicator.material.SetFloat(FillHash, fillValue);
                     yield return null;
                 }

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/LavaEruption.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using Sirenix.OdinInspector;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
@@ -8,19 +9,31 @@ namespace BlueWaterProject
 {
     public class LavaEruption : ActiveSkill
     {
+        [Title("Extensions Data")]
         [SerializeField] private float randomRadius = 3f;
         [SerializeField] private float projectileDelay = 2f;
+        [SerializeField] private float damageDelay = 0.5f;
+        [SerializeField] private Material lavaMaterial;
+        [SerializeField] private ParticleSystem lavaEffect;
+        [SerializeField] private Collider myCollider;
 
-        private void OnDrawGizmos()
+        private static bool isHitting;
-        {
-            Gizmos.DrawWireSphere(transform.position, ActiveSkillData.Range);
-        }
         
         public override void Execute(LayerMask targetLayer, Vector3 targetPos, Action action1 = null, Action action2 = null, Action action3 = null)
         {
-            StartCoroutine(SkillCoroutine(targetLayer, targetPos));
+            StartCoroutine(SkillCoroutine(targetPos));
         }
         
+        public override void Execute(LayerMask targetLayer, Vector3 targetPos, float[] bossMapVertices)
+        {
+            StartCoroutine(SkillCoroutine(targetPos, bossMapVertices));
+        }
+
+        private void OnDestroy()
+        {
+            isHitting = false;
+        }
+
         protected override void Awake()
         {
             base.Awake();
@@ -28,7 +41,19 @@ namespace BlueWaterProject
             endSkillTime = projectileDelay + ActiveSkillData.CastingTime;
         }
 
-        private IEnumerator SkillCoroutine(LayerMask targetLayer, Vector3 targetPos)
+        private void OnTriggerStay(Collider other)
+        {
+            if (isHitting || !other.CompareTag("InIslandPlayer")) return;
+
+            var iDamageable = other.GetComponent<IDamageable>();
+            iDamageable.TakeDamage(ActiveSkillData.Damage);
+
+            isHitting = true;
+
+            StartCoroutine(Utils.CoolDown(damageDelay, () => isHitting = false));
+        }
+
+        private IEnumerator SkillCoroutine(Vector3 targetPos, float[] bossMapVertices = null)
         {
             var destination = Vector3.zero;
             for (var i = 0; i < 1000; i++)
@@ -37,10 +62,11 @@ namespace BlueWaterProject
                 randomPos.y = targetPos.y;
                 destination = targetPos + randomPos;
 
-                if (Physics.Raycast(destination, Vector3.down, out var hit, 5f, groundLayer))
+                if (bossMapVertices == null) break;
+
+                if (bossMapVertices[0] < destination.x && bossMapVertices[1] > destination.x &&
+                    bossMapVertices[2] > destination.z && bossMapVertices[3] < destination.z)
                 {
-                    Debug.DrawLine(destination, destination  + Vector3.down * 5f, Color.red, 5f);
-                    //print(i + "번쨰 " + hit.collider.name);
                     break;
                 }
             }
@@ -59,13 +85,11 @@ namespace BlueWaterProject
             
             while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
             {
-                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * ActiveSkillData.CastingTime;
+                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
                 indicator.material.SetFloat(FillHash, fillValue);
                 yield return null;
             }
             
-            // TODO : 터지는 효과 추가하기
-            
             HideIndicator();
             if (ActiveSkillData.ExplodeEffect != null)
             {
@@ -74,16 +98,14 @@ namespace BlueWaterProject
                 skillEffect.Play();
             }
             
-            Array.Clear(hitColliders, 0,ActiveSkillData.MaxAttackTargets);
+            indicator.material = lavaMaterial;
-            var maxSize = Physics.OverlapSphereNonAlloc(transform.position, ActiveSkillData.Range, hitColliders, targetLayer);
+            lavaEffect.Clear();
-        
+            lavaEffect.gameObject.SetActive(true);
-            for (var i = 0; i < maxSize; i++)
+            lavaEffect.Play();
-            {
+            indicator.enabled = true;
-                var iDamageable = hitColliders[i].GetComponent<IDamageable>();
+            myCollider.enabled = true;
-                iDamageable.TakeDamage(ActiveSkillData.Damage);
-            }
 
-            Destroy(gameObject, 1f);
+            Destroy(gameObject, ActiveSkillData.Duration);
         }
     }
 }

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/LineRush.cs

@@ -1,33 +1,27 @@
 using System;
 using System.Collections;
+using Sirenix.OdinInspector;
 using UnityEngine;
-using Random = UnityEngine.Random;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
     public class LineRush : ActiveSkill
     {
+        [Title("Extensions Data")]
         [SerializeField] private float rushOffset = 10f;
         [SerializeField] private float rushSpeed = 10f;
         [SerializeField] private float doubleRushDelay = 0.5f;
         
         public override void Execute(LayerMask targetLayer, Vector3 targetPos, Action action1 = null, Action action2 = null, Action action3 = null)
         {
-            StartCoroutine(SkillCoroutine(targetLayer, targetPos, action1, action2));
+            StartCoroutine(SkillCoroutine(targetPos, action1, action2));
         }
-        
-        // protected override void Awake()
-        // {
-        //     base.Awake();
-        //
-        //     endSkillTime = ActiveSkillData.CastingTime;
-        // }
 
-        private IEnumerator SkillCoroutine(LayerMask targetLayer, Vector3 targetPos, Action ghostPlay, Action ghostStop)
+        private IEnumerator SkillCoroutine(Vector3 targetPos, Action ghostPlay, Action ghostStop)
         {
             var userPos = user.position;
-            targetPos.y = userPos.y;
+            userPos.y = targetPos.y;
             var targetDir = (targetPos - userPos).normalized;
             transform.position = userPos;
             
@@ -53,7 +47,7 @@ namespace BlueWaterProject
             
             while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
             {
-                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * ActiveSkillData.CastingTime;
+                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
                 indicator.material.SetFloat(FillHash, fillValue);
                 yield return null;
             }

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/VolcanicEruption.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using Sirenix.OdinInspector;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
@@ -8,17 +9,29 @@ namespace BlueWaterProject
 {
     public class VolcanicEruption : ActiveSkill
     {
+        [Title("Extensions Data")]
         [SerializeField] private float randomRadius = 3f;
         [SerializeField] private float projectileDelay = 2f;
+        [SerializeField] private float damageDelay = 0.5f;
+        [SerializeField] private Material lavaMaterial;
+        [SerializeField] private ParticleSystem lavaEffect;
+        [SerializeField] private Collider myCollider;
         
-        private void OnDrawGizmos()
+        private static bool isHitting;
-        {
-            Gizmos.DrawWireSphere(transform.position, ActiveSkillData.Range);
-        }
         
         public override void Execute(LayerMask targetLayer, Vector3 targetPos, Action action1 = null, Action action2 = null, Action action3 = null)
         {
-            StartCoroutine(SkillCoroutine(targetLayer, targetPos));
+            print("사용되지 않는 함수입니다.");
+        }
+        
+        public override void Execute(LayerMask targetLayer, Vector3 targetPos, float[] bossMapVertices)
+        {
+            StartCoroutine(SkillCoroutine(targetPos, bossMapVertices));
+        }
+        
+        private void OnDestroy()
+        {
+            isHitting = false;
         }
         
         protected override void Awake()
@@ -27,8 +40,20 @@ namespace BlueWaterProject
 
             endSkillTime = projectileDelay + ActiveSkillData.CastingTime;
         }
+        
+        private void OnTriggerStay(Collider other)
+        {
+            if (isHitting || !other.CompareTag("InIslandPlayer")) return;
 
-        private IEnumerator SkillCoroutine(LayerMask targetLayer, Vector3 targetPos)
+            var iDamageable = other.GetComponent<IDamageable>();
+            iDamageable.TakeDamage(ActiveSkillData.Damage);
+
+            isHitting = true;
+
+            StartCoroutine(Utils.CoolDown(damageDelay, () => isHitting = false));
+        }
+
+        private IEnumerator SkillCoroutine(Vector3 targetPos, float[] bossMapVertices)
         {
             var destination = Vector3.zero;
             for (var i = 0; i < 1000; i++)
@@ -37,7 +62,11 @@ namespace BlueWaterProject
                 randomPos.y = targetPos.y;
                 destination = user.position + randomPos;
                 
-                if (Physics.Raycast(destination, Vector3.down, 5f, groundLayer)) break;
+                if (bossMapVertices[0] < destination.x && bossMapVertices[1] > destination.x &&
+                    bossMapVertices[2] > destination.z && bossMapVertices[3] < destination.z)
+                {
+                    break;
+                }
             }
             transform.position = destination;
             indicator.enabled = true;
@@ -54,13 +83,11 @@ namespace BlueWaterProject
             
             while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
             {
-                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * ActiveSkillData.CastingTime;
+                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
                 indicator.material.SetFloat(FillHash, fillValue);
                 yield return null;
             }
             
-            // TODO : 터지는 효과 추가하기
-            
             HideIndicator();
             if (ActiveSkillData.ExplodeEffect != null)
             {
@@ -69,16 +96,14 @@ namespace BlueWaterProject
                 skillEffect.Play();
             }
             
-            Array.Clear(hitColliders, 0,ActiveSkillData.MaxAttackTargets);
+            indicator.material = lavaMaterial;
-            var maxSize = Physics.OverlapSphereNonAlloc(transform.position, ActiveSkillData.Range, hitColliders, targetLayer);
+            lavaEffect.Clear();
-        
+            lavaEffect.gameObject.SetActive(true);
-            for (var i = 0; i < maxSize; i++)
+            lavaEffect.Play();
-            {
+            indicator.enabled = true;
-                var iDamageable = hitColliders[i].GetComponent<IDamageable>();
+            myCollider.enabled = true;
-                iDamageable.TakeDamage(ActiveSkillData.Damage);
-            }
 
-            Destroy(gameObject, 1f);
+            Destroy(gameObject, ActiveSkillData.Duration);
         }
     }
 }

BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillSo.cs

@@ -4,8 +4,8 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    [CreateAssetMenu(fileName = "ActiveSkillDataSo", menuName = "ScriptableObjects/Skills/ActiveSkillDataSo", order = 0)]
+    [CreateAssetMenu(fileName = "ActiveSkillSo", menuName = "ScriptableObjects/Skills/ActiveSkillSo", order = 0)]
-    public class ActiveSkillDataSo : ScriptableObject
+    public class ActiveSkillSo : ScriptableObject
     {
         [field: SerializeField] public List<ActiveSkill> ActiveSkillList { get; set; }
     }

BlueWater/Assets/02.Scripts/Skill/Data/So/ActiveSkillSo.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 5c8c152ebe4f36f47aea1661f3d4dea5, type: 3}
-  m_Name: ActiveSkillDataSo
+  m_Name: ActiveSkillSo
   m_EditorClassIdentifier: 
   <ActiveSkillList>k__BackingField:
   - {fileID: 3919030326071344108, guid: 2d9f3b761e6d218499cae274f1a9f718, type: 3}

BlueWater/Assets/02.Scripts/Skill/SkillController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
@@ -8,7 +9,7 @@ namespace BlueWaterProject
     [Serializable]
     public class SkillController : MonoBehaviour
     {
-        [SerializeField] private ActiveSkillDataSo activeSkillDataSo;
+        [SerializeField] private ActiveSkillSo activeSkillSo;
         private Dictionary<string, ActiveSkill> activeSkillDictionary;
 
         private ActiveSkill cachingObj;
@@ -20,9 +21,9 @@ namespace BlueWaterProject
 
         private void Init()
         {
-            activeSkillDictionary = new Dictionary<string, ActiveSkill>(activeSkillDataSo.ActiveSkillList.Count);
+            activeSkillDictionary = new Dictionary<string, ActiveSkill>(activeSkillSo.ActiveSkillList.Count);
             
-            foreach (var activeSkill in activeSkillDataSo.ActiveSkillList)
+            foreach (var activeSkill in activeSkillSo.ActiveSkillList)
             {
                 activeSkillDictionary.Add(activeSkill.ActiveSkillData.Name, activeSkill);
             }

BlueWater/Assets/02.Scripts/Utility/Utils.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Diagnostics;
 using BehaviorDesigner.Runtime;
 using UnityEditor;
@@ -116,6 +117,19 @@ namespace BlueWaterProject
             return finalDamage;
         }
         
+        public static IEnumerator CoolDown(float waitTime, Action onCooldownComplete)
+        {
+            var time = 0f;
+
+            while (time <= waitTime)
+            {
+                time += Time.deltaTime;
+                yield return null;
+            }
+            
+            onCooldownComplete?.Invoke();
+        }
+        
         public static bool SetCloseDestination(NavMeshAgent agent, Vector3 destination, float stopDistance, float maxDistance)
         {
             var walkableMask = 1 << NavMesh.GetAreaFromName("Walkable");

BlueWater/Assets/03.Materials/Skill/Lava.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3201825539374904762
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -7,8 +20,8 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: SkillFill
+  m_Name: Lava
-  m_Shader: {fileID: -6465566751694194690, guid: ad33e5b6eaaad4d4dbbb0e91fa0ba4f7,
+  m_Shader: {fileID: -6465566751694194690, guid: 95476ef9991076049b3637df159543ee,
     type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
@@ -25,7 +38,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - Base_Map:
-        m_Texture: {fileID: 2800000, guid: cc3ef0eaa851cd849bb12019022cefcb, type: 3}
+        m_Texture: {fileID: 2800000, guid: 758dcb85d13c04fc1972b0251998db31, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - Normal_Map:
@@ -111,15 +124,18 @@ Material:
     - _EnvironmentReflections: 1
     - _GlossMapScale: 0
     - _Glossiness: 0
+    - _GlossinessSource: 0
     - _GlossyReflections: 0
     - _Metallic: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.005
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _RotateSpeed: 2
+    - _Shininess: 0
     - _Smoothness: 0.5
+    - _SmoothnessSource: 0
     - _SmoothnessTextureChannel: 0
+    - _SpecSource: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _SrcBlendAlpha: 1
@@ -128,22 +144,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _Multiply: {r: 0, g: 0, b: 0, a: 0}
-    - _MultiplyColor: {r: 1, g: 0.10849059, b: 0.10849059, a: 0}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
---- !u!114 &1275698553073486527
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7

BlueWater/Assets/03.Materials/Skill/Lava.mat.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 51a12c116505d3340b1f2907f4ce0ffc
+guid: ff3fe548557b04446b9c9e1b45340926
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000

BlueWater/Assets/03.Materials/Skill/SkillFill.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f85ab7d25ebf26640ade6407cfc37cbc
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/03.Materials/Skill/SkillOutline.mat

@@ -1,165 +0,0 @@
-%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: SkillOutline
-  m_Shader: {fileID: -6465566751694194690, guid: ad33e5b6eaaad4d4dbbb0e91fa0ba4f7,
-    type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 1998
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - Base_Map:
-        m_Texture: {fileID: 2800000, guid: d00923621d351154e97045e943e279cf, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - Normal_Map:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BaseMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _BumpMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailAlbedoMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailMask:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _DetailNormalMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _EmissionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _Fill_Map:
-        m_Texture: {fileID: 2800000, guid: cc3ef0eaa851cd849bb12019022cefcb, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _MetallicGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _OcclusionMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _ParallaxMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _SpecGlossMap:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_Lightmaps:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_LightmapsInd:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - unity_ShadowMasks:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - Normal_Blend: 0.5
-    - _AlphaClip: 0
-    - _AlphaToMask: 0
-    - _Angle: 120
-    - _Blend: 0
-    - _BlendModePreserveSpecular: 1
-    - _BumpScale: 1
-    - _ClearCoatMask: 0
-    - _ClearCoatSmoothness: 0
-    - _Cull: 2
-    - _Cutoff: 0.5
-    - _DecalMeshBiasType: 0
-    - _DecalMeshDepthBias: 0
-    - _DecalMeshViewBias: 0
-    - _DetailAlbedoMapScale: 1
-    - _DetailNormalMapScale: 1
-    - _DrawOrder: 0
-    - _DstBlend: 0
-    - _DstBlendAlpha: 0
-    - _Duration: 1
-    - _EnvironmentReflections: 1
-    - _FlowFade: 1
-    - _GlossMapScale: 0
-    - _Glossiness: 0
-    - _GlossyReflections: 0
-    - _Metallic: 0
-    - _OcclusionStrength: 1
-    - _Outline: 1
-    - _OutlineAlpha: 1
-    - _Parallax: 0.005
-    - _QueueControl: 0
-    - _QueueOffset: 0
-    - _ReceiveShadows: 1
-    - _RotateSpeed: 2
-    - _Sector: 0
-    - _Smoothness: 0.5
-    - _SmoothnessTextureChannel: 0
-    - _SpecularHighlights: 1
-    - _Speed: 0.5
-    - _SrcBlend: 1
-    - _SrcBlendAlpha: 1
-    - _Surface: 0
-    - _Test: 1.23
-    - _WorkflowMode: 1
-    - _ZWrite: 1
-    - _speed: 1
-    m_Colors:
-    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _FlowColor: {r: 0, g: 0, b: 1, a: 0}
-    - _Multiply: {r: 0, g: 0, b: 0, a: 0}
-    - _MultiplyColor: {r: 1, g: 0, b: 0, a: 0}
-    - _OutlineColor: {r: 1, g: 0, b: 0, a: 0}
-    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-  m_BuildTextureStacks: []
---- !u!114 &1275698553073486527
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7

BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/FieldBoss01.prefab

@@ -5041,7 +5041,7 @@ MonoBehaviour:
         byteDataArray: 
       Version: 1.7.7
   gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 0
+  showBehaviorDesignerGizmo: 1
 --- !u!114 &7556135373767129943
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5065,3 +5065,5 @@ MonoBehaviour:
   hpSlider: {fileID: 0}
   damageEffectSlider: {fileID: 0}
   damageEffectSpeed: 0.1
+  lavaNumber: 8
+  volcanicNumber: 20

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/BigLavaEruption.prefab

@@ -66,7 +66,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5043358165129361910}
   - component: {fileID: 1362742867961675026}
-  m_Layer: 0
+  - component: {fileID: 6019070022799669944}
+  m_Layer: 25
   m_Name: BigLavaEruption
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -83,10 +84,11 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 10, y: 10, z: 1}
+  m_LocalScale: {x: 12, y: 12, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4051035783022543630}
+  - {fileID: 8069353124735292294}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!114 &1362742867961675026
@@ -108,9 +110,9 @@ MonoBehaviour:
     <Cooldown>k__BackingField: 0
     <CastingTime>k__BackingField: 1
     <CastingType>k__BackingField: 0
-    <Duration>k__BackingField: 4
+    <Duration>k__BackingField: 15
     <Damage>k__BackingField: 30
-    <Range>k__BackingField: 5
+    <Range>k__BackingField: 6
     <MaxAttackTargets>k__BackingField: 10
     <ExplodeEffect>k__BackingField: {fileID: 19806542, guid: 0763c01217b286640aa3ac83d44fafaa,
       type: 3}
@@ -118,4 +120,114 @@ MonoBehaviour:
   <IsCasting>k__BackingField: 0
   followMouse: 0
   randomRadius: 0
-  projectileDelay: 1
+  projectileDelay: 0.5
+  damageDelay: 0.5
+  lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2}
+  lavaEffect: {fileID: 8069353124720114776}
+  myCollider: {fileID: 6019070022799669944}
+--- !u!135 &6019070022799669944
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &8069353124735629034
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5043358165129361910}
+    m_Modifications:
+    - target: {fileID: 129292, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_Name
+      value: LavaBoiling
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+--- !u!198 &8069353124720114776 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 19876530, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 8069353124735629034}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8069353124735292294 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 8069353124735629034}
+  m_PrefabAsset: {fileID: 0}

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaEruption.prefab

@@ -66,7 +66,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5043358165129361910}
   - component: {fileID: 1362742867961675026}
-  m_Layer: 0
+  - component: {fileID: 7638329233694647706}
+  m_Layer: 25
   m_Name: LavaEruption
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -87,6 +88,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4051035783022543630}
+  - {fileID: 2337368552274346600}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!114 &1362742867961675026
@@ -106,9 +108,9 @@ MonoBehaviour:
     <DisplayName>k__BackingField: 
     <Description>k__BackingField: 
     <Cooldown>k__BackingField: 0
-    <CastingTime>k__BackingField: 1
+    <CastingTime>k__BackingField: 0.5
     <CastingType>k__BackingField: 0
-    <Duration>k__BackingField: 4
+    <Duration>k__BackingField: 12
     <Damage>k__BackingField: 15
     <Range>k__BackingField: 1.5
     <MaxAttackTargets>k__BackingField: 10
@@ -117,5 +119,131 @@ MonoBehaviour:
   indicator: {fileID: 6177466515962511305}
   <IsCasting>k__BackingField: 0
   followMouse: 0
-  randomRadius: 6
+  randomRadius: 9
-  projectileDelay: 2
+  projectileDelay: 0.5
+  damageDelay: 0.5
+  lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2}
+  lavaEffect: {fileID: 2337368552254942646}
+  myCollider: {fileID: 7638329233694647706}
+--- !u!135 &7638329233694647706
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &2337368552274421508
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5043358165129361910}
+    m_Modifications:
+    - target: {fileID: 129292, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_Name
+      value: LavaBoiling
+      objectReference: {fileID: 0}
+    - target: {fileID: 129292, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 19824104, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: ShapeModule.radius.value
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 19824104, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: RotationModule.x.minMaxState
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 19824104, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: RotationModule.y.minMaxState
+      value: 3
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+--- !u!198 &2337368552254942646 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 19876530, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 2337368552274421508}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2337368552274346600 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 2337368552274421508}
+  m_PrefabAsset: {fileID: 0}

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LineRush.prefab

@@ -106,7 +106,7 @@ MonoBehaviour:
     <DisplayName>k__BackingField: 
     <Description>k__BackingField: 
     <Cooldown>k__BackingField: 0
-    <CastingTime>k__BackingField: 1
+    <CastingTime>k__BackingField: 0.6
     <CastingType>k__BackingField: 0
     <Duration>k__BackingField: 0
     <Damage>k__BackingField: 10
@@ -116,6 +116,6 @@ MonoBehaviour:
   indicator: {fileID: 6177466515962511305}
   <IsCasting>k__BackingField: 0
   followMouse: 0
-  rushOffset: 10
+  rushOffset: 15
-  rushSpeed: 30
+  rushSpeed: 40
-  ghost: {fileID: 0}
+  doubleRushDelay: 0.5

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/VolcanicEruption.prefab

@@ -66,7 +66,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5043358165129361910}
   - component: {fileID: -8657138461080468130}
-  m_Layer: 0
+  - component: {fileID: 9177590095021392368}
+  m_Layer: 25
   m_Name: VolcanicEruption
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -87,6 +88,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4051035783022543630}
+  - {fileID: 5178252110420506127}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!114 &-8657138461080468130
@@ -106,9 +108,9 @@ MonoBehaviour:
     <DisplayName>k__BackingField: 
     <Description>k__BackingField: 
     <Cooldown>k__BackingField: 0
-    <CastingTime>k__BackingField: 1
+    <CastingTime>k__BackingField: 0.5
     <CastingType>k__BackingField: 0
-    <Duration>k__BackingField: 4
+    <Duration>k__BackingField: 12
     <Damage>k__BackingField: 15
     <Range>k__BackingField: 1.5
     <MaxAttackTargets>k__BackingField: 10
@@ -117,5 +119,115 @@ MonoBehaviour:
   indicator: {fileID: 0}
   <IsCasting>k__BackingField: 0
   followMouse: 0
-  randomRadius: 12
+  randomRadius: 15
-  projectileDelay: 1
+  projectileDelay: 0.5
+  damageDelay: 0.5
+  lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2}
+  lavaEffect: {fileID: 5178252110406326737}
+  myCollider: {fileID: 9177590095021392368}
+--- !u!135 &9177590095021392368
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &5178252110420038499
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5043358165129361910}
+    m_Modifications:
+    - target: {fileID: 129292, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_Name
+      value: LavaBoiling
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.33333334
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e, type: 3}
+--- !u!198 &5178252110406326737 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 19876530, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 5178252110420038499}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5178252110420506127 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 468332, guid: a9ebf80f13b4f1d42aefbd3bdd946e4e,
+    type: 3}
+  m_PrefabInstance: {fileID: 5178252110420038499}
+  m_PrefabAsset: {fileID: 0}

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBoiling.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5c203cdb58edd164aac375d374aff495
+guid: a9ebf80f13b4f1d42aefbd3bdd946e4e
 PrefabImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/10.Shaders/Lava.shadergraph.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8cc8ab5a430698048a0576227bf5c21c
+guid: 95476ef9991076049b3637df159543ee
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f5789d13135b86645a366dac6583d1cd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3643c0d76ec153646b1203880bfb64ed
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianAttack2ParticleMaterial.mat

@@ -136,3 +136,16 @@ Material:
     - _EmissionColor: {r: 2, g: 2, b: 2, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
+--- !u!114 &4959705724452720509
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianBackgroundGrass.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &7207738753411481533
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianBackgroundGroundRocks.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-796945398987568213
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianBackgroundMountains.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &507041902980105197
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianBackgroundRock.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &2218348415691648043
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianBackgroundTreeLeaves.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7337078535608877545
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianBackgroundTreeWood.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &2192100956846150191
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianEnemyHelmetRimMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3139770245225180577
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownGrass.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6145810659579277851
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownLeaves.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5917475721546992894
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownRock.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-813703534645829883
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTrail.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8117153510876657985
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Dirt.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &2294159037921437120
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/GreenLand.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &3302456605600738047
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Leaves.001.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &2359942314781857288
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Leaves.002.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1641372442904439439
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Leaves.003.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &519334395847099225
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Leaves.004.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5931442086203679014
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Leaves.005.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8783954740268289185
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Leaves.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5702314372905533790
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/RockyHill.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &6770698101515070208
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Wood.001.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6498814445758017975
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Wood.002.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &2248567707841659222
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Wood.003.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5735921967561629667
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Wood.004.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4791122925296000092
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Wood.005.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &4574431425067673284
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/Wood.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5484739837383795696
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Barbarians/Models/Materials/rock.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &894252659330154872
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Blob/Materials/FeelBlobWhiteClouds.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5529314581287363150
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Bounce/Materials/FeelBounceGrass.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7746386293380863779
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Bounce/Materials/FeelBounceLight.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7128546906164956483
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassBody.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6252948724728433876
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassClothes 1.mat

@@ -121,3 +121,16 @@ Material:
     - _EmissionColor: {r: 0.03137255, g: 0.17254902, b: 0.34509805, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &4410837798277754857
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassClothes.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-275072926460119565
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassEqualizerBlock.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-267954241520229680
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassGround1.mat

@@ -122,3 +122,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5451771939301531704
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassGround2.mat

@@ -122,3 +122,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &7131174646641864155
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Brass/Materials/FeelBrassGround3.mat

@@ -123,3 +123,16 @@ Material:
     - _EmissionColor: {r: 0.9811321, g: 0.9302243, b: 0.9302243, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &4000057895244495521
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/CardsUI/Materials/FeelCardsLightning.mat

@@ -119,3 +119,16 @@ Material:
     - _EmissionColor: {r: 8, g: 5.917858, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
+--- !u!114 &6941917315591785544
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/CardsUI/Materials/FeelCardsSquareLightning.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-5311090286027388073
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Letters/Materials/FeelLettersDemoDustParticlesMaterial.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
+--- !u!114 &3298903142558843133
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Letters/Materials/FeelLettersDemoSingMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1457438735258418171
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Letters/Materials/FeelLettersDemoSparkMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8066202228403044705
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Letters/Materials/FeelLettersDemoWindMaterial.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
+--- !u!114 &4009647220369773924
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/MMProgressBar/Materials/FeelMMProgressBarMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3560635997785502245
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarBodyBlue.mat

@@ -137,3 +137,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &7638740541762890350
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarHeadlights.mat

@@ -138,3 +138,16 @@ Material:
     - _EmissionColor: {r: 12.996038, g: 7.690006, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &7907414758281491812
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarWheelsInside.mat

@@ -137,3 +137,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &8332618495205470580
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchRoad.mat

@@ -137,3 +137,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5231490642263631107
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchSmoke.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-3073516908581088258
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchTires.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-6595076695162641073
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchTrees.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2623010596259887879
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Tactical/Materials/FeelTacticalBulletImpactParticle.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-7991441081734193990
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Tactical/Materials/FeelTacticalGunMaterial.mat

@@ -133,3 +133,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &113241692483574550
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Tactical/Materials/FeelTacticalMuzzleflashMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2141001073392414377
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Templates/Materials/FeelTemplatesGunMaterial.mat

@@ -146,3 +146,16 @@ Material:
     - _EmissionColor: {r: 0.1509434, g: 0.1509434, b: 0.1509434, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &5027752908978606763
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterBodyAltMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4203898708894841450
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterBodyMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1331734148441481033
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterMugContents.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &4011656895377586393
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterMugMaterial.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &1000765387653522018
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterSmokeMaterial.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []
+--- !u!114 &3943543006863550823
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterTableclothMaterial.mat

@@ -120,3 +120,16 @@ Material:
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
+--- !u!114 &3361843790672622943
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

BlueWater/Assets/Feel/FeelDemos/Toaster/Materials/FeelToasterToasterMetalMaterial.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4987997228910490147
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8